You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2021/11/25 12:14:50 UTC

[ignite] branch master updated: IGNITE-15348 Checkstyle checks whitespace after cast token, connected issues are solved. - Fixes #9568.

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

alexpl 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 9021f78  IGNITE-15348 Checkstyle checks whitespace after cast token, connected issues are solved. - Fixes #9568.
9021f78 is described below

commit 9021f783e9453375482c9b255a42ca827e091daa
Author: AndyDem <79...@users.noreply.github.com>
AuthorDate: Thu Nov 25 14:41:53 2021 +0300

    IGNITE-15348 Checkstyle checks whitespace after cast token, connected issues are solved. - Fixes #9568.
    
    Signed-off-by: Aleksey Plekhanov <pl...@gmail.com>
---
 checkstyle/checkstyle.xml                          |  2 +-
 .../ANNClassificationExportImportExample.java      |  4 +-
 ...domForestClassificationExportImportExample.java |  2 +-
 ...onTreeClassificationTrainerSQLTableExample.java |  2 +-
 .../gridify/aop/aspectj/GridifyAspectJAspect.java  |  4 +-
 .../aop/aspectj/GridifySetToSetAspectJAspect.java  |  4 +-
 .../aspectj/GridifySetToValueAspectJAspect.java    |  4 +-
 .../org/apache/ignite/gridify/AbstractAopTest.java | 22 +++++-----
 .../internal/benchmarks/jmh/algo/BenchmarkCRC.java |  2 +-
 .../cache/store/cassandra/CassandraCacheStore.java |  2 +-
 .../store/cassandra/common/CassandraHelper.java    |  2 +-
 .../persistence/PersistenceController.java         |  2 +-
 .../org/apache/ignite/tests/pojos/Product.java     |  2 +-
 .../apache/ignite/tests/pojos/ProductOrder.java    |  2 +-
 .../ignite/tests/utils/TestCacheSession.java       |  2 +-
 .../org/apache/ignite/tests/utils/TestsHelper.java |  2 +-
 .../jdbc2/JdbcAbstractDmlStatementSelfTest.java    |  2 +-
 .../ignite/internal/jdbc2/JdbcSpringSelfTest.java  |  2 +-
 .../rest/ClientMemcachedProtocolSelfTest.java      |  8 ++--
 .../processors/rest/TestMemcacheClient.java        | 12 +++---
 .../rest/protocols/tcp/TcpRestParserSelfTest.java  |  2 +-
 .../thin/JdbcThinAbstractDmlStatementSelfTest.java |  2 +-
 .../thin/JdbcThinAutoCloseServerCursorTest.java    |  2 +-
 .../JdbcThinCacheToJdbcDataTypesCoverageTest.java  |  4 +-
 .../persistence/IndexTypesCompatibilityTest.java   |  4 +-
 .../InlineJavaObjectCompatibilityTest.java         |  2 +-
 .../MoveBinaryMetadataCompatibility.java           |  2 +-
 .../commandline/argument/parser/CLIArgument.java   |  2 +-
 .../commandline/indexreader/IgniteIndexReader.java |  4 +-
 .../IgniteIndexReaderFilePageStoreFactoryImpl.java |  2 +-
 .../util/GridCommandHandlerAbstractTest.java       |  4 +-
 .../util/GridCommandHandlerIndexingTest.java       |  2 +-
 .../util/GridCommandHandlerPropertiesTest.java     |  2 +-
 .../apache/ignite/util/GridCommandHandlerTest.java | 10 ++---
 .../eviction/sorted/SortedEvictionPolicy.java      |  2 +-
 .../store/jdbc/JdbcTypesDefaultTransformer.java    |  2 +-
 .../ignite/internal/GridKernalContextImpl.java     |  4 +-
 .../ignite/internal/GridTaskSessionImpl.java       |  2 +-
 .../ignite/internal/IgniteDiagnosticMessage.java   |  2 +-
 .../org/apache/ignite/internal/IgniteKernal.java   |  2 +-
 .../apache/ignite/internal/IgniteServicesImpl.java |  2 +-
 .../ignite/internal/MarshallerContextImpl.java     |  2 +-
 .../ignite/internal/ThreadPoolMXBeanAdapter.java   |  2 +-
 .../ignite/internal/binary/BinaryEnumCache.java    |  2 +-
 .../ignite/internal/binary/BinaryObjectImpl.java   |  4 +-
 .../internal/binary/BinaryObjectOffheapImpl.java   |  4 +-
 .../ignite/internal/binary/BinaryReaderExImpl.java |  4 +-
 .../ignite/internal/binary/BinaryWriterExImpl.java |  8 ++--
 .../internal/binary/BinaryWriterSchemaHolder.java  |  6 +--
 .../internal/binary/GridBinaryMarshaller.java      |  2 +-
 .../internal/cache/query/index/IndexProcessor.java |  2 +-
 .../cache/query/index/IndexQueryProcessor.java     | 10 ++---
 .../defragmentation/IndexingDefragmentation.java   |  6 +--
 .../index/sorted/inline/InlineIndexFactory.java    |  2 +-
 .../query/index/sorted/inline/InlineIndexTree.java |  2 +-
 .../sorted/inline/InlineObjectBytesDetector.java   |  2 +-
 .../sorted/inline/InlineTreeFilterClosure.java     |  2 +-
 .../sorted/inline/io/AbstractInlineInnerIO.java    |  8 ++--
 .../sorted/inline/io/AbstractInlineLeafIO.java     |  8 ++--
 .../index/sorted/inline/io/AbstractInnerIO.java    |  6 +--
 .../index/sorted/inline/io/AbstractLeafIO.java     |  6 +--
 .../inline/types/BooleanInlineIndexKeyType.java    |  8 ++--
 .../inline/types/ByteInlineIndexKeyType.java       |  8 ++--
 .../inline/types/BytesInlineIndexKeyType.java      | 10 ++---
 .../inline/types/DateInlineIndexKeyType.java       |  6 +--
 .../inline/types/DoubleInlineIndexKeyType.java     |  8 ++--
 .../inline/types/FloatInlineIndexKeyType.java      |  8 ++--
 .../inline/types/IntegerInlineIndexKeyType.java    |  8 ++--
 .../inline/types/LongInlineIndexKeyType.java       |  8 ++--
 .../inline/types/NullableInlineIndexKeyType.java   | 12 +++---
 .../types/ObjectByteArrayInlineIndexKeyType.java   |  4 +-
 .../inline/types/ObjectHashInlineIndexKeyType.java |  4 +-
 .../inline/types/ShortInlineIndexKeyType.java      |  6 +--
 .../inline/types/StringInlineIndexKeyType.java     | 28 ++++++------
 .../types/StringNoCompareInlineIndexKeyType.java   |  2 +-
 .../inline/types/TimeInlineIndexKeyType.java       |  6 +--
 .../inline/types/TimestampInlineIndexKeyType.java  |  6 +--
 .../inline/types/UuidInlineIndexKeyType.java       |  8 ++--
 .../query/index/sorted/keys/DecimalIndexKey.java   |  2 +-
 .../query/index/sorted/keys/IndexKeyFactory.java   | 24 +++++------
 .../index/sorted/keys/JavaObjectIndexKey.java      |  4 +-
 .../query/index/sorted/keys/StringIndexKey.java    |  2 +-
 .../query/index/sorted/keys/UuidIndexKey.java      |  2 +-
 .../internal/client/thin/ClientComputeImpl.java    | 10 ++---
 .../internal/client/thin/ReliableChannel.java      |  2 +-
 .../internal/client/thin/TcpClientChannel.java     |  2 +-
 .../internal/events/DiscoveryCustomEvent.java      |  4 +-
 .../internal/jdbc/thin/JdbcThinResultSet.java      | 26 +++++------
 .../internal/jdbc/thin/JdbcThinStatement.java      |  2 +-
 .../ignite/internal/jdbc2/JdbcResultSet.java       | 26 +++++------
 .../internal/maintenance/MaintenanceFileStore.java |  2 +-
 .../managers/communication/GridIoManager.java      |  2 +-
 .../communication/IgniteMessageFactoryImpl.java    |  2 +-
 .../deployment/GridDeploymentClassLoader.java      |  2 +-
 .../managers/discovery/GridDiscoveryManager.java   |  2 +-
 .../optimized/OptimizedClassDescriptor.java        |  2 +-
 .../ignite/internal/mem/file/MappedFile.java       |  4 +-
 .../apache/ignite/internal/pagemem/PageUtils.java  |  2 +-
 .../wal/record/delta/RotatedIdPartRecord.java      |  2 +-
 .../processors/affinity/GridAffinityUtils.java     |  2 +-
 .../processors/cache/CacheGroupContext.java        |  2 +-
 .../processors/cache/CacheGroupDescriptor.java     |  2 +-
 .../processors/cache/CacheInvokeResult.java        |  2 +-
 .../processors/cache/CacheMetricsSnapshot.java     |  8 ++--
 .../processors/cache/ClusterCachesInfo.java        |  2 +-
 .../cache/GatewayProtectedCacheProxy.java          | 16 +++----
 .../processors/cache/GridCacheAdapter.java         |  2 +-
 .../processors/cache/GridCacheContext.java         |  2 +-
 .../processors/cache/GridCacheIoManager.java       |  4 +-
 .../processors/cache/GridCacheMvccManager.java     |  2 +-
 .../cache/GridCachePartitionExchangeManager.java   |  6 +--
 .../processors/cache/GridCacheProcessor.java       |  4 +-
 .../internal/processors/cache/GridCacheReturn.java |  4 +-
 .../processors/cache/IgniteCacheProxyImpl.java     | 12 +++---
 .../internal/processors/cache/WalStateManager.java |  2 +-
 .../binary/CacheObjectBinaryProcessorImpl.java     | 10 ++---
 .../distributed/GridDistributedCacheAdapter.java   |  6 +--
 .../GridDistributedTxRemoteAdapter.java            |  4 +-
 .../cache/distributed/dht/GridDhtLockFuture.java   |  2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java      |  4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java    |  2 +-
 .../distributed/dht/atomic/GridDhtAtomicCache.java |  2 +-
 .../preloader/GridDhtPartitionsExchangeFuture.java |  2 +-
 .../dht/topology/GridDhtLocalPartition.java        |  2 +-
 .../dht/topology/GridDhtPartitionTopologyImpl.java |  2 +-
 .../dht/topology/PartitionsEvictManager.java       |  2 +-
 .../cache/distributed/near/GridNearCacheEntry.java |  2 +-
 ...dNearOptimisticSerializableTxPrepareFuture.java |  2 +-
 .../near/GridNearOptimisticTxPrepareFuture.java    |  6 +--
 .../near/GridNearSingleGetResponse.java            |  2 +-
 .../cache/local/atomic/GridLocalAtomicCache.java   |  4 +-
 .../processors/cache/mvcc/MvccProcessorImpl.java   |  6 +--
 .../processors/cache/mvcc/MvccVersionImpl.java     |  6 +--
 .../processors/cache/mvcc/txlog/TxKey.java         |  6 +--
 .../processors/cache/mvcc/txlog/TxLogTree.java     |  2 +-
 .../cache/persistence/DataRegionMetricsImpl.java   |  2 +-
 .../persistence/DataRegionMetricsMXBeanImpl.java   |  4 +-
 .../GridCacheDatabaseSharedManager.java            |  6 +--
 .../cache/persistence/GridCacheOffheapManager.java |  4 +-
 .../defragmentation/IgniteDefragmentationImpl.java |  2 +-
 .../cache/persistence/file/AbstractFileIO.java     |  2 +-
 .../cache/persistence/file/EncryptionUtil.java     |  8 ++--
 .../cache/persistence/file/FilePageStore.java      |  2 +-
 .../persistence/pagemem/PagesWriteThrottle.java    |  2 +-
 .../cache/persistence/tree/BPlusTree.java          | 18 ++++----
 .../cache/persistence/tree/io/PageIO.java          |  8 ++--
 .../cache/persistence/tree/io/TrackingPageIO.java  |  2 +-
 .../persistence/wal/FileWriteAheadLogManager.java  |  8 ++--
 .../wal/serializer/RecordDataV1Serializer.java     | 10 ++---
 .../query/GridCacheDistributedQueryFuture.java     |  2 +-
 .../cache/query/GridCacheQueryFutureAdapter.java   |  4 +-
 .../query/jdbc/GridCacheQueryJdbcMetadataTask.java |  2 +-
 .../cache/query/reducer/CacheQueryReducer.java     |  4 +-
 .../cache/transactions/IgniteTxManager.java        |  2 +-
 .../processors/cache/tree/AbstractDataLeafIO.java  |  2 +-
 .../cache/version/GridCacheVersionManager.java     | 12 +++---
 .../processors/cluster/BaselineTopology.java       |  2 +-
 .../cluster/BaselineTopologyHistory.java           |  2 +-
 .../cluster/GridClusterStateProcessor.java         |  2 +-
 .../continuous/GridContinuousProcessor.java        |  4 +-
 .../datastructures/AtomicDataStructureProxy.java   |  2 +-
 .../datastructures/DataStructuresProcessor.java    | 16 +++----
 .../DistributedCollectionMetadata.java             |  4 +-
 .../marshaller/GridMarshallerMappingProcessor.java |  6 +--
 .../marshaller/MarshallerMappingItem.java          |  2 +-
 .../processors/metric/GridMetricManager.java       | 14 +++---
 .../internal/processors/odbc/ClientMessage.java    |  2 +-
 .../processors/odbc/jdbc/JdbcResultWithIo.java     |  2 +-
 .../processors/odbc/odbc/OdbcColumnMeta.java       |  2 +-
 .../processors/odbc/odbc/OdbcMessageParser.java    | 22 +++++-----
 .../processors/odbc/odbc/OdbcTableMeta.java        |  2 +-
 .../internal/processors/odbc/odbc/OdbcUtils.java   |  2 +-
 .../processors/platform/PlatformContextImpl.java   |  2 +-
 .../processors/platform/PlatformProcessorImpl.java |  2 +-
 .../processors/platform/cache/PlatformCache.java   |  6 +--
 .../platform/client/ClientNotification.java        |  2 +-
 .../platform/client/ClientRequestHandler.java      |  6 +--
 .../platform/client/ClientResourceRegistry.java    |  2 +-
 .../client/binary/ClientBinaryTypePutRequest.java  |  2 +-
 .../cache/ClientCacheConfigurationSerializer.java  |  2 +-
 .../cache/ClientCacheEntryEventNotification.java   |  8 ++--
 .../cache/ClientCacheGetConfigurationRequest.java  |  2 +-
 .../cache/ClientCacheQueryContinuousRequest.java   |  4 +-
 .../cache/ClientCacheSqlFieldsQueryRequest.java    |  2 +-
 .../client/cache/ClientCacheSqlQueryRequest.java   |  2 +-
 ...lientClusterGroupGetNodesEndpointsResponse.java |  2 +-
 .../client/compute/ClientExecuteTaskRequest.java   |  2 +-
 .../client/streamer/ClientDataStreamerReader.java  |  4 +-
 .../platform/cluster/PlatformClusterGroup.java     |  4 +-
 .../platform/compute/PlatformAbstractTask.java     |  2 +-
 .../platform/compute/PlatformCompute.java          |  2 +-
 .../datastreamer/PlatformDataStreamer.java         |  6 +--
 .../platform/dotnet/PlatformDotNetCacheStore.java  |  8 ++--
 .../dotnet/PlatformDotNetConsoleStream.java        |  2 +-
 .../processors/platform/events/PlatformEvents.java |  2 +-
 .../events/PlatformLocalEventListener.java         |  2 +-
 .../platform/memory/PlatformOutputStreamImpl.java  |  4 +-
 .../platform/services/PlatformServices.java        |  2 +-
 .../platform/utils/PlatformConfigurationUtils.java | 46 ++++++++++----------
 .../platform/utils/PlatformFutureUtils.java        | 14 +++---
 .../processors/platform/utils/PlatformUtils.java   | 10 ++---
 .../processors/plugin/IgnitePluginProcessor.java   |  4 +-
 .../processors/query/GridQueryProcessor.java       |  6 +--
 .../processors/query/QueryTypeDescriptorImpl.java  | 10 ++---
 .../internal/processors/query/QueryUtils.java      |  2 +-
 .../query/property/QueryBinaryProperty.java        |  8 ++--
 .../processors/query/stat/StatisticsKey.java       |  2 +-
 .../processors/query/stat/StatisticsTarget.java    |  2 +-
 .../stat/config/StatisticsColumnOverrides.java     |  2 +-
 .../rest/client/message/GridClientCacheBean.java   |  2 +-
 .../rest/handlers/task/GridTaskCommandHandler.java |  2 +-
 .../rest/protocols/tcp/GridMemcachedMessage.java   |  2 +-
 .../protocols/tcp/GridTcpMemcachedNioListener.java |  2 +-
 .../org/apache/ignite/internal/sql/SqlKeyword.java |  2 +-
 .../internal/util/GridBoundedLinkedHashSet.java    |  2 +-
 .../util/GridConcurrentPhantomHashSet.java         |  2 +-
 .../internal/util/GridConcurrentWeakHashSet.java   |  2 +-
 .../ignite/internal/util/GridStringBuilder.java    |  2 +-
 .../apache/ignite/internal/util/IgniteUtils.java   |  2 +-
 .../ignite/internal/util/StripedExecutor.java      |  2 +-
 .../util/io/GridByteArrayOutputStream.java         |  2 +-
 .../util/io/GridReversedLinesFileReader.java       |  2 +-
 .../util/ipc/shmem/IpcSharedMemorySpace.java       |  4 +-
 .../apache/ignite/internal/util/lang/GridFunc.java |  4 +-
 .../ignite/internal/util/nio/GridNioServer.java    |  2 +-
 .../util/tostring/GridToStringBuilder.java         |  6 +--
 .../visor/cache/VisorCacheConfiguration.java       |  2 +-
 .../internal/visor/cache/VisorCacheJdbcType.java   |  2 +-
 .../availability/VisorConnectivityTask.java        |  2 +-
 .../visor/node/VisorGridConfiguration.java         |  2 +-
 .../visor/persistence/PersistenceTask.java         |  2 +-
 .../visor/persistence/PersistenceTaskArg.java      |  2 +-
 .../ignite/internal/visor/util/VisorTaskUtils.java |  4 +-
 .../dotnet/PlatformDotNetAffinityFunction.java     |  2 +-
 .../spi/ExponentialBackoffTimeoutStrategy.java     |  2 +-
 .../tcp/TcpCommunicationMetricsListener.java       |  4 +-
 .../communication/tcp/internal/ConnectionKey.java  |  2 +-
 .../TcpCommunicationConfigInitializer.java         | 50 +++++++++++-----------
 .../ignite/spi/discovery/tcp/ClientImpl.java       |  6 +--
 .../ignite/spi/discovery/tcp/ServerImpl.java       | 12 +++---
 .../ignite/spi/discovery/tcp/TcpDiscoveryImpl.java |  2 +-
 .../discovery/tcp/internal/TcpDiscoveryNode.java   |  2 +-
 .../tcp/internal/TcpDiscoveryNodesRing.java        |  2 +-
 .../org/apache/ignite/stream/StreamAdapter.java    |  2 +-
 .../java/org/jsr166/ConcurrentLinkedDeque8.java    |  8 ++--
 .../java/org/jsr166/ConcurrentLinkedHashMap.java   |  2 +-
 .../ignite/cache/RebalanceCancellationTest.java    |  2 +-
 .../ignite/cache/ResetLostPartitionTest.java       |  4 +-
 .../ignite/client/ClientConfigurationTest.java     |  2 +-
 .../org/apache/ignite/client/FunctionalTest.java   |  4 +-
 .../org/apache/ignite/client/IgniteBinaryTest.java |  2 +-
 .../java/org/apache/ignite/client/LoadTest.java    |  2 +-
 .../apache/ignite/client/ReliabilityTestAsync.java |  2 +-
 .../ignite/internal/ClusterGroupAbstractTest.java  |  4 +-
 .../internal/GridDiscoveryEventSelfTest.java       | 10 ++---
 .../ignite/internal/GridDiscoverySelfTest.java     |  2 +-
 .../ignite/internal/GridKernalTestUtils.java       |  2 +-
 .../ignite/internal/GridSameVmStartupSelfTest.java |  4 +-
 .../ignite/internal/GridTaskTimeoutSelfTest.java   |  2 +-
 ...ientCheckClusterGroupLocalIdAfterReconnect.java |  4 +-
 .../IgniteSlowClientDetectionSelfTest.java         |  2 +-
 .../internal/TestRecordingCommunicationSpi.java    |  6 +--
 .../internal/TransactionsMXBeanImplTest.java       |  4 +-
 .../apache/ignite/internal/binary/AffinityKey.java |  2 +-
 .../internal/binary/BinaryEnumsSelfTest.java       | 20 ++++-----
 .../binary/BinaryFieldsAbstractSelfTest.java       | 18 ++++----
 .../BinaryObjectBuilderDefaultMappersSelfTest.java |  2 +-
 .../BinarySerialiedFieldComparatorSelfTest.java    |  2 +-
 .../ThinClientPartitionAwarenessDiscoveryTest.java |  2 +-
 .../FullyConnectedComponentSearcherTest.java       |  2 +-
 ...ectByteBufferStreamImplV2ByteOrderSelfTest.java |  2 +-
 .../GridCheckpointManagerAbstractSelfTest.java     |  4 +-
 .../IgniteCommunicationBalanceTest.java            |  6 +--
 .../GridDifferentLocalDeploymentSelfTest.java      |  6 +--
 .../GridDiscoveryManagerAttributesSelfTest.java    |  4 +-
 .../optimized/OptimizedObjectStreamSelfTest.java   |  2 +-
 .../AtomicCacheAffinityConfigurationTest.java      |  2 +-
 ...acheConfigurationSerializationAbstractTest.java |  2 +-
 ...eConfigurationSerializationOnDiscoveryTest.java | 10 ++---
 ...heConfigurationSerializationOnExchangeTest.java |  4 +-
 .../CacheGroupLocalConfigurationSelfTest.java      |  2 +-
 ...InterceptorPartitionCounterLocalSanityTest.java |  2 +-
 ...ceptorPartitionCounterRandomOperationsTest.java |  2 +-
 .../processors/cache/CacheMetricsManageTest.java   |  4 +-
 .../cache/CacheNoAffinityExchangeTest.java         |  2 +-
 .../processors/cache/CacheRebalancingSelfTest.java |  2 +-
 .../cache/CacheStoreTxPutAllMultiNodeTest.java     |  2 +-
 .../CacheStoreUsageMultinodeAbstractTest.java      |  2 +-
 .../cache/ClientSlowDiscoveryAbstractTest.java     |  2 +-
 .../ClientSlowDiscoveryTopologyChangeTest.java     |  6 +--
 .../ClientSlowDiscoveryTransactionRemapTest.java   |  2 +-
 .../processors/cache/ConcurrentCacheStartTest.java |  2 +-
 .../GridAbstractCacheInterceptorRebalanceTest.java |  2 +-
 .../cache/GridCacheAbstractRemoveFailureTest.java  |  2 +-
 .../GridCacheConcurrentTxMultiNodeLoadTest.java    |  4 +-
 .../cache/GridCacheEvictionEventAbstractTest.java  |  4 +-
 ...CacheLongRunningTransactionDiagnosticsTest.java |  2 +-
 .../cache/GridCacheOnCopyFlagAbstractSelfTest.java |  2 +-
 .../cache/GridCacheQueryEmbeddedValue.java         |  2 +-
 .../GridCacheStoreManagerDeserializationTest.java  |  2 +-
 ...idCacheTcpClientDiscoveryMultiThreadedTest.java |  4 +-
 .../cache/GridLocalIgniteSerializationTest.java    |  8 ++--
 .../GridTransactionsSystemUserTimeMetricsTest.java |  6 +--
 .../cache/IgniteCacheAbstractStopBusySelfTest.java |  2 +-
 .../IgniteCacheBinaryEntryProcessorSelfTest.java   |  2 +-
 .../IgniteCacheConfigVariationsFullApiTest.java    |  2 +-
 .../IgniteCacheEntryListenerAbstractTest.java      |  2 +-
 .../processors/cache/IgniteCacheGroupsTest.java    |  4 +-
 .../cache/IgniteCacheInvokeAbstractTest.java       |  4 +-
 .../cache/IgniteCachePeekModesAbstractTest.java    | 14 +++---
 .../cache/IgniteClientCacheStartFailoverTest.java  |  2 +-
 ...usterActivateDeactivateTestWithPersistence.java |  4 +-
 ...teDynamicCacheStartCoordinatorFailoverTest.java |  6 +--
 .../cache/IgniteIncompleteCacheObjectSelfTest.java |  2 +-
 ...IgniteMarshallerCacheClassNameConflictTest.java |  2 +-
 .../cache/IgniteMarshallerCacheFSRestoreTest.java  |  4 +-
 .../cache/IgniteTxConfigCacheSelfTest.java         |  2 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java       |  2 +-
 .../PartitionsExchangeCoordinatorFailoverTest.java | 14 +++---
 .../SetTxTimeoutOnPartitionMapExchangeTest.java    |  2 +-
 .../cache/TransactionValidationTest.java           |  2 +-
 .../cache/WalModeChangeAdvancedSelfTest.java       |  2 +-
 .../cache/WalModeChangeCommonAbstractSelfTest.java |  2 +-
 .../binary/BinaryMetadataUpdatesFlowTest.java      |  4 +-
 ...eBinaryObjectMetadataExchangeMultinodeTest.java |  8 ++--
 .../GridCacheBinaryObjectsAbstractSelfTest.java    |  4 +-
 ...lientNodeBinaryObjectMetadataMultinodeTest.java |  2 +-
 .../GridCacheSetAbstractSelfTest.java              |  4 +-
 .../datastructures/IgniteLockAbstractSelfTest.java |  2 +-
 .../IgniteSemaphoreAbstractSelfTest.java           |  8 ++--
 .../GridCachePartitionedNodeRestartTxSelfTest.java |  8 ++--
 .../distributed/CacheBaselineTopologyTest.java     |  6 +--
 .../cache/distributed/CacheExchangeMergeTest.java  |  4 +-
 .../CacheLateAffinityAssignmentTest.java           |  2 +-
 ...CachePartitionLostAfterSupplierHasLeftTest.java |  2 +-
 .../GridCachePartitionNotLoadedEventSelfTest.java  |  2 +-
 .../GridCachePreloadLifecycleAbstractTest.java     |  2 +-
 .../IgniteCacheClientNodeChangingTopologyTest.java |  2 +-
 .../dht/GridCacheColocatedDebugTest.java           |  4 +-
 .../GridCachePartitionsStateValidationTest.java    | 10 ++---
 .../dht/topology/BlockedEvictionsTest.java         |  8 ++--
 ...MovingPartitionIsEvictedDuringClearingTest.java |  2 +-
 .../dht/topology/PartitionEvictionOrderTest.java   |  2 +-
 ...reloadingRestartWhileClearingPartitionTest.java |  4 +-
 .../near/GridCacheNearMetricsSelfTest.java         | 12 +++---
 .../GridCacheNearOnlyMultiNodeFullApiSelfTest.java |  4 +-
 .../GridCacheRebalancingOrderingTest.java          | 12 +++---
 .../GridCacheRebalancingPartitionCountersTest.java |  2 +-
 .../GridCacheRebalancingWithAsyncClearingTest.java |  4 +-
 .../GridCacheReplicatedPreloadSelfTest.java        |  4 +-
 .../IgniteCacheExpireWhileRebalanceTest.java       |  2 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java       |  4 +-
 .../IgniteCacheNoWriteThroughAbstractTest.java     |  2 +-
 .../cache/mvcc/CacheMvccAbstractFeatureTest.java   |  2 +-
 .../cache/mvcc/CacheMvccAbstractTest.java          |  2 +-
 .../cache/mvcc/CacheMvccClientTopologyTest.java    |  2 +-
 .../cache/mvcc/CacheMvccTxFailoverTest.java        |  4 +-
 ...niteBaselineAffinityTopologyActivationTest.java | 24 +++++------
 ...gniteLostPartitionsOnLeaveBaselineSelfTest.java |  2 +-
 ...gnitePdsBinaryMetadataOnClusterRestartTest.java | 32 +++++++-------
 .../IgnitePdsCacheAssignmentNodeRestartsTest.java  | 10 ++---
 ...CacheConfigurationFileConsistencyCheckTest.java |  8 ++--
 .../IgnitePdsCacheRebalancingAbstractTest.java     |  4 +-
 ...itePdsCacheStartStopWithFreqCheckpointTest.java |  2 +-
 ...nitePdsConsistencyOnDelayedPartitionOwning.java |  6 +--
 .../persistence/IgnitePdsCorruptedIndexTest.java   |  8 ++--
 .../persistence/IgnitePdsDefragmentationTest.java  |  2 +-
 ...ocalWalModeChangeDuringRebalancingSelfTest.java | 10 ++---
 .../MemoryPolicyInitializationTest.java            |  2 +-
 .../PagesPossibleCorruptionDiagnosticTest.java     |  2 +-
 .../ClientAffinityAssignmentWithBaselineTest.java  |  2 +-
 .../persistence/db/IgniteLogicalRecoveryTest.java  | 18 ++++----
 ...IgnitePdsCacheWalDisabledOnRebalancingTest.java | 20 ++++-----
 .../db/IgnitePdsTransactionsHangTest.java          |  2 +-
 .../db/file/IgnitePdsDiskErrorsRecoveringTest.java | 20 ++++-----
 .../persistence/db/wal/IgniteWalRebalanceTest.java | 22 +++++-----
 .../db/wal/WalArchiveSizeConfigurationTest.java    |  2 +-
 .../IgniteAbstractWalIteratorInvalidCrcTest.java   |  2 +-
 .../defragmentation/DefragmentationMXBeanTest.java |  2 +-
 .../persistence/pagemem/FullPageIdTableTest.java   |  2 +-
 .../IgnitePageMemReplaceDelayedWriteUnitTest.java  |  2 +-
 .../pagemem/RobinHoodBackwardShiftHashMapTest.java |  2 +-
 .../snapshot/IgniteClusterSnapshotSelfTest.java    |  2 +-
 .../persistence/tree/io/TrackingPageIOTest.java    |  4 +-
 .../wal/WalEnableDisableWithNodeShutdownTest.java  |  2 +-
 .../wal/WalEnableDisableWithRestartsTest.java      |  4 +-
 .../IgniteCacheQueryCacheDestroySelfTest.java      |  2 +-
 .../CacheContinuousQueryLongP2PTest.java           |  2 +-
 ...heContinuousQueryOperationFromCallbackTest.java |  2 +-
 .../CacheContinuousQueryOrderingEventTest.java     |  2 +-
 .../CacheContinuousQueryRandomOperationsTest.java  |  2 +-
 .../GridCacheContinuousQueryConcurrentTest.java    |  2 +-
 ...cheClientWriteBehindStoreNonCoalescingTest.java |  2 +-
 .../AbstractTransactionIntergrityTest.java         |  2 +-
 .../TxPartitionCounterStateConsistencyTest.java    |  6 +--
 .../TxRecoveryWithConcurrentRollbackTest.java      |  2 +-
 .../transactions/TxWithKeyContentionSelfTest.java  |  2 +-
 .../cluster/ClusterReadOnlyModeSelfTest.java       |  2 +-
 .../continuous/GridEventConsumeSelfTest.java       |  4 +-
 .../processors/database/BPlusTreeSelfTest.java     | 36 ++++++++--------
 .../processors/database/IgniteDbAbstractTest.java  |  2 +-
 .../database/IgniteDbSingleNodeTinyPutGetTest.java |  4 +-
 .../database/SwapPathConstructionSelfTest.java     |  2 +-
 .../datastreamer/DataStreamerImplSelfTest.java     |  8 ++--
 .../cache/GridCacheCommandHandlerSelfTest.java     |  4 +-
 .../query/GridQueryCommandHandlerTest.java         |  2 +-
 .../security/client/CommonSecurityCheckTest.java   |  4 +-
 ...butedClosureRemoteSecurityContextCheckTest.java |  4 +-
 .../impl/TestAdditionalSecurityProcessor.java      |  4 +-
 .../security/impl/TestSecurityProcessor.java       |  2 +-
 ...GridServiceProxyTopologyInitializationTest.java |  2 +-
 .../internal/sql/SqlParserCreateIndexSelfTest.java |  2 +-
 .../internal/util/collection/BitSetIntSetTest.java |  6 +--
 .../internal/util/collection/IntHashMapTest.java   |  4 +-
 .../IpcSharedMemoryCrashDetectionSelfTest.java     |  2 +-
 .../util/ipc/shmem/SharedMemoryTestClient.java     |  2 +-
 .../ignite/internal/util/nio/GridNioSelfTest.java  |  6 +--
 .../util/tostring/GridToStringBuilderSelfTest.java |  2 +-
 .../direct/multisplit/GridLoadTestJob.java         |  2 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java       |  2 +-
 .../ignite/loadtests/job/GridJobLoadTestJob.java   |  2 +-
 .../ignite/marshaller/GridMarshallerTestBean.java  |  2 +-
 .../marshaller/MarshallerContextSelfTest.java      | 12 +++---
 ...2PContinuousDeploymentClientDisconnectTest.java |  6 +--
 .../p2p/GridP2PContinuousDeploymentSelfTest.java   |  4 +-
 .../p2p/GridP2PDoubleDeploymentSelfTest.java       |  4 +-
 .../ignite/p2p/GridP2PLocalDeploymentSelfTest.java |  2 +-
 .../p2p/GridP2PRemoteClassLoadersSelfTest.java     |  8 ++--
 .../apache/ignite/p2p/GridP2PTimeoutSelfTest.java  |  4 +-
 .../platform/AbstractPlatformServiceCallTask.java  |  2 +-
 .../ignite/platform/PlatformComputeEchoTask.java   |  2 +-
 .../ignite/platform/PlatformDeployServiceTask.java | 12 +++---
 .../platform/PlatformIsPartitionReservedTask.java  |  2 +-
 .../PlatformThinClientConnectionsTask.java         |  2 +-
 .../ignite/platform/javaobject/TestJavaObject.java | 12 +++---
 .../ignite/plugin/AbstractTestPluginProvider.java  |  2 +-
 ...SharedFsCheckpointSpiMultiThreadedSelfTest.java |  4 +-
 .../communication/GridCacheMessageSelfTest.java    |  6 +--
 ...unicationInverseConnectionEstablishingTest.java |  6 +--
 ...pCommunicationSpiConcurrentConnectSelfTest.java |  2 +-
 .../tcp/GridTcpCommunicationSpiLogTest.java        |  2 +-
 .../spi/discovery/ClusterRebalancedMetricTest.java |  6 +--
 .../IgniteDiscoveryCacheReuseSelfTest.java         |  4 +-
 .../spi/discovery/tcp/IgniteClientConnectTest.java |  2 +-
 ...cpClientDiscoverySpiFailureTimeoutSelfTest.java |  4 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java         |  6 +--
 .../tcp/TcpDiscoveryIpFinderFailureTest.java       |  2 +-
 .../tcp/TcpDiscoveryNodeConsistentIdSelfTest.java  |  2 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java    | 10 ++---
 .../AbstractTestDependencyResolver.java            |  2 +-
 .../apache/ignite/testframework/GridTestNode.java  |  2 +-
 .../apache/ignite/testframework/GridTestUtils.java |  6 +--
 .../testframework/config/GridTestProperties.java   |  2 +-
 .../testframework/junits/GridAbstractTest.java     |  2 +-
 .../junits/common/GridCommonAbstractTest.java      |  2 +-
 .../common/GridRollingRestartAbstractTest.java     |  2 +-
 .../development/utils/IgniteWalConverter.java      |  2 +-
 .../plugin/PlatformTestPluginProvider.java         |  2 +-
 .../platform/plugin/PlatformTestPluginTarget.java  |  4 +-
 .../query/h2/opt/GeoSpatialIndexFactory.java       |  2 +-
 .../query/h2/opt/GeoSpatialIndexImpl.java          |  6 +--
 .../processors/query/h2/opt/GeoSpatialUtils.java   |  2 +-
 .../query/h2/opt/GridH2SpatialIndex.java           |  2 +-
 .../cache/hibernate/HibernateKeyWrapper.java       |  2 +-
 .../cache/hibernate/HibernateL2CacheSelfTest.java  |  2 +-
 .../HibernateL2CacheStrategySelfTest.java          |  2 +-
 .../cache/hibernate/HibernateKeyWrapper.java       |  2 +-
 .../cache/hibernate/HibernateL2CacheSelfTest.java  |  2 +-
 .../HibernateL2CacheStrategySelfTest.java          |  2 +-
 .../cache/hibernate/HibernateKeyWrapper.java       |  2 +-
 .../cache/hibernate/IgniteEntityDataAccess.java    |  2 +-
 .../cache/hibernate/HibernateL2CacheSelfTest.java  | 18 ++++----
 .../HibernateL2CacheStrategySelfTest.java          |  2 +-
 .../hibernate/HibernateAccessStrategyFactory.java  |  2 +-
 .../managers/systemview/SystemViewLocal.java       | 24 +++++------
 .../processors/query/h2/CommandProcessor.java      | 22 +++++-----
 .../processors/query/h2/ConnectionManager.java     |  2 +-
 .../internal/processors/query/h2/H2Utils.java      |  2 +-
 .../internal/processors/query/h2/QueryParser.java  |  2 +-
 .../processors/query/h2/database/H2TreeIndex.java  |  2 +-
 .../processors/query/h2/dml/DmlAstUtils.java       |  8 ++--
 .../internal/processors/query/h2/dml/DmlUtils.java |  6 +--
 .../processors/query/h2/dml/UpdatePlan.java        |  6 +--
 .../processors/query/h2/dml/UpdatePlanBuilder.java | 12 +++---
 .../processors/query/h2/index/H2RowComparator.java |  2 +-
 .../query/h2/index/QueryRowHandlerFactory.java     |  2 +-
 .../query/h2/index/client/ClientIndexFactory.java  |  2 +-
 .../query/h2/index/keys/DateIndexKey.java          |  2 +-
 .../query/h2/index/keys/TimeIndexKey.java          |  2 +-
 .../query/h2/index/keys/TimestampIndexKey.java     |  2 +-
 .../processors/query/h2/opt/GridH2Table.java       |  4 +-
 .../query/h2/opt/GridLuceneInputStream.java        |  2 +-
 .../processors/query/h2/opt/H2IndexCostedBase.java |  6 +--
 .../processors/query/h2/sql/GridSqlColumn.java     |  2 +-
 .../query/h2/sql/GridSqlQueryParser.java           | 12 +++---
 .../processors/query/h2/sql/SqlAstTraverser.java   | 22 +++++-----
 .../processors/query/stat/BusyExecutor.java        |  2 +-
 .../processors/query/stat/ColumnStatistics.java    |  2 +-
 .../query/stat/ColumnStatisticsCollector.java      |  2 +-
 .../internal/processors/query/stat/Hasher.java     | 28 ++++++------
 .../stat/IgniteStatisticsConfigurationManager.java |  2 +-
 .../stat/IgniteStatisticsPersistenceStoreImpl.java |  2 +-
 .../query/stat/ObjectPartitionStatisticsImpl.java  |  2 +-
 .../query/stat/ObjectStatisticsImpl.java           |  2 +-
 .../processors/query/stat/StatisticsUtils.java     |  2 +-
 .../internal/processors/query/stat/hll/HLL.java    |  2 +-
 .../query/stat/messages/StatisticsKeyMessage.java  |  2 +-
 .../visor/verify/ValidateIndexesClosure.java       | 10 ++---
 .../ignite/cache/query/IndexQueryAliasTest.java    |  4 +-
 .../ignite/cache/query/IndexQueryAllTypesTest.java |  4 +-
 .../ignite/cache/query/IndexQueryFailoverTest.java |  8 ++--
 .../ignite/cache/query/IndexQueryFilterTest.java   |  2 +-
 .../cache/query/IndexQueryKeepBinaryTest.java      |  4 +-
 .../ignite/cache/query/IndexQueryLocalTest.java    |  4 +-
 .../cache/query/IndexQueryQueryEntityTest.java     |  4 +-
 .../ignite/cache/query/IndexQueryRangeTest.java    |  6 +--
 .../ignite/cache/query/IndexQuerySqlIndexTest.java |  6 +--
 .../ignite/cache/query/MultiTableIndexQuery.java   | 24 +++++------
 .../cache/query/MultifieldIndexQueryTest.java      | 14 +++---
 .../apache/ignite/client/FunctionalQueryTest.java  |  2 +-
 .../ignite/client/IgniteBinaryQueryTest.java       |  2 +-
 .../org/apache/ignite/client/SecurityTest.java     |  4 +-
 .../metric/AbstractIndexPageMetricsTest.java       |  2 +-
 .../ignite/internal/metric/IndexPageCounter.java   |  2 +-
 .../IndexPagesMetricsPageDisplacementTest.java     |  4 +-
 .../processors/cache/BigEntryQueryTest.java        |  2 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java    |  6 +--
 .../cache/GridCacheFullTextQueryPagesTest.java     |  2 +-
 .../IgniteBinaryObjectQueryArgumentsTest.java      |  4 +-
 .../IgniteCacheAbstractInsertSqlQuerySelfTest.java |  6 +--
 .../cache/IgniteCacheAbstractQuerySelfTest.java    |  2 +-
 .../IgniteCacheAbstractSqlDmlQuerySelfTest.java    |  2 +-
 .../cache/IgniteCacheUpdateSqlQuerySelfTest.java   | 30 ++++++-------
 .../cache/IgniteClientReconnectQueriesTest.java    |  2 +-
 .../encryption/EncryptedSqlTemplateTableTest.java  |  2 +-
 .../cache/index/AbstractIndexingCommonTest.java    |  4 +-
 .../cache/index/AbstractSchemaSelfTest.java        |  4 +-
 .../processors/cache/index/BasicIndexTest.java     | 18 ++++----
 ...ransactionsCommandsWithMvccEnabledSelfTest.java |  2 +-
 .../cache/index/SqlTransactionsSelfTest.java       |  2 +-
 .../index/StopNodeOnRebuildIndexFailureTest.java   |  4 +-
 .../cache/local/IgniteCacheLocalQuerySelfTest.java |  2 +-
 .../mvcc/CacheMvccSqlQueriesAbstractTest.java      |  2 +-
 .../IgnitePdsIndexingDefragmentationTest.java      |  2 +-
 .../db/LongDestroyDurableBackgroundTaskTest.java   |  2 +-
 .../persistence/db/wal/IgniteWalRecoveryTest.java  |  4 +-
 .../query/ScanQueryConcurrentSqlUpdatesTest.java   |  2 +-
 ...niteDbSingleNodeWithIndexingWalRestoreTest.java |  4 +-
 .../IgnitePersistentStoreSchemaLoadTest.java       |  2 +-
 .../query/IgniteSqlGroupConcatCollocatedTest.java  |  2 +-
 .../IgniteSqlGroupConcatNotCollocatedTest.java     |  4 +-
 .../query/IgniteSqlKeyValueFieldsTest.java         |  4 +-
 .../query/IgniteSqlSegmentedIndexSelfTest.java     |  2 +-
 ...niteSqlSinglePartitionMultiParallelismTest.java |  6 +--
 ...SqlFieldTypeValidationOnKeyValueInsertTest.java |  2 +-
 .../query/SqlFieldTypeValidationTypesTest.java     |  4 +-
 .../query/SqlNotNullKeyValueFieldTest.java         |  4 +-
 .../processors/query/SqlSchemaSelfTest.java        |  2 +-
 .../processors/query/SqlSystemViewsSelfTest.java   |  2 +-
 .../query/h2/IgniteSqlQueryMinMaxTest.java         |  4 +-
 .../inlinecolumn/InlineIndexColumnTest.java        |  8 ++--
 .../query/h2/sql/GridQueryParsingTest.java         |  8 ++--
 .../DisappearedCacheCauseRetryMessageSelfTest.java |  2 +-
 ...DisappearedCacheWasNotFoundMessageSelfTest.java |  2 +-
 .../query/stat/ManagerStatisticsTypesTest.java     |  6 +--
 .../query/stat/SqlStatisticsCommandTests.java      |  4 +-
 .../query/stat/StatisticsStorageTest.java          |  8 ++--
 .../query/stat/StatisticsTypesAbstractTest.java    |  2 +-
 .../ignite/cache/jta/jndi/CacheJndiTmFactory.java  |  2 +-
 .../ignite/cache/jta/jndi/CacheJndiTmLookup.java   |  2 +-
 .../cache/GridJtaLifecycleAwareSelfTest.java       |  2 +-
 .../TestKubernetesIpFinderDisconnection.java       |  4 +-
 .../ml/catboost/CatboostClassificationModel.java   |  2 +-
 .../ml/catboost/CatboostRegressionModel.java       |  2 +-
 .../org/apache/ignite/ml/h2o/H2OMojoModel.java     | 10 ++---
 .../ignite/ml/composition/boosting/GDBModel.java   |  2 +-
 .../ignite/ml/dataset/feature/BucketMeta.java      |  6 +--
 .../impl/bootstrapping/BootstrappedVector.java     |  2 +-
 .../cache/util/DatasetAffinityFunctionWrapper.java |  2 +-
 .../parallelism/DefaultParallelismStrategy.java    |  2 +-
 .../ignite/ml/inference/json/JacksonHelper.java    |  2 +-
 .../storage/model/DefaultModelStorage.java         | 10 ++---
 .../ignite/ml/knn/ann/ANNClassificationModel.java  |  2 +-
 .../math/distances/WeightedMinkowskiDistance.java  |  2 +-
 .../storage/VectorizedViewMatrixStorage.java       |  4 +-
 .../discrete/DiscreteNaiveBayesTrainer.java        |  2 +-
 .../gaussian/GaussianNaiveBayesTrainer.java        |  2 +-
 .../onehotencoder/OneHotEncoderPreprocessor.java   |  2 +-
 .../normalization/NormalizationTrainer.java        |  2 +-
 .../logistic/LogisticRegressionSGDTrainer.java     |  6 +--
 .../ml/selection/cv/AbstractCrossValidation.java   |  8 ++--
 .../org/apache/ignite/ml/structures/Dataset.java   |  4 +-
 .../partition/LabelPartitionDataBuilderOnHeap.java |  2 +-
 .../apache/ignite/ml/util/genetic/Chromosome.java  |  2 +-
 .../apache/ignite/ml/common/LocalModelsTest.java   |  2 +-
 .../ignite/ml/knn/ANNClassificationTest.java       |  8 ++--
 .../vector/storage/DenseVectorStorageTest.java     |  2 +-
 ...onTreeClassificationTrainerIntegrationTest.java |  6 +--
 ...cisionTreeRegressionTrainerIntegrationTest.java |  6 +--
 .../ml/tree/DecisionTreeRegressionTrainerTest.java |  6 +--
 .../RandomForestClassifierTrainerTest.java         |  4 +-
 .../RandomForestRegressionTrainerTest.java         |  4 +-
 .../ignite/ml/util/genetic/PopulationTest.java     |  4 +-
 .../apache/ignite/osgi/IgniteOsgiServiceTest.java  |  2 +-
 .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java    |  2 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java      |  6 +--
 ...gniteSpringBeanSpringResourceInjectionTest.java |  2 +-
 .../surefire/testsuites/IgniteTestsProvider.java   |  2 +-
 .../ignite/cache/websession/WebSessionFilter.java  |  6 +--
 .../internal/websession/WebSessionSelfTest.java    | 10 ++---
 .../cache/IgniteBinaryIdentityBenchmark.java       |  2 +-
 .../cache/dml/IgniteSqlMergeQueryBenchmark.java    |  4 +-
 .../thin/cache/IgniteThinBenchmarkUtils.java       |  4 +-
 .../yarn/IgniteApplicationMasterSelfTest.java      |  4 +-
 .../zk/internal/ZookeeperClusterNode.java          |  4 +-
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java     |  2 +-
 ...ZookeeperDiscoveryCommunicationFailureTest.java |  2 +-
 .../internal/ZookeeperDiscoverySpiSslTestBase.java |  2 +-
 618 files changed, 1427 insertions(+), 1427 deletions(-)

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 869689b..4c407e7 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -99,7 +99,7 @@
         -->
         <module name="NoWhitespaceAfter">
             <property name="tokens" value="AT, INC, DEC, UNARY_MINUS, UNARY_PLUS, BNOT, LNOT, DOT, ARRAY_DECLARATOR,
-                INDEX_OP, METHOD_REF"/>
+                INDEX_OP, METHOD_REF, TYPECAST"/>
         </module>
 
         <!--
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java
index 0144ea7..516dbb1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java
@@ -76,7 +76,7 @@ public class ANNClassificationExportImportExample {
                     .withMaxIterations(1000)
                     .withEpsilon(1e-2);
 
-                ANNClassificationModel mdl = (ANNClassificationModel) trainer.fit(
+                ANNClassificationModel mdl = (ANNClassificationModel)trainer.fit(
                     ignite,
                     dataCache,
                     new DoubleArrayVectorizer<Integer>().labeled(Vectorizer.LabelCoordinate.FIRST)
@@ -142,7 +142,7 @@ public class ANNClassificationExportImportExample {
 
             System.out.println(">>> ---------------------------------");
 
-            accuracy = 1 - amountOfErrors / (double) totalAmount;
+            accuracy = 1 - amountOfErrors / (double)totalAmount;
 
         }
         return accuracy;
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java
index ba61352..2b8bf95 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java
@@ -140,6 +140,6 @@ public class RandomForestClassificationExportImportExample {
             }
         }
 
-        return 1 - amountOfErrors / (double) totalAmount;
+        return 1 - amountOfErrors / (double)totalAmount;
     }
 }
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/sql/DecisionTreeClassificationTrainerSQLTableExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/sql/DecisionTreeClassificationTrainerSQLTableExample.java
index d05d1a9..3acc85a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/sql/DecisionTreeClassificationTrainerSQLTableExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/sql/DecisionTreeClassificationTrainerSQLTableExample.java
@@ -157,7 +157,7 @@ public class DecisionTreeClassificationTrainerSQLTableExample {
             return null;
 
         if (obj instanceof Number) {
-            Number num = (Number) obj;
+            Number num = (Number)obj;
 
             return num.doubleValue();
         }
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
index 4df67f8..24dd523 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
@@ -58,7 +58,7 @@ public class GridifyAspectJAspect {
     @SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown", "unchecked"})
     @Around("execution(@org.apache.ignite.compute.gridify.Gridify * *(..)) && !cflow(call(* org.apache.ignite.compute.ComputeJob.*(..)))")
     public Object gridify(ProceedingJoinPoint joinPnt) throws Throwable {
-        Method mtd = ((MethodSignature) joinPnt.getSignature()).getMethod();
+        Method mtd = ((MethodSignature)joinPnt.getSignature()).getMethod();
 
         Gridify ann = mtd.getAnnotation(Gridify.class);
 
@@ -112,7 +112,7 @@ public class GridifyAspectJAspect {
             return ignite.compute().withTimeout(ann.timeout()).execute(ann.taskName(), arg);
         }
         catch (Exception e) {
-            for (Class<?> ex : ((MethodSignature) joinPnt.getSignature()).getMethod().getExceptionTypes()) {
+            for (Class<?> ex : ((MethodSignature)joinPnt.getSignature()).getMethod().getExceptionTypes()) {
                 // Descend all levels down.
                 Throwable cause = e.getCause();
 
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
index 1ae43bb..653f057 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
@@ -60,7 +60,7 @@ public class GridifySetToSetAspectJAspect extends GridifySetToSetAbstractAspect
     @Around("execution(@org.apache.ignite.compute.gridify.GridifySetToSet * *(..)) && " +
         "!cflow(call(* org.apache.ignite.compute.ComputeJob.*(..)))")
     public Object gridify(ProceedingJoinPoint joinPnt) throws Throwable {
-        Method mtd = ((MethodSignature) joinPnt.getSignature()).getMethod();
+        Method mtd = ((MethodSignature)joinPnt.getSignature()).getMethod();
 
         GridifySetToSet ann = mtd.getAnnotation(GridifySetToSet.class);
 
@@ -124,7 +124,7 @@ public class GridifySetToSetAspectJAspect extends GridifySetToSetAbstractAspect
                 ann.threshold(), ann.splitSize(), ann.timeout());
         }
         catch (Exception e) {
-            for (Class<?> ex : ((MethodSignature) joinPnt.getSignature()).getMethod().getExceptionTypes()) {
+            for (Class<?> ex : ((MethodSignature)joinPnt.getSignature()).getMethod().getExceptionTypes()) {
                 // Descend all levels down.
                 Throwable cause = e.getCause();
 
diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
index 8848e68..55cebe4 100644
--- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
+++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
@@ -60,7 +60,7 @@ public class GridifySetToValueAspectJAspect extends GridifySetToValueAbstractAsp
     @Around("execution(@org.apache.ignite.compute.gridify.GridifySetToValue * *(..)) && " +
         "!cflow(call(* org.apache.ignite.compute.ComputeJob.*(..)))")
     public Object gridify(ProceedingJoinPoint joinPnt) throws Throwable {
-        Method mtd = ((MethodSignature) joinPnt.getSignature()).getMethod();
+        Method mtd = ((MethodSignature)joinPnt.getSignature()).getMethod();
 
         GridifySetToValue ann = mtd.getAnnotation(GridifySetToValue.class);
 
@@ -124,7 +124,7 @@ public class GridifySetToValueAspectJAspect extends GridifySetToValueAbstractAsp
                 ann.threshold(), ann.splitSize(), ann.timeout());
         }
         catch (Exception e) {
-            for (Class<?> ex : ((MethodSignature) joinPnt.getSignature()).getMethod().getExceptionTypes()) {
+            for (Class<?> ex : ((MethodSignature)joinPnt.getSignature()).getMethod().getExceptionTypes()) {
                 // Descend all levels down.
                 Throwable cause = e.getCause();
 
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
index 9d08d35..60cc7cf 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
@@ -397,7 +397,7 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
             if (targetObj instanceof TestAopTarget)
                 res = ((TestAopTarget)targetObj).gridifyDefault("1");
             else
-                res = ((TestAopTargetInterface) targetObj).gridifyDefault("1");
+                res = ((TestAopTargetInterface)targetObj).gridifyDefault("1");
 
             assert res == 1 : "Invalid gridifyDefault result: " + res;
         }
@@ -426,7 +426,7 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
 
             Method gridifyMtd = targetObj.getClass().getDeclaredMethod("gridifyDefault", String.class);
 
-            res = (Integer) gridifyMtd.invoke(targetObj, "1");
+            res = (Integer)gridifyMtd.invoke(targetObj, "1");
 
             if (res != 1)
                 fail("Method gridifyDefault returned wrong value [result=" + res + ", expect=1]");
@@ -508,7 +508,7 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
 
             Method gridifyMtd = targetObj.getClass().getDeclaredMethod("gridifyDefaultResource", String.class);
 
-            res = (Integer) gridifyMtd.invoke(targetObj, "2");
+            res = (Integer)gridifyMtd.invoke(targetObj, "2");
 
             if (res != 2)
                 fail("Method gridifyDefaultResource returned wrong value [result=" + res + ", expect=2]");
@@ -542,9 +542,9 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
             Object targetObj = target();
 
             if (targetObj instanceof TestAopTarget)
-                res = ((TestAopTarget) targetObj).gridifyNonDefaultClass("1");
+                res = ((TestAopTarget)targetObj).gridifyNonDefaultClass("1");
             else
-                res = ((TestAopTargetInterface) targetObj).gridifyNonDefaultClass("1");
+                res = ((TestAopTargetInterface)targetObj).gridifyNonDefaultClass("1");
 
             if (res != 10)
                 fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=10]");
@@ -575,9 +575,9 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
             Object targetObj = target();
 
             if (targetObj instanceof TestAopTarget)
-                res = ((TestAopTarget) targetObj).gridifyNonDefaultName("2");
+                res = ((TestAopTarget)targetObj).gridifyNonDefaultName("2");
             else
-                res = ((TestAopTargetInterface) targetObj).gridifyNonDefaultName("2");
+                res = ((TestAopTargetInterface)targetObj).gridifyNonDefaultName("2");
 
             if (res != 20)
                 fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=2]");
@@ -607,9 +607,9 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
 
             try {
                 if (targetObj instanceof TestAopTarget)
-                    ((TestAopTarget) targetObj).gridifyDefaultException("1");
+                    ((TestAopTarget)targetObj).gridifyDefaultException("1");
                 else
-                    ((TestAopTargetInterface) targetObj).gridifyDefaultException("1");
+                    ((TestAopTargetInterface)targetObj).gridifyDefaultException("1");
             }
             catch (TestGridifyException e) {
                 info("@Gridify method gridifyDefaultException(0) returns exception: " + e);
@@ -683,9 +683,9 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
             Object targetObj = target();
 
             if (targetObj instanceof TestAopTarget)
-                res = ((TestAopTarget) targetObj).gridifyNonDefaultClassResource("3");
+                res = ((TestAopTarget)targetObj).gridifyNonDefaultClassResource("3");
             else
-                res = ((TestAopTargetInterface) targetObj).gridifyNonDefaultClassResource("3");
+                res = ((TestAopTargetInterface)targetObj).gridifyNonDefaultClassResource("3");
 
             if (res != 30)
                 fail("Method gridifyNonDefaultClassResource returned wrong value [result=" + res + ", expect=3]");
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/algo/BenchmarkCRC.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/algo/BenchmarkCRC.java
index 4d50edf..5271cae 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/algo/BenchmarkCRC.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/algo/BenchmarkCRC.java
@@ -62,7 +62,7 @@ public class BenchmarkCRC {
         /** */
         @Setup
         public void setup() {
-            new Random().ints(BUF_LEN, Byte.MIN_VALUE, Byte.MAX_VALUE).forEach(k -> bb.put((byte) k));
+            new Random().ints(BUF_LEN, Byte.MIN_VALUE, Byte.MAX_VALUE).forEach(k -> bb.put((byte)k));
         }
     }
 
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
index bcfe529..03abc4e 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
@@ -133,7 +133,7 @@ public class CassandraCacheStore<K, V> implements CacheStore<K, V> {
                     String qry = ((String)obj).trim();
 
                     if (qry.toLowerCase().startsWith("select"))
-                        task = new LoadCacheCustomQueryWorker<>(ses, (String) obj, controller, log, clo);
+                        task = new LoadCacheCustomQueryWorker<>(ses, (String)obj, controller, log, clo);
                 }
 
                 if (task != null)
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
index b1ab0b0..139a97d 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
@@ -108,7 +108,7 @@ public class CassandraHelper {
                     KEYSPACE_EXIST_ERROR2.matcher(e.getMessage()).matches()))
                 return true;
 
-            if (e instanceof NoHostAvailableException && ((NoHostAvailableException) e).getErrors() != null) {
+            if (e instanceof NoHostAvailableException && ((NoHostAvailableException)e).getErrors() != null) {
                 NoHostAvailableException ex = (NoHostAvailableException)e;
 
                 for (Map.Entry<InetSocketAddress, Throwable> entry : ex.getErrors().entrySet()) {
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java
index eb244fd..59e0667 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java
@@ -447,7 +447,7 @@ public class PersistenceController {
             Object val = field.getValueFromObject(obj, serializer);
 
             if (val instanceof byte[])
-                val = ByteBuffer.wrap((byte[]) val);
+                val = ByteBuffer.wrap((byte[])val);
 
             values[offset] = val;
 
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/Product.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/Product.java
index 624b27b..acdb10c 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/Product.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/Product.java
@@ -56,7 +56,7 @@ public class Product {
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object obj) {
-        return obj instanceof Product && id == ((Product) obj).id;
+        return obj instanceof Product && id == ((Product)obj).id;
     }
 
     /** {@inheritDoc} */
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java
index 88f5b71..0c7ba67 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java
@@ -77,7 +77,7 @@ public class ProductOrder {
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object obj) {
-        return obj instanceof ProductOrder && id == ((ProductOrder) obj).id;
+        return obj instanceof ProductOrder && id == ((ProductOrder)obj).id;
     }
 
     /** {@inheritDoc} */
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java
index f0b7a9b..c4272bd 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestCacheSession.java
@@ -78,7 +78,7 @@ public class TestCacheSession implements CacheStoreSession {
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Nullable @Override public <T> T attachment() {
-        return (T) attach;
+        return (T)attach;
     }
 
     /** {@inheritDoc} */
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
index 345ed8e..67c00f8 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
@@ -742,7 +742,7 @@ public class TestsHelper {
             if (i % 2 != 0)
                 price = price / 2;
             else
-                price = (float) Math.sqrt(price);
+                price = (float)Math.sqrt(price);
 
             i++;
         }
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
index d06a2f3..c1142e1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
@@ -236,7 +236,7 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            Person person = (Person) o;
+            Person person = (Person)o;
 
             if (id != person.id) return false;
             if (age != person.age) return false;
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java
index a2f942a..63e633a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java
@@ -64,7 +64,7 @@ public class JdbcSpringSelfTest extends JdbcConnectionSelfTest {
     /** {@inheritDoc} */
     @Test
     @Override public void testClientNodeId() throws Exception {
-        IgniteEx client = (IgniteEx) startGridWithSpringCtx(getTestIgniteInstanceName(), true, configURL());
+        IgniteEx client = (IgniteEx)startGridWithSpringCtx(getTestIgniteInstanceName(), true, configURL());
 
         UUID clientId = client.localNode().id();
 
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
index 12676ab..f80df38 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
@@ -349,9 +349,9 @@ public class ClientMemcachedProtocolSelfTest extends AbstractRestProcessorSelfTe
 
         Assert.assertEquals(now, client.get("dateKey"));
 
-        Assert.assertTrue(client.set("byteKey", 0, (byte) 1).get());
+        Assert.assertTrue(client.set("byteKey", 0, (byte)1).get());
 
-        Assert.assertEquals((byte) 1, client.get("byteKey"));
+        Assert.assertEquals((byte)1, client.get("byteKey"));
 
         Assert.assertTrue(client.set("floatKey", 0, 1.1).get());
 
@@ -370,9 +370,9 @@ public class ClientMemcachedProtocolSelfTest extends AbstractRestProcessorSelfTe
 
         assertArrayEquals(arr, (byte[])client.get("arrKey"));
 
-        Assert.assertTrue(client.set("shortKey", 0, (short) 1).get());
+        Assert.assertTrue(client.set("shortKey", 0, (short)1).get());
 
-        Assert.assertEquals((short) 1, client.get("shortKey"));
+        Assert.assertEquals((short)1, client.get("shortKey"));
     }
 
     /**
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
index 63997a6..046cd82 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
@@ -419,7 +419,7 @@ final class TestMemcacheClient {
         packet[0] = (byte)0x80;
         packet[1] = cmd.operationCode();
 
-        U.shortToBytes((short) keyData.length(), packet, 2);
+        U.shortToBytes((short)keyData.length(), packet, 2);
 
         packet[4] = (byte)(extrasLength);
 
@@ -649,17 +649,17 @@ final class TestMemcacheClient {
             flags |= BOOLEAN_FLAG;
         }
         else if (obj instanceof Integer) {
-            bytes = U.intToBytes((Integer) obj);
+            bytes = U.intToBytes((Integer)obj);
 
             flags |= INT_FLAG;
         }
         else if (obj instanceof Long) {
-            bytes = U.longToBytes((Long) obj);
+            bytes = U.longToBytes((Long)obj);
 
             flags |= LONG_FLAG;
         }
         else if (obj instanceof Date) {
-            bytes = U.longToBytes(((Date) obj).getTime());
+            bytes = U.longToBytes(((Date)obj).getTime());
 
             flags |= DATE_FLAG;
         }
@@ -669,12 +669,12 @@ final class TestMemcacheClient {
             flags |= BYTE_FLAG;
         }
         else if (obj instanceof Float) {
-            bytes = U.intToBytes(Float.floatToIntBits((Float) obj));
+            bytes = U.intToBytes(Float.floatToIntBits((Float)obj));
 
             flags |= FLOAT_FLAG;
         }
         else if (obj instanceof Double) {
-            bytes = U.longToBytes(Double.doubleToLongBits((Double) obj));
+            bytes = U.longToBytes(Double.doubleToLongBits((Double)obj));
 
             flags |= DOUBLE_FLAG;
         }
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
index 6780fa1..cb60f41 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
@@ -170,7 +170,7 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest {
 
         assertTrue(msg instanceof GridClientCacheRequest);
 
-        GridClientCacheRequest res = (GridClientCacheRequest) msg;
+        GridClientCacheRequest res = (GridClientCacheRequest)msg;
 
         assertEquals("Invalid operation", req.operation(), res.operation());
         assertEquals("Invalid clientId", req.clientId(), res.clientId());
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
index c3871c2..522fddd 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
@@ -213,7 +213,7 @@ public abstract class JdbcThinAbstractDmlStatementSelfTest extends JdbcThinAbstr
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            Person person = (Person) o;
+            Person person = (Person)o;
 
             if (id != person.id) return false;
             if (age != person.age) return false;
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
index fd12765..f0a06ab 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
@@ -316,7 +316,7 @@ public class JdbcThinAutoCloseServerCursorTest extends JdbcThinAbstractSelfTest
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            Person person = (Person) o;
+            Person person = (Person)o;
 
             if (id != person.id)
                 return false;
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
index daeb570..62647a3 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
@@ -447,8 +447,8 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes
             Object sqlStrKey;
 
             if (keyValEntry.getKey() instanceof SqlStrConvertedValHolder) {
-                originalKey = ((SqlStrConvertedValHolder) keyValEntry.getKey()).originalVal();
-                sqlStrKey = ((SqlStrConvertedValHolder) keyValEntry.getKey()).sqlStrVal();
+                originalKey = ((SqlStrConvertedValHolder)keyValEntry.getKey()).originalVal();
+                sqlStrKey = ((SqlStrConvertedValHolder)keyValEntry.getKey()).sqlStrVal();
             }
             else {
                 originalKey = keyValEntry.getKey();
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java
index cc4a650..7071d61 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java
@@ -183,7 +183,7 @@ public class IndexTypesCompatibilityTest extends IndexAbstractCompatibilityTest
         for (int i = 0; i < 2; i++) {
             if ("Binary".equals(type))
                 assertTrue("Type=" + type + "; exp=" + val + "; act=" + row.get(i),
-                    Arrays.equals((byte[]) val, (byte[]) row.get(i)));
+                    Arrays.equals((byte[])val, (byte[])row.get(i)));
             else
                 assertTrue("Type=" + type + "; exp=" + val + "; act=" + row.get(i), row.get(i).equals(getBaseValue(type, inc)));
         }
@@ -242,7 +242,7 @@ public class IndexTypesCompatibilityTest extends IndexAbstractCompatibilityTest
 
             if ("Binary".equals(type))
                 assertTrue("Type=" + type + "; exp=" + val + "; act=" + row.get(0),
-                    Arrays.equals((byte[]) val, (byte[]) row.get(0)));
+                    Arrays.equals((byte[])val, (byte[])row.get(0)));
             else
                 assertTrue("Type=" + type + "; exp=" + val + "; act=" + row.get(0),
                     row.get(0).equals(val));
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java
index b97f5a1..a81633b 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java
@@ -277,7 +277,7 @@ public class InlineJavaObjectCompatibilityTest extends IndexAbstractCompatibilit
 
         /** {@inheritDoc} */
         @Override public boolean equals(Object other) {
-            return val == ((EntityValue) other).val;
+            return val == ((EntityValue)other).val;
         }
 
         /** Enable comparison of EntityValue objects by the {@link #val} field. */
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MoveBinaryMetadataCompatibility.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MoveBinaryMetadataCompatibility.java
index f807d18..69f327b 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MoveBinaryMetadataCompatibility.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MoveBinaryMetadataCompatibility.java
@@ -99,7 +99,7 @@ public class MoveBinaryMetadataCompatibility extends IgnitePersistenceCompatibil
         IgniteCache<Object, Object> cache = newGrid.getOrCreateCache(cacheName).withKeepBinary();
 
         // check that binary object is still available in new version of grid
-        BinaryObject obj = (BinaryObject) cache.get(objKey);
+        BinaryObject obj = (BinaryObject)cache.get(objKey);
 
         assertTrue(obj.hasField(fieldName));
 
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/argument/parser/CLIArgument.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/argument/parser/CLIArgument.java
index 47bff52..648ccda 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/argument/parser/CLIArgument.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/argument/parser/CLIArgument.java
@@ -67,7 +67,7 @@ public class CLIArgument<T> {
         this.isOptional = isOptional;
         this.type = type;
         this.dfltValSupplier = dfltValSupplier == null
-            ? (type.equals(Boolean.class) ? p -> (T) Boolean.FALSE : p -> null)
+            ? (type.equals(Boolean.class) ? p -> (T)Boolean.FALSE : p -> null)
             : dfltValSupplier;
     }
 
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java
index f8ec162..848b2b0 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java
@@ -1553,7 +1553,7 @@ public class IgniteIndexReader implements AutoCloseable {
                 final int cacheId;
 
                 if (io instanceof AbstractDataLeafIO && ((AbstractDataLeafIO)io).storeCacheId())
-                    cacheId = ((AbstractDataLeafIO) io).getCacheId(addr, idx);
+                    cacheId = ((AbstractDataLeafIO)io).getCacheId(addr, idx);
                 else
                     cacheId = nodeCtx.cacheId;
 
@@ -1592,7 +1592,7 @@ public class IgniteIndexReader implements AutoCloseable {
                             PageIO dataIo = PageIO.getPageIO(getType(dataBuf), getVersion(dataBuf));
 
                             if (dataIo instanceof AbstractDataPageIO) {
-                                AbstractDataPageIO dataPageIO = (AbstractDataPageIO) dataIo;
+                                AbstractDataPageIO dataPageIO = (AbstractDataPageIO)dataIo;
 
                                 DataPagePayload payload = dataPageIO.readPayload(dataBufAddr, linkedItemId, pageSize);
 
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderFilePageStoreFactoryImpl.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderFilePageStoreFactoryImpl.java
index 3485671..b042792 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderFilePageStoreFactoryImpl.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderFilePageStoreFactoryImpl.java
@@ -86,7 +86,7 @@ public class IgniteIndexReaderFilePageStoreFactoryImpl implements IgniteIndexRea
         int ver = storeFactory.latestVersion();
 
         FilePageStore store =
-            (FilePageStore)storeFactory.createPageStore(type, (IgniteOutClosure<Path>) null, allocationTracker::add);
+            (FilePageStore)storeFactory.createPageStore(type, (IgniteOutClosure<Path>)null, allocationTracker::add);
 
         return store.header(type, storeFactory.headerSize(ver));
     }
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
index 4358765..077a553 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
@@ -380,11 +380,11 @@ public abstract class GridCommandHandlerAbstractTest extends GridCommonAbstractT
                 if (!fut.isDone()) {
                     //skipping system tx futures if possible
                     if (fut instanceof GridNearTxPrepareFutureAdapter
-                        && ((GridNearTxPrepareFutureAdapter) fut).tx().system())
+                        && ((GridNearTxPrepareFutureAdapter)fut).tx().system())
                         continue;
 
                     if (fut instanceof GridDhtTxPrepareFuture
-                        && ((GridDhtTxPrepareFuture) fut).tx().system())
+                        && ((GridDhtTxPrepareFuture)fut).tx().system())
                         continue;
 
                     log.error("Expecting no active future [node=" + ig.localNode().id() + ", fut=" + fut + ']');
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
index e7bb062..99217d7 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
@@ -321,7 +321,7 @@ public class GridCommandHandlerIndexingTest extends GridCommandHandlerClusterPer
     private File indexPartition(Ignite ig, String groupName) {
         IgniteEx ig0 = (IgniteEx)ig;
 
-        FilePageStoreManager pageStoreManager = ((FilePageStoreManager) ig0.context().cache().context().pageStore());
+        FilePageStoreManager pageStoreManager = ((FilePageStoreManager)ig0.context().cache().context().pageStore());
 
         return new File(pageStoreManager.cacheWorkDir(true, groupName), INDEX_FILE_NAME);
     }
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java
index b114aba..b455073 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java
@@ -230,7 +230,7 @@ public class GridCommandHandlerPropertiesTest extends GridCommandHandlerClusterB
      */
     private <T extends Serializable> void assertDistributedPropertyEquals(String propName, T expected) {
         for (Ignite ign : G.allGrids()) {
-            IgniteEx ignEx = (IgniteEx) ign;
+            IgniteEx ignEx = (IgniteEx)ign;
 
             if (ign.configuration().isClientMode())
                 continue;
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index cc6f50a..1241624 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -312,8 +312,8 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
         for (int k = 0; k < 1000; k++)
             dfltCache.put(k, k);
 
-        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager) ig0.context().cache().context().database();
-        GridCacheDatabaseSharedManager dbMrg1 = (GridCacheDatabaseSharedManager) ig1.context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager)ig0.context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMrg1 = (GridCacheDatabaseSharedManager)ig1.context().cache().context().database();
 
         dbMrg0.forceCheckpoint("cp").futureFor(CheckpointState.FINISHED).get();
         dbMrg1.forceCheckpoint("cp").futureFor(CheckpointState.FINISHED).get();
@@ -1248,17 +1248,17 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
             }
         }
 
-        IgniteEx node1 = startGrid(1, (UnaryOperator<IgniteConfiguration>) configuration -> {
+        IgniteEx node1 = startGrid(1, (UnaryOperator<IgniteConfiguration>)configuration -> {
             configuration.setCommunicationSpi(new KillNode3CommunicationSpi(false));
             return configuration;
         });
 
-        IgniteEx node2 = startGrid(2, (UnaryOperator<IgniteConfiguration>) configuration -> {
+        IgniteEx node2 = startGrid(2, (UnaryOperator<IgniteConfiguration>)configuration -> {
             configuration.setCommunicationSpi(new KillNode3CommunicationSpi(false));
             return configuration;
         });
 
-        node3[0] = startGrid(3, (UnaryOperator<IgniteConfiguration>) configuration -> {
+        node3[0] = startGrid(3, (UnaryOperator<IgniteConfiguration>)configuration -> {
             configuration.setCommunicationSpi(new KillNode3CommunicationSpi(true));
             return configuration;
         });
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
index b2644de..a60cf38 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java
@@ -302,7 +302,7 @@ public class SortedEvictionPolicy<K, V> extends AbstractEvictionPolicy<K, V> imp
             if (obj == null || this.getClass() != obj.getClass())
                 return false;
 
-            Holder<K, V> h = (Holder<K, V>) obj;
+            Holder<K, V> h = (Holder<K, V>)obj;
 
             return Objects.equals(entry, h.entry) && abs(order) == abs(h.order);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java
index c387b77..47e1788 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java
@@ -126,7 +126,7 @@ public class JdbcTypesDefaultTransformer implements JdbcTypesTransformer {
             String str = rs.getString(colIdx);
 
             try {
-                return rs.wasNull() ? null : Enum.valueOf((Class<? extends Enum>) type, str.trim());
+                return rs.wasNull() ? null : Enum.valueOf((Class<? extends Enum>)type, str.trim());
             }
             catch (IllegalArgumentException ignore) {
                 return null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index ae39a09..3fb78b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -504,7 +504,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
         else if (comp instanceof GridEncryptionManager)
             encryptionMgr = (GridEncryptionManager)comp;
         else if (comp instanceof GridTracingManager)
-            tracingMgr = (GridTracingManager) comp;
+            tracingMgr = (GridTracingManager)comp;
 
         /*
          * Processors.
@@ -588,7 +588,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
         else if (comp instanceof DurableBackgroundTasksProcessor)
             durableBackgroundTasksProcessor = (DurableBackgroundTasksProcessor)comp;
         else if (comp instanceof MaintenanceProcessor)
-            maintenanceProc = (MaintenanceProcessor) comp;
+            maintenanceProc = (MaintenanceProcessor)comp;
         else if (comp instanceof PerformanceStatisticsProcessor)
             perfStatProc = (PerformanceStatisticsProcessor)comp;
         else if (comp instanceof IndexProcessor)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
index 0bd1718..45a0e94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
@@ -759,7 +759,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal {
         checkFullSupport();
 
         try {
-            return (T) ctx.checkpoint().loadCheckpoint(ses, key);
+            return (T)ctx.checkpoint().loadCheckpoint(ses, key);
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
index 1c4f420..ee570a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
@@ -465,7 +465,7 @@ public class IgniteDiagnosticMessage implements Message {
      */
     public static IgniteInternalFuture<String> dumpCommunicationInfo(GridKernalContext ctx, UUID nodeId) {
         if (ctx.config().getCommunicationSpi() instanceof TcpCommunicationSpi)
-            return ((TcpCommunicationSpi) ctx.config().getCommunicationSpi()).dumpNodeStatistics(nodeId);
+            return ((TcpCommunicationSpi)ctx.config().getCommunicationSpi()).dumpNodeStatistics(nodeId);
         else
             return new GridFinishedFuture<>("Unexpected communication SPI: " + ctx.config().getCommunicationSpi());
     }
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 258e4b4..25324ac 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
@@ -1571,7 +1571,7 @@ public class IgniteKernal implements IgniteEx, Externalizable {
             poolQSize = exec.getQueue().size();
         }
         else if (execSvc instanceof StripedExecutor) {
-            StripedExecutor exec = (StripedExecutor) execSvc;
+            StripedExecutor exec = (StripedExecutor)execSvc;
 
             poolSize = exec.stripesCount();
             poolActiveThreads = exec.activeStripesCount();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
index a01e546..49277c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteServicesImpl.java
@@ -372,7 +372,7 @@ public class IgniteServicesImpl extends AsyncSupportAdapter implements IgniteSer
     /** {@inheritDoc} */
     @Override public <T> T serviceProxy(String name, Class<? super T> svcItf, boolean sticky)
         throws IgniteException {
-        return (T) serviceProxy(name, svcItf, sticky, 0);
+        return (T)serviceProxy(name, svcItf, sticky, 0);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index fc3e924..e06de17 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -159,7 +159,7 @@ public class MarshallerContextImpl implements MarshallerContext {
             Map res;
 
             if (i == JAVA_ID)
-                res = ((CombinedMap) allCaches.get(JAVA_ID)).userMap;
+                res = ((CombinedMap)allCaches.get(JAVA_ID)).userMap;
             else
                 res = allCaches.get(i);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java
index f88217b..a1a15ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ThreadPoolMXBeanAdapter.java
@@ -102,7 +102,7 @@ public class ThreadPoolMXBeanAdapter implements ThreadPoolMXBean {
 
     /** {@inheritDoc} */
     @Override public boolean isTerminating() {
-        return exec instanceof ThreadPoolExecutor && ((ThreadPoolExecutor) exec).isTerminating();
+        return exec instanceof ThreadPoolExecutor && ((ThreadPoolExecutor)exec).isTerminating();
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java
index 023df45..6c35532 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java
@@ -49,7 +49,7 @@ public class BinaryEnumCache {
             }
 
             if (ord < vals.length)
-                return (T) vals[ord];
+                return (T)vals[ord];
             else
                 throw new BinaryObjectException("Failed to get enum value for ordinal (do you have correct class " +
                     "version?) [cls=" + cls.getName() + ", ordinal=" + ord + ", totalValues=" + vals.length + ']');
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index e3873ee..1d99d6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -316,12 +316,12 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
 
     /** {@inheritDoc} */
     @Nullable @Override public <F> F field(String fieldName) throws BinaryObjectException {
-        return (F) reader(null, false).unmarshalField(fieldName);
+        return (F)reader(null, false).unmarshalField(fieldName);
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public <F> F field(int fieldId) throws BinaryObjectException {
-        return (F) reader(null, false).unmarshalField(fieldId);
+        return (F)reader(null, false).unmarshalField(fieldId);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index a35683e..eef2267 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -198,12 +198,12 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter
 
     /** {@inheritDoc} */
     @Nullable @Override public <F> F field(String fieldName) throws BinaryObjectException {
-        return (F) reader(null, false).unmarshalField(fieldName);
+        return (F)reader(null, false).unmarshalField(fieldName);
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public <F> F field(int fieldId) throws BinaryObjectException {
-        return (F) reader(null, false).unmarshalField(fieldId);
+        return (F)reader(null, false).unmarshalField(fieldId);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
index b0bb4f4..6327589 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
@@ -2004,7 +2004,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
 
         if (schema == null) {
             if (fieldIdLen != BinaryUtils.FIELD_ID_LEN) {
-                BinaryTypeImpl type = (BinaryTypeImpl) ctx.metadata(typeId, schemaId);
+                BinaryTypeImpl type = (BinaryTypeImpl)ctx.metadata(typeId, schemaId);
 
                 BinaryMetadata meta = type != null ? type.metadata() : null;
 
@@ -2351,7 +2351,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
 
     /** {@inheritDoc} */
     @Override public long skip(long n) throws IOException {
-        return skipBytes((int) n);
+        return skipBytes((int)n);
     }
 
     /** {@inheritDoc} */
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 db7833e..77a86ae 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
@@ -1771,22 +1771,22 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
 
     /** {@inheritDoc} */
     @Override public void writeByte(int v) throws IOException {
-        out.writeByte((byte) v);
+        out.writeByte((byte)v);
     }
 
     /** {@inheritDoc} */
     @Override public void writeShort(int v) throws IOException {
-        out.writeShort((short) v);
+        out.writeShort((short)v);
     }
 
     /** {@inheritDoc} */
     @Override public void writeChar(int v) throws IOException {
-        out.writeChar((char) v);
+        out.writeChar((char)v);
     }
 
     /** {@inheritDoc} */
     @Override public void write(int b) throws IOException {
-        out.writeByte((byte) b);
+        out.writeByte((byte)b);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java
index 22ae8e3..038a34e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java
@@ -98,7 +98,7 @@ public class BinaryWriterSchemaHolder {
             }
             else if (lastOffset < MAX_OFFSET_2) {
                 for (int curIdx = startIdx + 1; curIdx < idx; curIdx += 2)
-                    out.unsafeWriteShort((short) data[curIdx]);
+                    out.unsafeWriteShort((short)data[curIdx]);
 
                 res = BinaryUtils.OFFSET_2;
             }
@@ -113,7 +113,7 @@ public class BinaryWriterSchemaHolder {
             if (lastOffset < MAX_OFFSET_1) {
                 for (int curIdx = startIdx; curIdx < idx;) {
                     out.unsafeWriteInt(data[curIdx++]);
-                    out.unsafeWriteByte((byte) data[curIdx++]);
+                    out.unsafeWriteByte((byte)data[curIdx++]);
                 }
 
                 res = BinaryUtils.OFFSET_1;
@@ -121,7 +121,7 @@ public class BinaryWriterSchemaHolder {
             else if (lastOffset < MAX_OFFSET_2) {
                 for (int curIdx = startIdx; curIdx < idx;) {
                     out.unsafeWriteInt(data[curIdx++]);
-                    out.unsafeWriteShort((short) data[curIdx++]);
+                    out.unsafeWriteShort((short)data[curIdx++]);
                 }
 
                 res = BinaryUtils.OFFSET_2;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index b31408e5..b7ca396 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -265,7 +265,7 @@ public class GridBinaryMarshaller {
         BinaryContext oldCtx = pushContext(ctx);
 
         try {
-            return (T) BinaryUtils.unmarshal(BinaryHeapInputStream.create(bytes, 0), ctx, clsLdr);
+            return (T)BinaryUtils.unmarshal(BinaryHeapInputStream.create(bytes, 0), ctx, clsLdr);
         }
         finally {
             popContext(oldCtx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
index ddabc3f..49ff5e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
@@ -336,7 +336,7 @@ public class IndexProcessor extends GridProcessorAdapter {
 
             for (Index idx: idxs) {
                 if (idx instanceof AbstractIndex)
-                    ((AbstractIndex) idx).markIndexRebuild(val);
+                    ((AbstractIndex)idx).markIndexRebuild(val);
             }
 
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java
index a88a45d..e0abac1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java
@@ -306,7 +306,7 @@ public class IndexQueryProcessor {
         IndexRowComparator keyCmp = idxDef.rowComparator();
 
         for (IndexQueryCriterion c: idxQryDesc.criteria()) {
-            RangeIndexQueryCriterion crit = (RangeIndexQueryCriterion) c;
+            RangeIndexQueryCriterion crit = (RangeIndexQueryCriterion)c;
 
             String fldName = idxFlds.containsKey(crit.field()) ? crit.field()
                 : QueryUtils.normalizeObjectName(crit.field(), false);
@@ -426,8 +426,8 @@ public class IndexQueryProcessor {
 
             qry.criteria[i] = criterion;
 
-            IndexKey l = (IndexKey) criterion.lower();
-            IndexKey u = (IndexKey) criterion.upper();
+            IndexKey l = (IndexKey)criterion.lower();
+            IndexKey u = (IndexKey)criterion.upper();
 
             if (l != null)
                 lowerAllNulls = false;
@@ -456,7 +456,7 @@ public class IndexQueryProcessor {
      * @return Prepared query for index range.
      */
     private IndexRangeQuery prepareQuery(SortedSegmentedIndex idx, IndexQueryDesc idxQryDesc) throws IgniteCheckedException {
-        SortedIndexDefinition idxDef = (SortedIndexDefinition) idxProc.indexDefinition(idx.id());
+        SortedIndexDefinition idxDef = (SortedIndexDefinition)idxProc.indexDefinition(idx.id());
 
         // For PK indexes will serialize _KEY column.
         if (F.isEmpty(idxQryDesc.criteria()))
@@ -515,7 +515,7 @@ public class IndexQueryProcessor {
         // Step 2. Scan and filter.
         return new GridCursor<IndexRow>() {
             /** */
-            private final IndexRowComparator rowCmp = ((SortedIndexDefinition) idxProc.indexDefinition(idx.id())).rowComparator();
+            private final IndexRowComparator rowCmp = ((SortedIndexDefinition)idxProc.indexDefinition(idx.id())).rowComparator();
 
             /** {@inheritDoc} */
             @Override public boolean next() throws IgniteCheckedException {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
index c53143c..1d39073 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
@@ -148,7 +148,7 @@ public class IndexingDefragmentation {
             for (InlineIndex oldIdx : indexes.idxs) {
                 InlineIndexRowHandler oldRowHnd = oldIdx.segment(0).rowHandler();
 
-                SortedIndexDefinition idxDef = (SortedIndexDefinition) indexing.indexDefinition(oldIdx.id());
+                SortedIndexDefinition idxDef = (SortedIndexDefinition)indexing.indexDefinition(oldIdx.id());
 
                 InlineIndexImpl newIdx = new DefragIndexFactory(newCtx.offheap(), newCachePageMemory, oldIdx)
                     .createIndex(cctx, idxDef)
@@ -177,7 +177,7 @@ public class IndexingDefragmentation {
                         IndexRow row = theTree.getRow(h2IO, pageAddr, idx);
 
                         if (!row.indexSearchRow()) {
-                            IndexRowImpl r = (IndexRowImpl) row;
+                            IndexRowImpl r = (IndexRowImpl)row;
 
                             CacheDataRow cacheDataRow = r.cacheDataRow();
 
@@ -191,7 +191,7 @@ public class IndexingDefragmentation {
 
                             CacheDataRow newDataRow;
 
-                             if (((MvccIO) io).storeMvccInfo()) {
+                             if (((MvccIO)io).storeMvccInfo()) {
                                  newDataRow = new MvccDataRow(newLink);
                                  newDataRow.mvccVersion(row);
                              } else
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexFactory.java
index d28858c..23a352cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexFactory.java
@@ -39,7 +39,7 @@ public class InlineIndexFactory implements IndexFactory {
 
     /** {@inheritDoc} */
     @Override public Index createIndex(GridCacheContext<?, ?> cctx, IndexDefinition def) {
-        SortedIndexDefinition sdef = (SortedIndexDefinition) def;
+        SortedIndexDefinition sdef = (SortedIndexDefinition)def;
 
         InlineIndexTree[] trees = new InlineIndexTree[sdef.segments()];
         InlineRecommender recommender = new InlineRecommender(cctx, sdef);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java
index 2f32493..b87332d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineIndexTree.java
@@ -341,7 +341,7 @@ public class InlineIndexTree extends BPlusTree<IndexRow, IndexRow> {
                 return ret;
         }
 
-        return mvccCompare((MvccIO) io, pageAddr, idx, row);
+        return mvccCompare((MvccIO)io, pageAddr, idx, row);
     }
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineObjectBytesDetector.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineObjectBytesDetector.java
index b621799..d85ed63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineObjectBytesDetector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineObjectBytesDetector.java
@@ -118,7 +118,7 @@ public class InlineObjectBytesDetector implements BPlusTree.TreeRowClosure<Index
 
                 len &= 0x7FFF;
 
-                byte[] originalObjBytes = ((JavaObjectIndexKey) key).bytesNoCopy();
+                byte[] originalObjBytes = ((JavaObjectIndexKey)key).bytesNoCopy();
 
                 // Read size more then available space or more then origin length.
                 if (len > inlineSize - fieldOff - 3 || len > originalObjBytes.length) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java
index cd7bcb4..a57395f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java
@@ -71,7 +71,7 @@ public class InlineTreeFilterClosure implements BPlusTree.TreeRowClosure<IndexRo
         boolean val = filter == null || applyFilter((InlineIO)io, pageAddr, idx);
 
         if (mvccSnapshot != null)
-            return val && applyMvcc((InlineIO) io, pageAddr, idx);
+            return val && applyMvcc((InlineIO)io, pageAddr, idx);
 
         return val;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java
index 730eee2..8d2900b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineInnerIO.java
@@ -69,7 +69,7 @@ public abstract class AbstractInlineInnerIO extends BPlusInnerIO<IndexRow> imple
         short type = mvcc ? PageIO.T_H2_EX_REF_MVCC_INNER_START : PageIO.T_H2_EX_REF_INNER_START;
 
         for (short payload = 1; payload <= PageIO.MAX_PAYLOAD_SIZE; payload++) {
-            short ioType = (short) (type + payload - 1);
+            short ioType = (short)(type + payload - 1);
 
             AbstractInlineInnerIO io = mvcc ? new MvccInlineInnerIO(ioType, payload) : new InlineInnerIO(ioType, payload);
 
@@ -121,10 +121,10 @@ public abstract class AbstractInlineInnerIO extends BPlusInnerIO<IndexRow> imple
             long mvccCntr = mvccCounter(pageAddr, idx);
             int mvccOpCntr = mvccOperationCounter(pageAddr, idx);
 
-            return ((InlineIndexTree) tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
+            return ((InlineIndexTree)tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
         }
 
-        return ((InlineIndexTree) tree).createIndexRow(link);
+        return ((InlineIndexTree)tree).createIndexRow(link);
     }
 
     /** {@inheritDoc} */
@@ -137,7 +137,7 @@ public abstract class AbstractInlineInnerIO extends BPlusInnerIO<IndexRow> imple
 
         PageUtils.putBytes(dstPageAddr, dstOff, payload);
 
-        IORowHandler.store(dstPageAddr, dstOff + inlineSize, (InlineIO) srcIo, srcPageAddr, srcIdx, storeMvccInfo());
+        IORowHandler.store(dstPageAddr, dstOff + inlineSize, (InlineIO)srcIo, srcPageAddr, srcIdx, storeMvccInfo());
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java
index d8bfecb..7754031 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInlineLeafIO.java
@@ -69,7 +69,7 @@ public abstract class AbstractInlineLeafIO extends BPlusLeafIO<IndexRow> impleme
         short type = mvcc ? PageIO.T_H2_EX_REF_MVCC_LEAF_START : PageIO.T_H2_EX_REF_LEAF_START;
 
         for (short payload = 1; payload <= PageIO.MAX_PAYLOAD_SIZE; payload++) {
-            short ioType = (short) (type + payload - 1);
+            short ioType = (short)(type + payload - 1);
 
             AbstractInlineLeafIO io = mvcc ? new MvccInlineLeafIO(ioType, payload) : new InlineLeafIO(ioType, payload);
 
@@ -121,10 +121,10 @@ public abstract class AbstractInlineLeafIO extends BPlusLeafIO<IndexRow> impleme
             long mvccCntr = mvccCounter(pageAddr, idx);
             int mvccOpCntr = mvccOperationCounter(pageAddr, idx);
 
-            return ((InlineIndexTree) tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
+            return ((InlineIndexTree)tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
         }
 
-        return ((InlineIndexTree) tree).createIndexRow(link);
+        return ((InlineIndexTree)tree).createIndexRow(link);
     }
 
     /** {@inheritDoc} */
@@ -137,7 +137,7 @@ public abstract class AbstractInlineLeafIO extends BPlusLeafIO<IndexRow> impleme
 
         PageUtils.putBytes(dstPageAddr, dstOff, payload);
 
-        IORowHandler.store(dstPageAddr, dstOff + inlineSize, (InlineIO) srcIo, srcPageAddr, srcIdx, storeMvccInfo());
+        IORowHandler.store(dstPageAddr, dstOff + inlineSize, (InlineIO)srcIo, srcPageAddr, srcIdx, storeMvccInfo());
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInnerIO.java
index 18e69d9..c1129cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractInnerIO.java
@@ -58,15 +58,15 @@ public abstract class AbstractInnerIO extends BPlusInnerIO<IndexRow> implements
             long mvccCntr = mvccCounter(pageAddr, idx);
             int mvccOpCntr = mvccOperationCounter(pageAddr, idx);
 
-            return ((InlineIndexTree) tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
+            return ((InlineIndexTree)tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
         }
 
-        return ((InlineIndexTree) tree).createIndexRow(link);
+        return ((InlineIndexTree)tree).createIndexRow(link);
     }
 
     /** {@inheritDoc} */
     @Override public void store(long dstPageAddr, int dstIdx, BPlusIO<IndexRow> srcIo, long srcPageAddr, int srcIdx) {
-        IORowHandler.store(dstPageAddr, offset(dstIdx), (InlineIO) srcIo, srcPageAddr, srcIdx, storeMvccInfo());
+        IORowHandler.store(dstPageAddr, offset(dstIdx), (InlineIO)srcIo, srcPageAddr, srcIdx, storeMvccInfo());
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractLeafIO.java
index 68a01af..da4030d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/io/AbstractLeafIO.java
@@ -58,15 +58,15 @@ public abstract class AbstractLeafIO extends BPlusLeafIO<IndexRow> implements In
             long mvccCntr = mvccCounter(pageAddr, idx);
             int mvccOpCntr = mvccOperationCounter(pageAddr, idx);
 
-            return ((InlineIndexTree) tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
+            return ((InlineIndexTree)tree).createMvccIndexRow(link, mvccCrdVer, mvccCntr, mvccOpCntr);
         }
 
-        return ((InlineIndexTree) tree).createIndexRow(link);
+        return ((InlineIndexTree)tree).createIndexRow(link);
     }
 
     /** {@inheritDoc} */
     @Override public void store(long dstPageAddr, int dstIdx, BPlusIO<IndexRow> srcIo, long srcPageAddr, int srcIdx) {
-        IORowHandler.store(dstPageAddr, offset(dstIdx), (InlineIO) srcIo, srcPageAddr, srcIdx, storeMvccInfo());
+        IORowHandler.store(dstPageAddr, offset(dstIdx), (InlineIO)srcIo, srcPageAddr, srcIdx, storeMvccInfo());
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BooleanInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BooleanInlineIndexKeyType.java
index 4386555..36e7a31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BooleanInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BooleanInlineIndexKeyType.java
@@ -27,13 +27,13 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class BooleanInlineIndexKeyType extends NullableInlineIndexKeyType<BooleanIndexKey> {
     /** */
     public BooleanInlineIndexKeyType() {
-        super(IndexKeyTypes.BOOLEAN, (short) 1);
+        super(IndexKeyTypes.BOOLEAN, (short)1);
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, BooleanIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
-        PageUtils.putByte(pageAddr, off + 1, (byte)((boolean) key.key() ? 1 : 0));
+        PageUtils.putByte(pageAddr, off, (byte)type());
+        PageUtils.putByte(pageAddr, off + 1, (byte)((boolean)key.key() ? 1 : 0));
 
         return keySize + 1;
     }
@@ -49,7 +49,7 @@ public class BooleanInlineIndexKeyType extends NullableInlineIndexKeyType<Boolea
     @Override public int compare0(long pageAddr, int off, BooleanIndexKey key) {
         boolean bool1 = PageUtils.getByte(pageAddr, off + 1) != 0;
 
-        return Integer.signum(Boolean.compare(bool1, (boolean) key.key()));
+        return Integer.signum(Boolean.compare(bool1, (boolean)key.key()));
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ByteInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ByteInlineIndexKeyType.java
index 0cefb4f..bf030c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ByteInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ByteInlineIndexKeyType.java
@@ -27,20 +27,20 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class ByteInlineIndexKeyType extends NullableInlineIndexKeyType<ByteIndexKey> {
     /** */
     public ByteInlineIndexKeyType() {
-        super(IndexKeyTypes.BYTE, (short) 1);
+        super(IndexKeyTypes.BYTE, (short)1);
     }
 
     /** {@inheritDoc} */
     @Override public int compare0(long pageAddr, int off, ByteIndexKey key) {
         byte byte1 = PageUtils.getByte(pageAddr, off + 1);
 
-        return Integer.signum(byte1 - (byte) key.key());
+        return Integer.signum(byte1 - (byte)key.key());
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, ByteIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
-        PageUtils.putByte(pageAddr, off + 1, (byte) key.key());
+        PageUtils.putByte(pageAddr, off, (byte)type());
+        PageUtils.putByte(pageAddr, off + 1, (byte)key.key());
 
         return keySize + 1;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BytesInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BytesInlineIndexKeyType.java
index 329208a..586202d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BytesInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/BytesInlineIndexKeyType.java
@@ -48,7 +48,7 @@ public class BytesInlineIndexKeyType extends NullableInlineIndexKeyType<BytesInd
 
     /** */
     public BytesInlineIndexKeyType(int type, boolean compareBinaryUnsigned) {
-        super(type, (short) -1);
+        super(type, (short)-1);
 
         this.compareBinaryUnsigned = compareBinaryUnsigned;
     }
@@ -61,7 +61,7 @@ public class BytesInlineIndexKeyType extends NullableInlineIndexKeyType<BytesInd
 
         addr += 2; // Skip size.
 
-        byte[] arr = (byte[]) bytes.key();
+        byte[] arr = (byte[])bytes.key();
 
         int len2 = arr.length;
 
@@ -104,9 +104,9 @@ public class BytesInlineIndexKeyType extends NullableInlineIndexKeyType<BytesInd
     @Override protected int put0(long pageAddr, int off, BytesIndexKey key, int maxSize) {
         short size;
 
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
 
-        byte[] val = (byte[]) key.key();
+        byte[] val = (byte[])key.key();
 
         if (val.length + 3 <= maxSize) {
             size = (short)val.length;
@@ -133,7 +133,7 @@ public class BytesInlineIndexKeyType extends NullableInlineIndexKeyType<BytesInd
 
     /** {@inheritDoc} */
     @Override protected int inlineSize0(BytesIndexKey val) {
-        byte[] arr = (byte[]) val.key();
+        byte[] arr = (byte[])val.key();
 
         return arr.length + 3;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DateInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DateInlineIndexKeyType.java
index 73d9335..4ff9a8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DateInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DateInlineIndexKeyType.java
@@ -31,7 +31,7 @@ import static org.apache.ignite.internal.cache.query.index.sorted.inline.types.D
 public class DateInlineIndexKeyType extends NullableInlineIndexKeyType<AbstractDateIndexKey> {
     /** */
     public DateInlineIndexKeyType() {
-        super(IndexKeyTypes.DATE, (short) 8);
+        super(IndexKeyTypes.DATE, (short)8);
     }
 
     /** {@inheritDoc} */
@@ -44,7 +44,7 @@ public class DateInlineIndexKeyType extends NullableInlineIndexKeyType<AbstractD
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, AbstractDateIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
         PageUtils.putLong(pageAddr, off + 1, key.dateValue());
 
         return keySize + 1;
@@ -59,7 +59,7 @@ public class DateInlineIndexKeyType extends NullableInlineIndexKeyType<AbstractD
         else if (dateVal < MIN_DATE_VALUE)
             dateVal = MIN_DATE_VALUE;
 
-        return (AbstractDateIndexKey) IndexKeyFactory.wrapDateValue(type(), dateVal, 0L);
+        return (AbstractDateIndexKey)IndexKeyFactory.wrapDateValue(type(), dateVal, 0L);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DoubleInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DoubleInlineIndexKeyType.java
index 03842b2..3bad407 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DoubleInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/DoubleInlineIndexKeyType.java
@@ -27,20 +27,20 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class DoubleInlineIndexKeyType extends NullableInlineIndexKeyType<DoubleIndexKey> {
     /** */
     public DoubleInlineIndexKeyType() {
-        super(IndexKeyTypes.DOUBLE, (short) 8);
+        super(IndexKeyTypes.DOUBLE, (short)8);
     }
 
     /** {@inheritDoc} */
     @Override public int compare0(long pageAddr, int off, DoubleIndexKey v) {
         double val1 = Double.longBitsToDouble(PageUtils.getLong(pageAddr, off + 1));
 
-        return Integer.signum(Double.compare(val1, (double) v.key()));
+        return Integer.signum(Double.compare(val1, (double)v.key()));
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, DoubleIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
-        PageUtils.putLong(pageAddr, off + 1, Double.doubleToLongBits((double) key.key()));
+        PageUtils.putByte(pageAddr, off, (byte)type());
+        PageUtils.putLong(pageAddr, off + 1, Double.doubleToLongBits((double)key.key()));
 
         return keySize + 1;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/FloatInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/FloatInlineIndexKeyType.java
index 3f64389..6ca18d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/FloatInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/FloatInlineIndexKeyType.java
@@ -27,20 +27,20 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class FloatInlineIndexKeyType extends NullableInlineIndexKeyType<FloatIndexKey> {
     /** */
     public FloatInlineIndexKeyType() {
-        super(IndexKeyTypes.FLOAT, (short) 4);
+        super(IndexKeyTypes.FLOAT, (short)4);
     }
 
     /** {@inheritDoc} */
     @Override public int compare0(long pageAddr, int off, FloatIndexKey key) {
         float val1 = Float.intBitsToFloat(PageUtils.getInt(pageAddr, off + 1));
 
-        return Integer.signum(Float.compare(val1, (float) key.key()));
+        return Integer.signum(Float.compare(val1, (float)key.key()));
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, FloatIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
-        PageUtils.putInt(pageAddr, off + 1, Float.floatToIntBits((float) key.key()));
+        PageUtils.putByte(pageAddr, off, (byte)type());
+        PageUtils.putInt(pageAddr, off + 1, Float.floatToIntBits((float)key.key()));
 
         return keySize + 1;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/IntegerInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/IntegerInlineIndexKeyType.java
index 8a20ff4..d777e79 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/IntegerInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/IntegerInlineIndexKeyType.java
@@ -27,14 +27,14 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class IntegerInlineIndexKeyType extends NullableInlineIndexKeyType<IntegerIndexKey> {
     /** Constructor. */
     public IntegerInlineIndexKeyType() {
-        super(IndexKeyTypes.INT, (short) 4);
+        super(IndexKeyTypes.INT, (short)4);
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, IntegerIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
         // +1 shift after type
-        PageUtils.putInt(pageAddr, off + 1, (int) key.key());
+        PageUtils.putInt(pageAddr, off + 1, (int)key.key());
 
         return keySize + 1;
     }
@@ -51,7 +51,7 @@ public class IntegerInlineIndexKeyType extends NullableInlineIndexKeyType<Intege
     @Override public int compare0(long pageAddr, int off, IntegerIndexKey key) {
         int val1 = PageUtils.getInt(pageAddr, off + 1);
 
-        return Integer.signum(Integer.compare(val1, (int) key.key()));
+        return Integer.signum(Integer.compare(val1, (int)key.key()));
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/LongInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/LongInlineIndexKeyType.java
index ab9c3c4..db9ec2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/LongInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/LongInlineIndexKeyType.java
@@ -27,14 +27,14 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class LongInlineIndexKeyType extends NullableInlineIndexKeyType<LongIndexKey> {
     /** Constructor. */
     public LongInlineIndexKeyType() {
-        super(IndexKeyTypes.LONG, (short) 8);
+        super(IndexKeyTypes.LONG, (short)8);
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, LongIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
         // +1 shift after type
-        PageUtils.putLong(pageAddr, off + 1, (long) key.key());
+        PageUtils.putLong(pageAddr, off + 1, (long)key.key());
 
         return keySize + 1;
     }
@@ -51,7 +51,7 @@ public class LongInlineIndexKeyType extends NullableInlineIndexKeyType<LongIndex
     @Override public int compare0(long pageAddr, int off, LongIndexKey key) {
         long val1 = PageUtils.getLong(pageAddr, off + 1);
 
-        return Integer.signum(Long.compare(val1, (long) key.key()));
+        return Integer.signum(Long.compare(val1, (long)key.key()));
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/NullableInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/NullableInlineIndexKeyType.java
index 6b96730..6f8c208 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/NullableInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/NullableInlineIndexKeyType.java
@@ -85,7 +85,7 @@ public abstract class NullableInlineIndexKeyType<T extends IndexKey> implements
 
         ensureKeyType(key);
 
-        return inlineSize0((T) key);
+        return inlineSize0((T)key);
     }
 
     /**
@@ -130,18 +130,18 @@ public abstract class NullableInlineIndexKeyType<T extends IndexKey> implements
 
         if (keySize < 0 && maxSize < 4) {
             // Can't fit vartype field.
-            PageUtils.putByte(pageAddr, off, (byte) IndexKeyTypes.UNKNOWN);
+            PageUtils.putByte(pageAddr, off, (byte)IndexKeyTypes.UNKNOWN);
             return 0;
         }
 
         if (key == NullIndexKey.INSTANCE) {
-            PageUtils.putByte(pageAddr, off, (byte) IndexKeyTypes.NULL);
+            PageUtils.putByte(pageAddr, off, (byte)IndexKeyTypes.NULL);
             return 1;
         }
 
         ensureKeyType(key);
 
-        return put0(pageAddr, off, (T) key, maxSize);
+        return put0(pageAddr, off, (T)key, maxSize);
     }
 
     /**
@@ -178,7 +178,7 @@ public abstract class NullableInlineIndexKeyType<T extends IndexKey> implements
 
         if ((keySize > 0 && keySize + 1 > maxSize)
             || maxSize < 1
-            || (type = PageUtils.getByte(pageAddr, off)) == (byte) IndexKeyTypes.UNKNOWN)
+            || (type = PageUtils.getByte(pageAddr, off)) == (byte)IndexKeyTypes.UNKNOWN)
             return CANT_BE_COMPARE;
 
         if (type == IndexKeyTypes.NULL) {
@@ -194,7 +194,7 @@ public abstract class NullableInlineIndexKeyType<T extends IndexKey> implements
         if (key == NullIndexKey.INSTANCE)
             return 1;
 
-        return compare0(pageAddr, off, (T) key);
+        return compare0(pageAddr, off, (T)key);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectByteArrayInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectByteArrayInlineIndexKeyType.java
index 79eaedb..1d2e744 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectByteArrayInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectByteArrayInlineIndexKeyType.java
@@ -31,7 +31,7 @@ public class ObjectByteArrayInlineIndexKeyType extends NullableInlineIndexKeyTyp
 
     /** */
     public ObjectByteArrayInlineIndexKeyType(BytesInlineIndexKeyType delegate) {
-        super(IndexKeyTypes.JAVA_OBJECT, (short) -1);
+        super(IndexKeyTypes.JAVA_OBJECT, (short)-1);
 
         this.delegate = delegate;
     }
@@ -46,7 +46,7 @@ public class ObjectByteArrayInlineIndexKeyType extends NullableInlineIndexKeyTyp
 
     /** {@inheritDoc} */
     @Override protected JavaObjectIndexKey get0(long pageAddr, int off) {
-        byte[] b = (byte[]) delegate.get0(pageAddr, off).key();
+        byte[] b = (byte[])delegate.get0(pageAddr, off).key();
 
         return new PlainJavaObjectIndexKey(null, b);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectHashInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectHashInlineIndexKeyType.java
index fa6b4bd..9a5b776 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectHashInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ObjectHashInlineIndexKeyType.java
@@ -28,12 +28,12 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class ObjectHashInlineIndexKeyType extends NullableInlineIndexKeyType<JavaObjectIndexKey> {
     /** */
     public ObjectHashInlineIndexKeyType() {
-        super(IndexKeyTypes.JAVA_OBJECT, (short) 4);
+        super(IndexKeyTypes.JAVA_OBJECT, (short)4);
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, JavaObjectIndexKey val, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
         PageUtils.putInt(pageAddr, off + 1, val.hashCode());
 
         return keySize + 1;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ShortInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ShortInlineIndexKeyType.java
index 2502e65..136243b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ShortInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/ShortInlineIndexKeyType.java
@@ -34,13 +34,13 @@ public class ShortInlineIndexKeyType extends NullableInlineIndexKeyType<ShortInd
     @Override public int compare0(long pageAddr, int off, ShortIndexKey key) {
         short val1 = PageUtils.getShort(pageAddr, off + 1);
 
-        return Integer.signum(val1 - (short) key.key());
+        return Integer.signum(val1 - (short)key.key());
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, ShortIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
-        PageUtils.putShort(pageAddr, off + 1, (short) key.key());
+        PageUtils.putByte(pageAddr, off, (byte)type());
+        PageUtils.putShort(pageAddr, off + 1, (short)key.key());
 
         return keySize + 1;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringInlineIndexKeyType.java
index 9b74923..b6b7478 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringInlineIndexKeyType.java
@@ -37,14 +37,14 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
 
     /** Constructor. */
     public StringInlineIndexKeyType() {
-        super(IndexKeyTypes.STRING, (short) -1);  // -1 means variable length.
+        super(IndexKeyTypes.STRING, (short)-1);  // -1 means variable length.
     }
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, StringIndexKey str, int maxSize) {
         short size;
 
-        byte[] s = ((String) str.key()).getBytes(CHARSET);
+        byte[] s = ((String)str.key()).getBytes(CHARSET);
         if (s.length + 3 <= maxSize)
             size = (short)s.length;
         else {
@@ -54,11 +54,11 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
 
         if (s == null) {
             // Can't fit anything to
-            PageUtils.putByte(pageAddr, off, (byte) IndexKeyTypes.UNKNOWN);
+            PageUtils.putByte(pageAddr, off, (byte)IndexKeyTypes.UNKNOWN);
             return 0;
         }
         else {
-            PageUtils.putByte(pageAddr, off, (byte) type());
+            PageUtils.putByte(pageAddr, off, (byte)type());
             PageUtils.putShort(pageAddr, off + 1, size);
             PageUtils.putBytes(pageAddr, off + 3, s);
             return s.length + 3;
@@ -74,7 +74,7 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
 
     /** {@inheritDoc} */
     @Override public int compare0(long pageAddr, int off, StringIndexKey key) {
-        String s = (String) key.key();
+        String s = (String)key.key();
 
         int len1 = PageUtils.getShort(pageAddr, off + 1) & 0x7FFF;
         int len2 = s.length();
@@ -86,7 +86,7 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
 
         // Try reading ASCII.
         while (cntr1 < len1 && cntr2 < len2) {
-            c = (int) GridUnsafe.getByte(addr) & 0xFF;
+            c = (int)GridUnsafe.getByte(addr) & 0xFF;
 
             if (c > 127)
                 break;
@@ -107,7 +107,7 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
 
         // read other
         while (cntr1 < len1 && cntr2 < len2) {
-            c = (int) GridUnsafe.getByte(addr++) & 0xFF;
+            c = (int)GridUnsafe.getByte(addr++) & 0xFF;
 
             switch (c >> 4) {
                 case 0:
@@ -133,7 +133,7 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
                     if (cntr1 > len1)
                         throw new IllegalStateException("Malformed input (partial character at the end).");
 
-                    c2 = (int) GridUnsafe.getByte(addr++) & 0xFF;
+                    c2 = (int)GridUnsafe.getByte(addr++) & 0xFF;
 
                     if ((c2 & 0xC0) != 0x80)
                         throw new IllegalStateException("Malformed input around byte: " + (cntr1 - 2));
@@ -152,9 +152,9 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
                     if (cntr1 > len1)
                         throw new IllegalStateException("Malformed input (partial character at the end).");
 
-                    c2 = (int) GridUnsafe.getByte(addr++) & 0xFF;
+                    c2 = (int)GridUnsafe.getByte(addr++) & 0xFF;
 
-                    c3 = (int) GridUnsafe.getByte(addr++) & 0xFF;
+                    c3 = (int)GridUnsafe.getByte(addr++) & 0xFF;
 
                     if (((c2 & 0xC0) != 0x80) || ((c3 & 0xC0) != 0x80))
                         throw new IllegalStateException("Malformed input around byte: " + (cntr1 - 3));
@@ -174,11 +174,11 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
                     if (cntr1 > len1)
                         throw new IllegalStateException("Malformed input (partial character at the end).");
 
-                    c2 = (int) GridUnsafe.getByte(addr++) & 0xFF;
+                    c2 = (int)GridUnsafe.getByte(addr++) & 0xFF;
 
-                    c3 = (int) GridUnsafe.getByte(addr++) & 0xFF;
+                    c3 = (int)GridUnsafe.getByte(addr++) & 0xFF;
 
-                    c4 = (int) GridUnsafe.getByte(addr++) & 0xFF;
+                    c4 = (int)GridUnsafe.getByte(addr++) & 0xFF;
 
                     if (((c & 0xF8) != 0xf0) || ((c2 & 0xC0) != 0x80) || ((c3 & 0xC0) != 0x80) || ((c4 & 0xC0) != 0x80))
                         throw new IllegalStateException("Malformed input around byte: " + (cntr1 - 4));
@@ -274,6 +274,6 @@ public class StringInlineIndexKeyType extends NullableInlineIndexKeyType<StringI
 
     /** {@inheritDoc} */
     @Override protected int inlineSize0(StringIndexKey key) {
-        return ((String) key.key()).getBytes(CHARSET).length + 3;
+        return ((String)key.key()).getBytes(CHARSET).length + 3;
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringNoCompareInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringNoCompareInlineIndexKeyType.java
index b17e4d0..5ebf3ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringNoCompareInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/StringNoCompareInlineIndexKeyType.java
@@ -30,7 +30,7 @@ public class StringNoCompareInlineIndexKeyType extends NullableInlineIndexKeyTyp
 
     /** */
     public StringNoCompareInlineIndexKeyType() {
-        super(IndexKeyTypes.STRING, (short) -1);
+        super(IndexKeyTypes.STRING, (short)-1);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimeInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimeInlineIndexKeyType.java
index 708d0d4..778df96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimeInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimeInlineIndexKeyType.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.pagemem.PageUtils;
 public class TimeInlineIndexKeyType extends NullableInlineIndexKeyType<AbstractTimeIndexKey> {
     /** */
     public TimeInlineIndexKeyType() {
-        super(IndexKeyTypes.TIME, (short) 8);
+        super(IndexKeyTypes.TIME, (short)8);
     }
 
     /** {@inheritDoc} */
@@ -41,7 +41,7 @@ public class TimeInlineIndexKeyType extends NullableInlineIndexKeyType<AbstractT
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, AbstractTimeIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
         PageUtils.putLong(pageAddr, off + 1, key.nanos());
 
         return keySize + 1;
@@ -51,7 +51,7 @@ public class TimeInlineIndexKeyType extends NullableInlineIndexKeyType<AbstractT
     @Override protected AbstractTimeIndexKey get0(long pageAddr, int off) {
         long nanos = PageUtils.getLong(pageAddr, off + 1);
 
-        return (AbstractTimeIndexKey) IndexKeyFactory.wrapDateValue(type(), 0L, nanos);
+        return (AbstractTimeIndexKey)IndexKeyFactory.wrapDateValue(type(), 0L, nanos);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimestampInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimestampInlineIndexKeyType.java
index c7852ac..ca8edc2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimestampInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/TimestampInlineIndexKeyType.java
@@ -32,7 +32,7 @@ import static org.apache.ignite.internal.cache.query.index.sorted.inline.types.D
 public class TimestampInlineIndexKeyType extends NullableInlineIndexKeyType<AbstractTimestampIndexKey> {
     /** */
     public TimestampInlineIndexKeyType() {
-        super(IndexKeyTypes.TIMESTAMP, (short) 16);
+        super(IndexKeyTypes.TIMESTAMP, (short)16);
     }
 
     /** {@inheritDoc} */
@@ -51,7 +51,7 @@ public class TimestampInlineIndexKeyType extends NullableInlineIndexKeyType<Abst
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, AbstractTimestampIndexKey key, int maxSize) {
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
 
         PageUtils.putLong(pageAddr, off + 1, key.dateValue());
         PageUtils.putLong(pageAddr, off + 9, key.nanos());
@@ -72,7 +72,7 @@ public class TimestampInlineIndexKeyType extends NullableInlineIndexKeyType<Abst
             nanos = 0;
         }
 
-        return (AbstractTimestampIndexKey) IndexKeyFactory.wrapDateValue(type(), dv, nanos);
+        return (AbstractTimestampIndexKey)IndexKeyFactory.wrapDateValue(type(), dv, nanos);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/UuidInlineIndexKeyType.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/UuidInlineIndexKeyType.java
index fd2e62f..25bee89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/UuidInlineIndexKeyType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/types/UuidInlineIndexKeyType.java
@@ -29,12 +29,12 @@ public class UuidInlineIndexKeyType extends NullableInlineIndexKeyType<UuidIndex
     /**
      */
     public UuidInlineIndexKeyType() {
-        super(IndexKeyTypes.UUID, (short) 16);
+        super(IndexKeyTypes.UUID, (short)16);
     }
 
     /** {@inheritDoc} */
     @Override public int compare0(long pageAddr, int off, UuidIndexKey key) {
-        UUID v = (UUID) key.key();
+        UUID v = (UUID)key.key();
 
         long part1 = PageUtils.getLong(pageAddr, off + 1);
 
@@ -50,9 +50,9 @@ public class UuidInlineIndexKeyType extends NullableInlineIndexKeyType<UuidIndex
 
     /** {@inheritDoc} */
     @Override protected int put0(long pageAddr, int off, UuidIndexKey key, int maxSize) {
-        UUID val = (UUID) key.key();
+        UUID val = (UUID)key.key();
 
-        PageUtils.putByte(pageAddr, off, (byte) type());
+        PageUtils.putByte(pageAddr, off, (byte)type());
         PageUtils.putLong(pageAddr, off + 1, val.getMostSignificantBits());
         PageUtils.putLong(pageAddr, off + 9, val.getLeastSignificantBits());
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/DecimalIndexKey.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/DecimalIndexKey.java
index 025b4e6..9483b9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/DecimalIndexKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/DecimalIndexKey.java
@@ -42,7 +42,7 @@ public class DecimalIndexKey implements IndexKey {
 
     /** {@inheritDoc} */
     @Override public int compare(IndexKey o) {
-        BigDecimal okey = (BigDecimal) o.key();
+        BigDecimal okey = (BigDecimal)o.key();
 
         return key.compareTo(okey);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/IndexKeyFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/IndexKeyFactory.java
index c7eaa1c..01a271d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/IndexKeyFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/IndexKeyFactory.java
@@ -62,31 +62,31 @@ public class IndexKeyFactory {
 
         switch (keyType) {
             case IndexKeyTypes.BOOLEAN:
-                return new BooleanIndexKey((boolean) o);
+                return new BooleanIndexKey((boolean)o);
             case IndexKeyTypes.BYTE:
-                return new ByteIndexKey((byte) o);
+                return new ByteIndexKey((byte)o);
             case IndexKeyTypes.SHORT:
-                return new ShortIndexKey((short) o);
+                return new ShortIndexKey((short)o);
             case IndexKeyTypes.INT:
-                return new IntegerIndexKey((int) o);
+                return new IntegerIndexKey((int)o);
             case IndexKeyTypes.LONG:
-                return new LongIndexKey((long) o);
+                return new LongIndexKey((long)o);
             case IndexKeyTypes.DECIMAL:
-                return new DecimalIndexKey((BigDecimal) o);
+                return new DecimalIndexKey((BigDecimal)o);
             case IndexKeyTypes.DOUBLE:
-                return new DoubleIndexKey((double) o);
+                return new DoubleIndexKey((double)o);
             case IndexKeyTypes.FLOAT:
-                return new FloatIndexKey((float) o);
+                return new FloatIndexKey((float)o);
             case IndexKeyTypes.BYTES:
                 return keyTypeSettings.binaryUnsigned() ?
-                    new BytesIndexKey((byte[]) o) : new SignedBytesIndexKey((byte[]) o);
+                    new BytesIndexKey((byte[])o) : new SignedBytesIndexKey((byte[])o);
             case IndexKeyTypes.STRING:
-                return new StringIndexKey((String) o);
+                return new StringIndexKey((String)o);
             case IndexKeyTypes.UUID:
-                return new UuidIndexKey((UUID) o);
+                return new UuidIndexKey((UUID)o);
             case IndexKeyTypes.JAVA_OBJECT:
                 if (BinaryObjectImpl.class == o.getClass())
-                    return new CacheJavaObjectIndexKey((CacheObject) o, coctx);
+                    return new CacheJavaObjectIndexKey((CacheObject)o, coctx);
 
                 return new PlainJavaObjectIndexKey(o, null);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/JavaObjectIndexKey.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/JavaObjectIndexKey.java
index c6b5388..e4e869a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/JavaObjectIndexKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/JavaObjectIndexKey.java
@@ -46,7 +46,7 @@ public abstract class JavaObjectIndexKey implements IndexKey {
 
         // Keep old logic there and below.
         if (isComparable && otherIsComparable && haveCommonComparableSuperclass(o1.getClass(), o2.getClass()))
-            return ((Comparable) o1).compareTo(o2);
+            return ((Comparable)o1).compareTo(o2);
 
         else if (o1.getClass() != o2.getClass()) {
             if (isComparable != otherIsComparable)
@@ -59,7 +59,7 @@ public abstract class JavaObjectIndexKey implements IndexKey {
             int h2 = o2.hashCode();
 
             if (h1 == h2)
-                return o1.equals(o2) ? 0 : BytesCompareUtils.compareNotNullSigned(bytesNoCopy(), ((JavaObjectIndexKey) o).bytesNoCopy());
+                return o1.equals(o2) ? 0 : BytesCompareUtils.compareNotNullSigned(bytesNoCopy(), ((JavaObjectIndexKey)o).bytesNoCopy());
             else
                 return h1 > h2 ? 1 : -1;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/StringIndexKey.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/StringIndexKey.java
index 4220bf6..a0bb30e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/StringIndexKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/StringIndexKey.java
@@ -41,7 +41,7 @@ public class StringIndexKey implements IndexKey {
 
     /** {@inheritDoc} */
     @Override public int compare(IndexKey o) {
-        String okey = (String) o.key();
+        String okey = (String)o.key();
 
         return key.compareTo(okey);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/UuidIndexKey.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/UuidIndexKey.java
index 44ebcfe..6cd7d99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/UuidIndexKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/keys/UuidIndexKey.java
@@ -42,7 +42,7 @@ public class UuidIndexKey implements IndexKey {
 
     /** {@inheritDoc} */
     @Override public int compare(IndexKey o) {
-        UUID okey = (UUID) o.key();
+        UUID okey = (UUID)o.key();
 
         // Keep old logic.
         if (key.getMostSignificantBits() == okey.getMostSignificantBits())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java
index 7c220c4..4292d5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java
@@ -150,7 +150,7 @@ class ClientComputeImpl implements ClientCompute {
      */
     private ClientException convertException(Throwable t) {
         if (t instanceof ClientException)
-            return (ClientException) t;
+            return (ClientException)t;
         else if (t.getCause() instanceof ClientException)
             return (ClientException)t.getCause();
         else
@@ -204,7 +204,7 @@ class ClientComputeImpl implements ClientCompute {
             // 1. initFut has not completed - store cancellation flag.
             // 2. initFut has completed - cancel compute future.
             if (!cancellationToken.compareAndSet(null, mayInterruptIfRunning)) {
-                GridFutureAdapter<?> fut = (GridFutureAdapter<?>) cancellationToken.get();
+                GridFutureAdapter<?> fut = (GridFutureAdapter<?>)cancellationToken.get();
 
                 if (!cancelGridFuture(fut, mayInterruptIfRunning))
                     return false;
@@ -235,7 +235,7 @@ class ClientComputeImpl implements ClientCompute {
             resFut.completeExceptionally(new ClientException(err));
         else {
             if (!cancellationToken.compareAndSet(null, task.fut))
-                cancelGridFuture(task.fut, (Boolean) cancellationToken.get());
+                cancelGridFuture(task.fut, (Boolean)cancellationToken.get());
 
             tasksCnt.incrementAndGet();
 
@@ -368,13 +368,13 @@ class ClientComputeImpl implements ClientCompute {
         /** {@inheritDoc} */
         @Override public ClientCompute withNoFailover() {
             return (flags & NO_FAILOVER_FLAG_MASK) != 0 ? this :
-                new ClientComputeModificator(delegate, clusterGrp, (byte) (flags | NO_FAILOVER_FLAG_MASK), timeout);
+                new ClientComputeModificator(delegate, clusterGrp, (byte)(flags | NO_FAILOVER_FLAG_MASK), timeout);
         }
 
         /** {@inheritDoc} */
         @Override public ClientCompute withNoResultCache() {
             return (flags & NO_RESULT_CACHE_FLAG_MASK) != 0 ? this :
-                new ClientComputeModificator(delegate, clusterGrp, (byte) (flags | NO_RESULT_CACHE_FLAG_MASK), timeout);
+                new ClientComputeModificator(delegate, clusterGrp, (byte)(flags | NO_RESULT_CACHE_FLAG_MASK), timeout);
         }
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
index 2b48471..1c036b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
@@ -375,7 +375,7 @@ final class ReliableChannel implements AutoCloseable {
                             }
 
                             if (err instanceof ClientConnectionException) {
-                                ClientConnectionException failure = (ClientConnectionException) err;
+                                ClientConnectionException failure = (ClientConnectionException)err;
 
                                 int attemptsLimit = getRetryLimit() - 1;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
index 4246b07..62df87f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
@@ -580,7 +580,7 @@ class TcpClientChannel implements ClientChannel, ClientMessageHandler, ClientCon
             ProtocolContext protocolCtx = protocolContextFromVersion(proposedVer);
 
             writer.writeInt(0); // reserve an integer for the request size
-            writer.writeByte((byte) ClientListenerRequest.HANDSHAKE);
+            writer.writeByte((byte)ClientListenerRequest.HANDSHAKE);
 
             writer.writeShort(proposedVer.major());
             writer.writeShort(proposedVer.minor());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
index 6662d02..c2c0bb8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
@@ -113,13 +113,13 @@ public class DiscoveryCustomEvent extends DiscoveryEvent {
             return true;
 
         if (msg instanceof SnapshotDiscoveryMessage) {
-            SnapshotDiscoveryMessage snapMsg = (SnapshotDiscoveryMessage) msg;
+            SnapshotDiscoveryMessage snapMsg = (SnapshotDiscoveryMessage)msg;
 
             return snapMsg.needExchange() && snapMsg.needAssignPartitions();
         }
 
         if (msg instanceof DynamicCacheChangeBatch) {
-            DynamicCacheChangeBatch cacheMsg = (DynamicCacheChangeBatch) msg;
+            DynamicCacheChangeBatch cacheMsg = (DynamicCacheChangeBatch)msg;
 
             return cacheMsg.exchangeActions() != null &&
                     !cacheMsg.exchangeActions().cachesToResetLostPartitions().isEmpty();
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 6a56b98..b757349 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
@@ -314,7 +314,7 @@ public class JdbcThinResultSet implements ResultSet {
         if (val instanceof Number)
             return ((Number)val).byteValue();
         else if (cls == Boolean.class)
-            return (Boolean) val ? (byte) 1 : (byte) 0;
+            return (Boolean)val ? (byte)1 : (byte)0;
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Byte.parseByte(val.toString());
@@ -337,9 +337,9 @@ public class JdbcThinResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).shortValue();
+            return ((Number)val).shortValue();
         else if (cls == Boolean.class)
-            return (Boolean) val ? (short) 1 : (short) 0;
+            return (Boolean)val ? (short)1 : (short)0;
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Short.parseShort(val.toString());
@@ -362,9 +362,9 @@ public class JdbcThinResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).intValue();
+            return ((Number)val).intValue();
         else if (cls == Boolean.class)
-            return (Boolean) val ? 1 : 0;
+            return (Boolean)val ? 1 : 0;
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Integer.parseInt(val.toString());
@@ -389,7 +389,7 @@ public class JdbcThinResultSet implements ResultSet {
         if (val instanceof Number)
             return ((Number)val).longValue();
         else if (cls == Boolean.class)
-            return (long) ((Boolean) val ? 1 : 0);
+            return (long)((Boolean)val ? 1 : 0);
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Long.parseLong(val.toString());
@@ -412,9 +412,9 @@ public class JdbcThinResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).floatValue();
+            return ((Number)val).floatValue();
         else if (cls == Boolean.class)
-            return (float) ((Boolean) val ? 1 : 0);
+            return (float)((Boolean)val ? 1 : 0);
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Float.parseFloat(val.toString());
@@ -437,9 +437,9 @@ public class JdbcThinResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).doubleValue();
+            return ((Number)val).doubleValue();
         else if (cls == Boolean.class)
-            return (double)((Boolean) val ? 1 : 0);
+            return (double)((Boolean)val ? 1 : 0);
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Double.parseDouble(val.toString());
@@ -480,13 +480,13 @@ public class JdbcThinResultSet implements ResultSet {
         else if (cls == Integer.class) {
             int x = (int)val;
 
-            return new byte[] { (byte) (x >> 24), (byte) (x >> 16), (byte) (x >> 8), (byte) x};
+            return new byte[] { (byte)(x >> 24), (byte)(x >> 16), (byte)(x >> 8), (byte)x};
         }
         else if (cls == Long.class) {
             long x = (long)val;
 
-            return new byte[] {(byte) (x >> 56), (byte) (x >> 48), (byte) (x >> 40), (byte) (x >> 32),
-                (byte) (x >> 24), (byte) (x >> 16), (byte) (x >> 8), (byte) x};
+            return new byte[] {(byte)(x >> 56), (byte)(x >> 48), (byte)(x >> 40), (byte)(x >> 32),
+                (byte)(x >> 24), (byte)(x >> 16), (byte)(x >> 8), (byte)x};
         }
         else if (cls == String.class)
             return ((String)val).getBytes();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
index 1bcd495..13ae9b59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
@@ -372,7 +372,7 @@ public class JdbcThinStatement implements Statement {
             }
 
             if (e instanceof SQLException)
-                throw (SQLException) e;
+                throw (SQLException)e;
             else
                 throw new SQLException("Failed to read file: '" + fileName + "'", SqlStateCode.INTERNAL_ERROR, e);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java
index c6aecd8..51d97ba 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcResultSet.java
@@ -327,7 +327,7 @@ public class JdbcResultSet implements ResultSet {
         if (val instanceof Number)
             return ((Number)val).byteValue();
         else if (cls == Boolean.class)
-            return (Boolean) val ? (byte) 1 : (byte) 0;
+            return (Boolean)val ? (byte)1 : (byte)0;
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Byte.parseByte(val.toString());
@@ -350,9 +350,9 @@ public class JdbcResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).shortValue();
+            return ((Number)val).shortValue();
         else if (cls == Boolean.class)
-            return (Boolean) val ? (short) 1 : (short) 0;
+            return (Boolean)val ? (short)1 : (short)0;
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Short.parseShort(val.toString());
@@ -375,9 +375,9 @@ public class JdbcResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).intValue();
+            return ((Number)val).intValue();
         else if (cls == Boolean.class)
-            return (Boolean) val ? 1 : 0;
+            return (Boolean)val ? 1 : 0;
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Integer.parseInt(val.toString());
@@ -402,7 +402,7 @@ public class JdbcResultSet implements ResultSet {
         if (val instanceof Number)
             return ((Number)val).longValue();
         else if (cls == Boolean.class)
-            return (long) ((Boolean) val ? 1 : 0);
+            return (long)((Boolean)val ? 1 : 0);
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Long.parseLong(val.toString());
@@ -425,9 +425,9 @@ public class JdbcResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).floatValue();
+            return ((Number)val).floatValue();
         else if (cls == Boolean.class)
-            return (float) ((Boolean) val ? 1 : 0);
+            return (float)((Boolean)val ? 1 : 0);
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Float.parseFloat(val.toString());
@@ -450,9 +450,9 @@ public class JdbcResultSet implements ResultSet {
         Class<?> cls = val.getClass();
 
         if (val instanceof Number)
-            return ((Number) val).doubleValue();
+            return ((Number)val).doubleValue();
         else if (cls == Boolean.class)
-            return (double)((Boolean) val ? 1 : 0);
+            return (double)((Boolean)val ? 1 : 0);
         else if (cls == String.class || cls == Character.class) {
             try {
                 return Double.parseDouble(val.toString());
@@ -493,13 +493,13 @@ public class JdbcResultSet implements ResultSet {
         else if (cls == Integer.class) {
             int x = (int)val;
 
-            return new byte[] { (byte) (x >> 24), (byte) (x >> 16), (byte) (x >> 8), (byte) x};
+            return new byte[] { (byte)(x >> 24), (byte)(x >> 16), (byte)(x >> 8), (byte)x};
         }
         else if (cls == Long.class) {
             long x = (long)val;
 
-            return new byte[] {(byte) (x >> 56), (byte) (x >> 48), (byte) (x >> 40), (byte) (x >> 32),
-                (byte) (x >> 24), (byte) (x >> 16), (byte) (x >> 8), (byte) x};
+            return new byte[] {(byte)(x >> 56), (byte)(x >> 48), (byte)(x >> 40), (byte)(x >> 32),
+                (byte)(x >> 24), (byte)(x >> 16), (byte)(x >> 8), (byte)x};
         }
         else if (cls == String.class)
             return ((String)val).getBytes();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/maintenance/MaintenanceFileStore.java b/modules/core/src/main/java/org/apache/ignite/internal/maintenance/MaintenanceFileStore.java
index b88be2a..4d928ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/maintenance/MaintenanceFileStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/maintenance/MaintenanceFileStore.java
@@ -133,7 +133,7 @@ public class MaintenanceFileStore {
 
     /** */
     private void readTasksFromFile() throws IOException {
-        int len = (int) mntcTasksFileIO.size();
+        int len = (int)mntcTasksFileIO.size();
 
         if (len == 0)
             return;
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 3476192..3bf6073 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
@@ -4352,7 +4352,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         if (ctx.security().enabled()) {
             assert msg instanceof GridIoSecurityAwareMessage;
 
-            return ((GridIoSecurityAwareMessage) msg).secSubjId();
+            return ((GridIoSecurityAwareMessage)msg).secSubjId();
         }
 
         return null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
index 68ce797..8df7393 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
@@ -40,7 +40,7 @@ public class IgniteMessageFactoryImpl implements IgniteMessageFactory {
     private static final int ARR_SIZE = 1 << Short.SIZE;
 
     /** Message suppliers. */
-    private final Supplier<Message>[] msgSuppliers = (Supplier<Message>[]) Array.newInstance(Supplier.class, ARR_SIZE);
+    private final Supplier<Message>[] msgSuppliers = (Supplier<Message>[])Array.newInstance(Supplier.class, ARR_SIZE);
 
     /** Initialized flag. If {@code true} then new message type couldn't be registered. */
     private boolean initialized;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
index a55035d..255fe48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
@@ -858,7 +858,7 @@ class GridDeploymentClassLoader extends ClassLoader implements GridDeploymentInf
                 }
 
                 if (e instanceof TimeoutException)
-                    throw (TimeoutException) e;
+                    throw (TimeoutException)e;
             }
         }
 
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 0041084..d5cd169 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
@@ -2466,7 +2466,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
         ClusterNode clusterNode = ctx.discovery().localNode();
 
         boolean client = (clusterNode instanceof TcpDiscoveryNode) ?
-                (((TcpDiscoveryNode) clusterNode).clientRouterNodeId() != null) : clusterNode.isClient();
+                (((TcpDiscoveryNode)clusterNode).clientRouterNodeId() != null) : clusterNode.isClient();
 
         return client && (spi instanceof IgniteDiscoverySpi) &&
             ((IgniteDiscoverySpi)spi).clientReconnectSupported();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
index 508ef01..c6917c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
@@ -544,7 +544,7 @@ class OptimizedClassDescriptor {
 
                                 serFieldsDesc.setAccessible(true);
 
-                                ObjectStreamField[] serFields = (ObjectStreamField[]) serFieldsDesc.get(null);
+                                ObjectStreamField[] serFields = (ObjectStreamField[])serFieldsDesc.get(null);
 
                                 for (int i = 0; i < serFields.length; i++) {
                                     ObjectStreamField serField = serFields[i];
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
index 3ed800a..d4f35e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
@@ -122,14 +122,14 @@ public class MappedFile implements Closeable, DirectMemoryRegion {
      */
     public static long map(RandomAccessFile f, int mode, long start, long size) throws IOException {
         try {
-            return (Long) map0.invoke(f.getChannel(), mode, start, size);
+            return (Long)map0.invoke(f.getChannel(), mode, start, size);
         }
         catch (IllegalAccessException e) {
             throw new IllegalStateException(e);
         }
         catch (InvocationTargetException e) {
             Throwable target = e.getTargetException();
-            throw (target instanceof IOException) ? (IOException) target : new IOException(target);
+            throw (target instanceof IOException) ? (IOException)target : new IOException(target);
         }
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
index c86b4c5..9394f25 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
@@ -185,7 +185,7 @@ public class PageUtils {
         assert off >= 0;
         assert v >= 0 && v <= 255;
 
-        GridUnsafe.putByte(addr + off, (byte) v);
+        GridUnsafe.putByte(addr + off, (byte)v);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java
index 24a45c6..778373e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java
@@ -39,7 +39,7 @@ public class RotatedIdPartRecord extends PageDeltaRecord {
 
         assert rotatedIdPart >= 0 && rotatedIdPart <= 0xFF;
 
-        this.rotatedIdPart = (byte) rotatedIdPart;
+        this.rotatedIdPart = (byte)rotatedIdPart;
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
index 46a516f..3937be9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
@@ -170,7 +170,7 @@ class GridAffinityUtils {
             assert ignite != null;
             assert log != null;
 
-            IgniteKernal kernal = ((IgniteKernal) ignite);
+            IgniteKernal kernal = ((IgniteKernal)ignite);
 
             GridCacheContext<Object, Object> cctx = kernal.internalCache(cacheName).context();
 
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 7d6eec0..a7b85e3 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
@@ -871,7 +871,7 @@ public class CacheGroupContext {
         if (ccfg.getCacheMode() != LOCAL) {
             if (!ctx.kernalContext().clientNode()) {
                 ctx.io().addCacheGroupHandler(groupId(), GridDhtAffinityAssignmentRequest.class,
-                    (IgniteBiInClosure<UUID, GridDhtAffinityAssignmentRequest>) this::processAffinityAssignmentRequest);
+                    (IgniteBiInClosure<UUID, GridDhtAffinityAssignmentRequest>)this::processAffinityAssignmentRequest);
             }
 
             preldr = new GridDhtPreloader(this);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java
index 3e0dd40..e72976e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java
@@ -359,7 +359,7 @@ public class CacheGroupDescriptor {
         if (o == null || getClass() != o.getClass())
             return false;
 
-        CacheGroupDescriptor that = (CacheGroupDescriptor) o;
+        CacheGroupDescriptor that = (CacheGroupDescriptor)o;
 
         return grpId == that.grpId;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
index 853119b..db0aa74 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
@@ -100,7 +100,7 @@ public class CacheInvokeResult<T> implements EntryProcessorResult<T>, Externaliz
     @Override public T get() throws EntryProcessorException {
         if (err != null) {
             if (err instanceof UnregisteredClassException || err instanceof UnregisteredBinaryTypeException)
-                throw (IgniteException) err;
+                throw (IgniteException)err;
 
             if (err instanceof EntryProcessorException)
                 throw (EntryProcessorException)err;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java
index 3de2d4b..2d7f62c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java
@@ -584,7 +584,7 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable {
         if (hits == 0 || reads == 0)
             return 0;
 
-        return (float) hits / reads * 100.0f;
+        return (float)hits / reads * 100.0f;
     }
 
     /** {@inheritDoc} */
@@ -597,7 +597,7 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable {
         if (misses == 0 || reads == 0)
             return 0;
 
-        return (float) misses / reads * 100.0f;
+        return (float)misses / reads * 100.0f;
     }
 
     /** {@inheritDoc} */
@@ -745,7 +745,7 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable {
         if (offHeapHits == 0 || offHeapGets == 0)
             return 0;
 
-        return (float) offHeapHits / offHeapGets * 100.0f;
+        return (float)offHeapHits / offHeapGets * 100.0f;
     }
 
     /** {@inheritDoc} */
@@ -758,7 +758,7 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable {
         if (offHeapMisses == 0 || offHeapGets == 0)
             return 0;
 
-        return (float) offHeapMisses / offHeapGets * 100.0f;
+        return (float)offHeapMisses / offHeapGets * 100.0f;
     }
 
     /** {@inheritDoc} */
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 b8bd968..a72b444 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
@@ -1407,7 +1407,7 @@ public class ClusterCachesInfo {
      * @param clusterWideCacheData Cluster wide cache data.
      */
     public void validateNoNewCachesWithNewFormat(CacheNodeCommonDiscoveryData clusterWideCacheData) {
-        IgniteDiscoverySpi spi = (IgniteDiscoverySpi) ctx.discovery().getInjectedDiscoverySpi();
+        IgniteDiscoverySpi spi = (IgniteDiscoverySpi)ctx.discovery().getInjectedDiscoverySpi();
 
         boolean allowSplitCacheConfigurations = spi.allNodesSupport(IgniteFeatures.SPLITTED_CACHE_CONFIGURATIONS);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
index 2cc3b14..75d47f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
@@ -106,7 +106,7 @@ public class GatewayProtectedCacheProxy<K, V> extends AsyncSupportAdapter<Ignite
      */
     public void setCacheManager(org.apache.ignite.cache.CacheManager cacheMgr) {
         if (delegate instanceof IgniteCacheProxyImpl)
-            ((IgniteCacheProxyImpl) delegate).setCacheManager(cacheMgr);
+            ((IgniteCacheProxyImpl)delegate).setCacheManager(cacheMgr);
     }
 
     /** {@inheritDoc} */
@@ -279,7 +279,7 @@ public class GatewayProtectedCacheProxy<K, V> extends AsyncSupportAdapter<Ignite
         CacheOperationGate opGate = onEnter();
 
         try {
-            return new GatewayProtectedCacheProxy<>((IgniteCacheProxy<K1, V1>) delegate, opCtx.keepBinary(), lock);
+            return new GatewayProtectedCacheProxy<>((IgniteCacheProxy<K1, V1>)delegate, opCtx.keepBinary(), lock);
         }
         finally {
             onLeave(opGate);
@@ -1625,14 +1625,14 @@ public class GatewayProtectedCacheProxy<K, V> extends AsyncSupportAdapter<Ignite
         boolean isCacheProxy = delegate instanceof IgniteCacheProxyImpl;
 
         if (isCacheProxy)
-            ((IgniteCacheProxyImpl) delegate).checkRestart();
+            ((IgniteCacheProxyImpl)delegate).checkRestart();
 
         if (gate == null)
             throw new IllegalStateException("Gateway is unavailable. Probably cache has been destroyed, but proxy is not closed.");
 
         if (isCacheProxy && tryRestart && gate.isStopped() &&
             context().kernalContext().gateway().getState() == GridKernalState.STARTED) {
-            IgniteCacheProxyImpl proxyImpl = (IgniteCacheProxyImpl) delegate;
+            IgniteCacheProxyImpl proxyImpl = (IgniteCacheProxyImpl)delegate;
 
             try {
                 IgniteCacheProxy<K, V> proxy = context().kernalContext().cache().publicJCache(context().name());
@@ -1664,7 +1664,7 @@ public class GatewayProtectedCacheProxy<K, V> extends AsyncSupportAdapter<Ignite
             boolean isCacheProxy = delegate instanceof IgniteCacheProxyImpl;
 
             if (isCacheProxy)
-                ((IgniteCacheProxyImpl) delegate).checkRestart(true);
+                ((IgniteCacheProxyImpl)delegate).checkRestart(true);
 
             throw e; // If we reached this line.
         }
@@ -1741,16 +1741,16 @@ public class GatewayProtectedCacheProxy<K, V> extends AsyncSupportAdapter<Ignite
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        delegate = (IgniteCacheProxy<K, V>) in.readObject();
+        delegate = (IgniteCacheProxy<K, V>)in.readObject();
 
         lock = in.readBoolean();
 
-        opCtx = (CacheOperationContext) in.readObject();
+        opCtx = (CacheOperationContext)in.readObject();
     }
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object another) {
-        GatewayProtectedCacheProxy anotherProxy = (GatewayProtectedCacheProxy) another;
+        GatewayProtectedCacheProxy anotherProxy = (GatewayProtectedCacheProxy)another;
 
         return delegate.equals(anotherProxy.delegate);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 662b9ab..128049b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4236,7 +4236,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             @Override protected Cache.Entry<K, V> convert(Map.Entry<K, V> e) {
                 // Actually Scan Query returns Iterator<CacheQueryEntry> by default,
                 // CacheQueryEntry implements both Map.Entry and Cache.Entry interfaces.
-                return (Cache.Entry<K, V>) e;
+                return (Cache.Entry<K, V>)e;
             }
 
             @Override protected void remove(Cache.Entry<K, V> item) {
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 36eb009..cbb101a 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
@@ -2009,7 +2009,7 @@ public class GridCacheContext<K, V> implements Externalizable {
         final V1 v;
 
         if (!needVer)
-            v = (V1) val;
+            v = (V1)val;
         else if (getRes == null) {
             v = expireTime != 0 || ttl != 0
                 ? (V1)new EntryGetWithTtlResult(val, ver, false, expireTime, ttl)
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 c7be342..f5dcbe5 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
@@ -706,11 +706,11 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
         if (cacheMsg instanceof GridNearAtomicAbstractUpdateRequest)
             return ((GridNearAtomicAbstractUpdateRequest)cacheMsg).futureId();
         else if (cacheMsg instanceof GridNearAtomicUpdateResponse)
-            return ((GridNearAtomicUpdateResponse) cacheMsg).futureId();
+            return ((GridNearAtomicUpdateResponse)cacheMsg).futureId();
         else if (cacheMsg instanceof GridDhtAtomicAbstractUpdateRequest)
             return ((GridDhtAtomicAbstractUpdateRequest)cacheMsg).futureId();
         else if (cacheMsg instanceof GridDhtAtomicUpdateResponse)
-            return ((GridDhtAtomicUpdateResponse) cacheMsg).futureId();
+            return ((GridDhtAtomicUpdateResponse)cacheMsg).futureId();
         else if (cacheMsg instanceof GridNearAtomicCheckUpdateRequest)
             return ((GridNearAtomicCheckUpdateRequest)cacheMsg).futureId();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index d9b38b7..451c6e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -332,7 +332,7 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
 
         for (GridCacheFuture<?> fut : futs.values()) {
             if (fut instanceof GridDhtTxFinishFuture) {
-                GridDhtTxFinishFuture finishTxFuture = (GridDhtTxFinishFuture) fut;
+                GridDhtTxFinishFuture finishTxFuture = (GridDhtTxFinishFuture)fut;
 
                 if (cctx.tm().needWaitTransaction(finishTxFuture.tx(), topVer))
                     res.add(ignoreErrors(finishTxFuture));
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 15960bd..6c19ec7 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
@@ -657,7 +657,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                         .onAffinityChangeMessage(evt.eventNode(), msg);
             }
             else if (customMsg instanceof DynamicCacheChangeFailureMessage) {
-                DynamicCacheChangeFailureMessage msg = (DynamicCacheChangeFailureMessage) customMsg;
+                DynamicCacheChangeFailureMessage msg = (DynamicCacheChangeFailureMessage)customMsg;
 
                 if (msg.exchangeId().topologyVersion().topologyVersion() >=
                     affinityTopologyVersion(cctx.discovery().localJoinEvent()).topologyVersion())
@@ -665,7 +665,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                         .onDynamicCacheChangeFail(evt.eventNode(), msg);
             }
             else if (customMsg instanceof SnapshotDiscoveryMessage
-                && ((SnapshotDiscoveryMessage) customMsg).needExchange()) {
+                && ((SnapshotDiscoveryMessage)customMsg).needExchange()) {
                 exchId = exchangeId(n.id(), affinityTopologyVersion(evt), evt);
 
                 exchFut = exchangeFuture(exchId, evt, null, null, null);
@@ -2669,7 +2669,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
 
         for (CachePartitionExchangeWorkerTask task : exchWorker.futQ) {
             if (task instanceof GridDhtPartitionsExchangeFuture) {
-                GridDhtPartitionsExchangeFuture fut = (GridDhtPartitionsExchangeFuture) task;
+                GridDhtPartitionsExchangeFuture fut = (GridDhtPartitionsExchangeFuture)task;
 
                 if (fut.initialVersion().compareTo(resVer) > 0) {
                     if (log.isInfoEnabled()) {
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 346ca69..40a9a4f 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
@@ -473,7 +473,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             sharedCtx.walState().onNodeLeft(task0.node().id());
         }
         else if (task instanceof FinishPreloadingTask) {
-            FinishPreloadingTask task0 = (FinishPreloadingTask) task;
+            FinishPreloadingTask task0 = (FinishPreloadingTask)task;
 
             CacheGroupContext grp = cacheGroup(task0.groupId());
 
@@ -5354,7 +5354,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @return Cache configuration splitter with or without old format support depending on cluster state.
      */
     private CacheConfigurationSplitter backwardCompatibleSplitter() {
-        IgniteDiscoverySpi spi = (IgniteDiscoverySpi) ctx.discovery().getInjectedDiscoverySpi();
+        IgniteDiscoverySpi spi = (IgniteDiscoverySpi)ctx.discovery().getInjectedDiscoverySpi();
 
         boolean oldFormat = !spi.allNodesSupport(IgniteFeatures.SPLITTED_CACHE_CONFIGURATIONS);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
index 87cbd67..d0a4261 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
@@ -264,9 +264,9 @@ public class GridCacheReturn implements Externalizable, Message {
             // These exceptions mean that we should register class and call EntryProcessor again.
             if (err != null) {
                 if (err instanceof UnregisteredClassException)
-                    throw (UnregisteredClassException) err;
+                    throw (UnregisteredClassException)err;
                 else if (err instanceof UnregisteredBinaryTypeException)
-                    throw (UnregisteredBinaryTypeException) err;
+                    throw (UnregisteredBinaryTypeException)err;
             }
 
             CacheInvokeResult res0 = err == null ? CacheInvokeResult.fromResult(res) : CacheInvokeResult.fromError(err);
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 81d3247..e607f17 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
@@ -571,7 +571,7 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache<
                 }, false);
         }
         else if (query instanceof IndexQuery) {
-            IndexQuery q = (IndexQuery) query;
+            IndexQuery q = (IndexQuery)query;
 
             qry = ctx.queries().createIndexQuery(q, isKeepBinary);
 
@@ -890,17 +890,17 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache<
 
         if (ctx.binaryMarshaller()) {
             if (qry instanceof SqlQuery) {
-                final SqlQuery sqlQry = (SqlQuery) qry;
+                final SqlQuery sqlQry = (SqlQuery)qry;
 
                 convertToBinary(sqlQry.getArgs());
             }
             else if (qry instanceof SpiQuery) {
-                final SpiQuery spiQry = (SpiQuery) qry;
+                final SpiQuery spiQry = (SpiQuery)qry;
 
                 convertToBinary(spiQry.getArgs());
             }
             else if (qry instanceof SqlFieldsQuery) {
-                final SqlFieldsQuery fieldsQry = (SqlFieldsQuery) qry;
+                final SqlFieldsQuery fieldsQry = (SqlFieldsQuery)qry;
 
                 convertToBinary(fieldsQry.getArgs());
             }
@@ -2101,13 +2101,13 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache<
             e = X.cause(e, CacheException.class);
 
         if (e instanceof IgniteCheckedException)
-            return CU.convertToCacheException((IgniteCheckedException) e);
+            return CU.convertToCacheException((IgniteCheckedException)e);
 
         if (X.hasCause(e, CacheStoppedException.class))
             return CU.convertToCacheException(X.cause(e, CacheStoppedException.class));
 
         if (e instanceof RuntimeException)
-            return (RuntimeException) e;
+            return (RuntimeException)e;
 
         throw new IllegalStateException("Unknown exception", e);
     }
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 81f1cfd..6f7205d 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
@@ -157,7 +157,7 @@ public class WalStateManager extends GridCacheSharedManagerAdapter {
             ioLsnr = new GridMessageListener() {
                 @Override public void onMessage(UUID nodeId, Object msg, byte plc) {
                     if (msg instanceof WalStateAckMessage) {
-                        WalStateAckMessage msg0 = (WalStateAckMessage) msg;
+                        WalStateAckMessage msg0 = (WalStateAckMessage)msg;
 
                         msg0.senderNodeId(nodeId);
 
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 0a94814..d70df6e 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
@@ -1240,7 +1240,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
         obj = toBinary(obj, false);
 
         if (obj instanceof BinaryObjectImpl) {
-            ((KeyCacheObject) obj).partition(partition(ctx, cctx, obj));
+            ((KeyCacheObject)obj).partition(partition(ctx, cctx, obj));
 
             return (KeyCacheObject)obj;
         }
@@ -1527,7 +1527,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
                     res.put(e.getKey(), e.getValue());
             }
 
-            dataBag.addGridCommonData(BINARY_PROC.ordinal(), (Serializable) res);
+            dataBag.addGridCommonData(BINARY_PROC.ordinal(), (Serializable)res);
         }
     }
 
@@ -1538,12 +1538,12 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
         for (Map.Entry<Integer, BinaryMetadataHolder> e : metadataLocCache.entrySet())
             res.put(e.getKey(), e.getValue());
 
-        dataBag.addJoiningNodeData(BINARY_PROC.ordinal(), (Serializable) res);
+        dataBag.addJoiningNodeData(BINARY_PROC.ordinal(), (Serializable)res);
     }
 
     /** {@inheritDoc} */
     @Override public void onJoiningNodeDataReceived(DiscoveryDataBag.JoiningNodeDiscoveryData data) {
-        Map<Integer, BinaryMetadataHolder> newNodeMeta = (Map<Integer, BinaryMetadataHolder>) data.joiningNodeData();
+        Map<Integer, BinaryMetadataHolder> newNodeMeta = (Map<Integer, BinaryMetadataHolder>)data.joiningNodeData();
 
         if (newNodeMeta == null)
             return;
@@ -1598,7 +1598,7 @@ public class CacheObjectBinaryProcessorImpl extends GridProcessorAdapter impleme
 
     /** {@inheritDoc} */
     @Override public void onGridDataReceived(GridDiscoveryData data) {
-        Map<Integer, BinaryMetadataHolder> receivedData = (Map<Integer, BinaryMetadataHolder>) data.commonData();
+        Map<Integer, BinaryMetadataHolder> receivedData = (Map<Integer, BinaryMetadataHolder>)data.commonData();
 
         if (receivedData != null) {
             for (Map.Entry<Integer, BinaryMetadataHolder> e : receivedData.entrySet()) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index da23f79..5214aba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -461,13 +461,13 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
                 GridNearCacheAdapter<K, V> near = null;
 
                 if (cache instanceof GridNearCacheAdapter) {
-                    near = ((GridNearCacheAdapter<K, V>) cache);
+                    near = ((GridNearCacheAdapter<K, V>)cache);
                     dht = near.dht();
                 }
                 else
-                    dht = (GridDhtCacheAdapter<K, V>) cache;
+                    dht = (GridDhtCacheAdapter<K, V>)cache;
 
-                try (DataStreamerImpl dataLdr = (DataStreamerImpl) ignite.dataStreamer(cacheName)) {
+                try (DataStreamerImpl dataLdr = (DataStreamerImpl)ignite.dataStreamer(cacheName)) {
                     dataLdr.maxRemapCount(0);
 
                     dataLdr.skipStore(skipStore);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index d4c4b45..89be03f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -963,9 +963,9 @@ public abstract class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
             if (e instanceof IgniteCheckedException)
                 throw new IgniteException(e);
             else if (e instanceof RuntimeException)
-                throw (RuntimeException) e;
+                throw (RuntimeException)e;
             else
-                throw (Error) e;
+                throw (Error)e;
         }
     }
 
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 b2daac7..f7f7622 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
@@ -591,7 +591,7 @@ public final class GridDhtLockFuture extends GridCacheCompoundIdentityFuture<Boo
 
             // Avoid iterator creation.
             for (int i = 0; i < size; i++) {
-                MiniFuture mini = (MiniFuture) future(i);
+                MiniFuture mini = (MiniFuture)future(i);
 
                 if (mini.futureId().equals(miniId)) {
                     if (!mini.isDone())
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 5fc4579..9e7ff00 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
@@ -1997,7 +1997,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
             }
 
             if (e instanceof Error)
-                throw (Error) e;
+                throw (Error)e;
 
             return;
         }
@@ -2342,7 +2342,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
             }
 
             if (e instanceof Error)
-                throw (Error) e;
+                throw (Error)e;
         }
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 4ad2eb7..79fde4bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -1089,7 +1089,7 @@ public final class GridDhtTxPrepareFuture extends GridCacheCompoundFuture<Ignite
             if (tx.empty() && !req.queryUpdate()) {
                 tx.setRollbackOnly();
 
-                onDone((GridNearTxPrepareResponse) null);
+                onDone((GridNearTxPrepareResponse)null);
             }
 
             this.req = req;
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 1f591eb..c7a24b2 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
@@ -949,7 +949,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        Map<K, EntryProcessorResult<T>> updateResults = (Map<K, EntryProcessorResult<T>>) updateAll0(null,
+        Map<K, EntryProcessorResult<T>> updateResults = (Map<K, EntryProcessorResult<T>>)updateAll0(null,
             map,
             args,
             null,
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 9d66a1c..0f7d891 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
@@ -3921,7 +3921,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
                 if (activateCluster() || changedBaseline())
                     assignPartitionsStates(null);
 
-                DiscoveryCustomMessage discoveryCustomMessage = ((DiscoveryCustomEvent) firstDiscoEvt).customMessage();
+                DiscoveryCustomMessage discoveryCustomMessage = ((DiscoveryCustomEvent)firstDiscoEvt).customMessage();
 
                 if (discoveryCustomMessage instanceof DynamicCacheChangeBatch) {
                     if (exchActions != null) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
index ec435d2..3dd919e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
@@ -1044,7 +1044,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
                     if (cached.deleted())
                         continue;
 
-                    if (cached instanceof GridDhtCacheEntry && ((GridDhtCacheEntry) cached).clearInternal(clearVer, extras)) {
+                    if (cached instanceof GridDhtCacheEntry && ((GridDhtCacheEntry)cached).clearInternal(clearVer, extras)) {
                         removeEntry(cached);
 
                         if (rec && !hld.cctx.config().isEventsDisabled()) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
index 994f228..680eed2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
@@ -702,7 +702,7 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
         if (!(topReadyFut instanceof GridDhtPartitionsExchangeFuture))
             return;
 
-        GridDhtPartitionsExchangeFuture exchFut = (GridDhtPartitionsExchangeFuture) topReadyFut;
+        GridDhtPartitionsExchangeFuture exchFut = (GridDhtPartitionsExchangeFuture)topReadyFut;
 
         boolean grpStarted = exchFut.cacheGroupAddedOnExchange(grp.groupId(), grp.receivedFrom());
 
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 f6a4aae..9ab94a5 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
@@ -213,7 +213,7 @@ public class PartitionsEvictManager extends GridCacheSharedManagerAdapter {
     @Override protected void start0() throws IgniteCheckedException {
         super.start0();
 
-        executor = (IgniteThreadPoolExecutor) cctx.kernalContext().pools().getRebalanceExecutorService();
+        executor = (IgniteThreadPoolExecutor)cctx.kernalContext().pools().getRebalanceExecutorService();
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
index fcc4eec..d5d201e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
@@ -265,7 +265,7 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry {
                     if (!markObsolete(cctx.cache().nextVersion())) {
                         value(val);
 
-                        ttlAndExpireTimeExtras((int) ttl, expireTime);
+                        ttlAndExpireTimeExtras((int)ttl, expireTime);
 
                         primaryNode(primaryNodeId, topVer);
                     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index c2f8171..bbda303 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -149,7 +149,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
 
         for (IgniteInternalFuture<?> fut : futures()) {
             if (isMini(fut)) {
-                MiniFuture f = (MiniFuture) fut;
+                MiniFuture f = (MiniFuture)fut;
 
                 if (f.primary().id().equals(nodeId)) {
                     ClusterTopologyCheckedException e = new ClusterTopologyCheckedException("Remote node left grid: " +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index b82d0f4..a066264 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -119,7 +119,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
 
         for (IgniteInternalFuture<?> fut : futures()) {
             if (isMini(fut)) {
-                MiniFuture f = (MiniFuture) fut;
+                MiniFuture f = (MiniFuture)fut;
 
                 if (f.node().id().equals(nodeId)) {
                     ClusterTopologyCheckedException e = new ClusterTopologyCheckedException("Remote node left grid: " +
@@ -1024,7 +1024,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
 
             parent.prepareOnTopology(true, new Runnable() {
                 @Override public void run() {
-                    onDone((GridNearTxPrepareResponse) null);
+                    onDone((GridNearTxPrepareResponse)null);
                 }
             });
         }
@@ -1057,7 +1057,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
         /** {@inheritDoc} */
         @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
         @Override public boolean equals(Object o) {
-            MappingKey that = (MappingKey) o;
+            MappingKey that = (MappingKey)o;
 
             return nearEntries == that.nearEntries && nodeId.equals(that.nodeId);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
index 584cec2..455ee3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
@@ -161,7 +161,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri
             GridCacheContext cctx = ctx.cacheContext(cacheId);
 
             if (res instanceof CacheObject)
-                prepareMarshalCacheObject((CacheObject) res, cctx);
+                prepareMarshalCacheObject((CacheObject)res, cctx);
             else if (res instanceof CacheVersionedValue)
                 ((CacheVersionedValue)res).prepareMarshal(cctx.cacheObjectContext());
             else if (res instanceof GridCacheEntryInfo)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 723eeea..06490a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -581,7 +581,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> {
 
         final boolean keepBinary = opCtx != null && opCtx.isKeepBinary();
 
-        Map<K, EntryProcessorResult<T>> entryProcessorRes = (Map<K, EntryProcessorResult<T>>) updateAllInternal(
+        Map<K, EntryProcessorResult<T>> entryProcessorRes = (Map<K, EntryProcessorResult<T>>)updateAllInternal(
                 TRANSFORM,
                 invokeMap.keySet(),
                 invokeMap.values(),
@@ -687,7 +687,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> {
 
         CacheOperationContext opCtx = ctx.operationContextPerCall();
 
-        Map<K, EntryProcessorResult<T>> entryProcessorResult = (Map<K, EntryProcessorResult<T>>) updateAllInternal(
+        Map<K, EntryProcessorResult<T>> entryProcessorResult = (Map<K, EntryProcessorResult<T>>)updateAllInternal(
                 TRANSFORM,
                 map.keySet(),
                 map.values(),
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
index e6cd9ef..8ff27b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
@@ -2169,7 +2169,7 @@ public class MvccProcessorImpl extends GridProcessorAdapter implements MvccProce
                 }
                 catch (Throwable e) {
                     if (e instanceof Error)
-                        throw (Error) e;
+                        throw (Error)e;
 
                     if (log.isDebugEnabled())
                         U.warn(log, "Failed to perform vacuum.", e);
@@ -2241,7 +2241,7 @@ public class MvccProcessorImpl extends GridProcessorAdapter implements MvccProce
                     }
 
                     if (e instanceof Error)
-                        throw (Error) e;
+                        throw (Error)e;
                 }
             }
         }
@@ -2434,7 +2434,7 @@ public class MvccProcessorImpl extends GridProcessorAdapter implements MvccProce
 
                         if (rest != null) {
                             if (rest.getClass() == ArrayList.class) {
-                                for (MvccDataRow row : ((List<MvccDataRow>) rest))
+                                for (MvccDataRow row : ((List<MvccDataRow>)rest))
                                     part.dataStore().updateTxState(cctx, row);
                             }
                             else
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccVersionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccVersionImpl.java
index 2ac555e..c4f35ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccVersionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccVersionImpl.java
@@ -84,16 +84,16 @@ public class MvccVersionImpl implements MvccVersion, Message {
         if (o == null || getClass() != o.getClass())
             return false;
 
-        MvccVersionImpl that = (MvccVersionImpl) o;
+        MvccVersionImpl that = (MvccVersionImpl)o;
 
         return crdVer == that.crdVer && cntr == that.cntr;
     }
 
     /** {@inheritDoc} */
     @Override public int hashCode() {
-        int res = (int) (crdVer ^ (crdVer >>> 32));
+        int res = (int)(crdVer ^ (crdVer >>> 32));
 
-        res = 31 * res + (int) (cntr ^ (cntr >>> 32));
+        res = 31 * res + (int)(cntr ^ (cntr >>> 32));
 
         return res;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxKey.java
index 92aff7b..1e48850 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxKey.java
@@ -57,15 +57,15 @@ public class TxKey {
         if (this == o) return true;
         if (o == null || o.getClass() != TxKey.class) return false;
 
-        TxKey txKey = (TxKey) o;
+        TxKey txKey = (TxKey)o;
 
         return major == txKey.major && minor == txKey.minor;
     }
 
     /** {@inheritDoc} */
     @Override public int hashCode() {
-        int result = (int) (major ^ (major >>> 32));
-        result = 31 * result + (int) (minor ^ (minor >>> 32));
+        int result = (int)(major ^ (major >>> 32));
+        result = 31 * result + (int)(minor ^ (minor >>> 32));
         return result;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLogTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLogTree.java
index 528902c..acd7779 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLogTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLogTree.java
@@ -81,6 +81,6 @@ public class TxLogTree extends BPlusTree<TxKey, TxRow> {
     /** {@inheritDoc} */
     @Override public TxRow getRow(BPlusIO<TxKey> io, long pageAddr,
                                   int idx, Object ignored) throws IgniteCheckedException {
-        return (TxRow) io.getLookupRow(this, pageAddr, idx);
+        return (TxRow)io.getLookupRow(this, pageAddr, idx);
     }
 }
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 6d15f09..1bf218d 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
@@ -696,7 +696,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
             return;
 
         if (rateTimeInterval / subInts < 10)
-            subInts = (int) rateTimeInterval / 10;
+            subInts = (int)rateTimeInterval / 10;
 
         allocRate.reset(rateTimeInterval, subInts);
         evictRate.reset(rateTimeInterval, subInts);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsMXBeanImpl.java
index cd5d000..b0e94d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsMXBeanImpl.java
@@ -165,12 +165,12 @@ class DataRegionMetricsMXBeanImpl implements DataRegionMetricsMXBean {
 
     /** {@inheritDoc} */
     @Override public int getInitialSize() {
-        return (int) (dataRegCfg.getInitialSize() / (1024 * 1024));
+        return (int)(dataRegCfg.getInitialSize() / (1024 * 1024));
     }
 
     /** {@inheritDoc} */
     @Override public int getMaxSize() {
-        return (int) (dataRegCfg.getMaxSize() / (1024 * 1024));
+        return (int)(dataRegCfg.getMaxSize() / (1024 * 1024));
     }
 
     /** {@inheritDoc} */
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 ed92638..c854bbf 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
@@ -1588,7 +1588,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
 
             snapshotMgr.onCacheGroupStop(gctx, destroy);
 
-            PageMemoryEx pageMem = (PageMemoryEx) dataRegion.pageMemory();
+            PageMemoryEx pageMem = (PageMemoryEx)dataRegion.pageMemory();
 
             Collection<Integer> grpIds = destroyed.computeIfAbsent(pageMem, k -> new HashSet<>());
 
@@ -1940,7 +1940,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
         if (mntcTask != null) {
             log.warning("Maintenance task found, stop restoring memory");
 
-            File workDir = ((FilePageStoreManager) cctx.pageStore()).workDir();
+            File workDir = ((FilePageStoreManager)cctx.pageStore()).workDir();
 
             mntcRegistry.registerWorkflowCallback(CORRUPTED_DATA_FILES_MNTC_TASK_NAME,
                 new CorruptedPdsMaintenanceCallback(workDir,
@@ -2841,7 +2841,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
                         break;
 
                     case PARTITION_CLEARING_START_RECORD:
-                        PartitionClearingStartRecord rec0 = (PartitionClearingStartRecord) rec;
+                        PartitionClearingStartRecord rec0 = (PartitionClearingStartRecord)rec;
 
                         CacheGroupContext grp = this.ctx.cache().cacheGroup(rec0.groupId());
 
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 1319ae1..8af3810 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
@@ -2005,7 +2005,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
 
             GridCacheSharedContext ctx = grp.shared();
 
-            AtomicLong pageListCacheLimit = ((GridCacheDatabaseSharedManager) ctx.database()).pageListCacheLimitHolder(grp.dataRegion());
+            AtomicLong pageListCacheLimit = ((GridCacheDatabaseSharedManager)ctx.database()).pageListCacheLimitHolder(grp.dataRegion());
 
             IgniteCacheDatabaseSharedManager dbMgr = ctx.database();
 
@@ -2121,7 +2121,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
                         }
                     };
 
-                    PageMemoryEx pageMem = (PageMemoryEx) grp.dataRegion().pageMemory();
+                    PageMemoryEx pageMem = (PageMemoryEx)grp.dataRegion().pageMemory();
 
                     int grpId = grp.groupId();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java
index 65b3e70..a02371b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java
@@ -212,7 +212,7 @@ public class IgniteDefragmentationImpl implements IgniteDefragmentation {
 
         assert dbMgr instanceof GridCacheDatabaseSharedManager;
 
-        CachePartitionDefragmentationManager defrgMgr = ((GridCacheDatabaseSharedManager) dbMgr)
+        CachePartitionDefragmentationManager defrgMgr = ((GridCacheDatabaseSharedManager)dbMgr)
                 .defragmentationManager();
 
         if (defrgMgr == null)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AbstractFileIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AbstractFileIO.java
index 8708f0d..68bedb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AbstractFileIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AbstractFileIO.java
@@ -137,7 +137,7 @@ public abstract class AbstractFileIO implements FileIO {
     private int available(int requested, long position) throws IOException {
         long avail = size() - position;
 
-        return requested > avail ? (int) avail : requested;
+        return requested > avail ? (int)avail : requested;
     }
 
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptionUtil.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptionUtil.java
index d13aa8e..43c6419f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptionUtil.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptionUtil.java
@@ -121,10 +121,10 @@ public class EncryptionUtil {
     private void storeCRC(ByteBuffer res) {
         int crc = FastCrc.calcCrc(res, encryptedDataSize());
 
-        res.put((byte) (crc >> 24));
-        res.put((byte) (crc >> 16));
-        res.put((byte) (crc >> 8));
-        res.put((byte) crc);
+        res.put((byte)(crc >> 24));
+        res.put((byte)(crc >> 16));
+        res.put((byte)(crc >> 8));
+        res.put((byte)crc);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
index 4a90d39..3baabc4 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
@@ -805,7 +805,7 @@ public class FilePageStore implements PageStore {
 
     /** {@inheritDoc} */
     @Override public long pageOffset(long pageId) {
-        return (long) PageIdUtils.pageIndex(pageId) * pageSize + headerSize();
+        return (long)PageIdUtils.pageIndex(pageId) * pageSize + headerSize();
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java
index 75339af..ef2fce4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java
@@ -125,7 +125,7 @@ public class PagesWriteThrottle implements PagesWriteThrottlePolicy {
         if (shouldThrottle) {
             int throttleLevel = cntr.getAndIncrement();
 
-            long throttleParkTimeNs = (long) (STARTING_THROTTLE_NANOS * Math.pow(BACKOFF_RATIO, throttleLevel));
+            long throttleParkTimeNs = (long)(STARTING_THROTTLE_NANOS * Math.pow(BACKOFF_RATIO, throttleLevel));
 
             Thread curThread = Thread.currentThread();
 
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 71a58c3..18f1ff8 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
@@ -835,15 +835,15 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
         this.failureProcessor = failureProcessor;
 
         // Initialize page handlers.
-        askNeighbor = (PageHandler<Get, Result>) wrap(this, new AskNeighbor());
-        search = (PageHandler<Get, Result>) wrap(this, new Search());
-        lockTail = (PageHandler<Remove, Result>) wrap(this, new LockTail());
-        lockTailForward = (PageHandler<Remove, Result>) wrap(this, new LockTailForward());
-        lockBackAndTail = (PageHandler<Remove, Result>) wrap(this, new LockBackAndTail());
-        lockBackAndRmvFromLeaf = (PageHandler<Remove, Result>) wrap(this, new LockBackAndRmvFromLeaf());
-        rmvFromLeaf = (PageHandler<Remove, Result>) wrap(this, new RemoveFromLeaf());
-        insert = (PageHandler<Put, Result>) wrap(this, new Insert());
-        replace = (PageHandler<Put, Result>) wrap(this, new Replace());
+        askNeighbor = (PageHandler<Get, Result>)wrap(this, new AskNeighbor());
+        search = (PageHandler<Get, Result>)wrap(this, new Search());
+        lockTail = (PageHandler<Remove, Result>)wrap(this, new LockTail());
+        lockTailForward = (PageHandler<Remove, Result>)wrap(this, new LockTailForward());
+        lockBackAndTail = (PageHandler<Remove, Result>)wrap(this, new LockBackAndTail());
+        lockBackAndRmvFromLeaf = (PageHandler<Remove, Result>)wrap(this, new LockBackAndRmvFromLeaf());
+        rmvFromLeaf = (PageHandler<Remove, Result>)wrap(this, new RemoveFromLeaf());
+        insert = (PageHandler<Put, Result>)wrap(this, new Insert());
+        replace = (PageHandler<Put, Result>)wrap(this, new Replace());
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
index ac75fa0..cbc006c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
@@ -797,10 +797,10 @@ public abstract class PageIO {
                 return (Q)CacheIdAwareDataLeafIO.VERSIONS.forVersion(ver);
 
             case T_CACHE_ID_DATA_REF_MVCC_INNER:
-                return (Q) MvccCacheIdAwareDataInnerIO.VERSIONS.forVersion(ver);
+                return (Q)MvccCacheIdAwareDataInnerIO.VERSIONS.forVersion(ver);
 
             case T_CACHE_ID_DATA_REF_MVCC_LEAF:
-                return (Q) MvccCacheIdAwareDataLeafIO.VERSIONS.forVersion(ver);
+                return (Q)MvccCacheIdAwareDataLeafIO.VERSIONS.forVersion(ver);
 
             case T_DATA_REF_MVCC_INNER:
                 return (Q)MvccDataInnerIO.VERSIONS.forVersion(ver);
@@ -833,10 +833,10 @@ public abstract class PageIO {
                 return (Q)MetastorageBPlusIO.LEAF_IO_VERSIONS.forVersion(ver);
 
             case T_DEFRAG_LINK_MAPPING_INNER:
-                return (Q) LinkMap.INNER_IO_VERSIONS.forVersion(ver);
+                return (Q)LinkMap.INNER_IO_VERSIONS.forVersion(ver);
 
             case T_DEFRAG_LINK_MAPPING_LEAF:
-                return (Q) LinkMap.LEAF_IO_VERSIONS.forVersion(ver);
+                return (Q)LinkMap.LEAF_IO_VERSIONS.forVersion(ver);
 
             default:
                 // For tests.
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 5fa1cdd..c850c15 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
@@ -175,7 +175,7 @@ public class TrackingPageIO extends PageIO {
                 }
 
                 for (; i < len; i++) {
-                    byte newVal = (byte) (buf.get(sizeOff + SIZE_FIELD_SIZE + i) | buf.get(sizeOff2 + SIZE_FIELD_SIZE + i));
+                    byte newVal = (byte)(buf.get(sizeOff + SIZE_FIELD_SIZE + i) | buf.get(sizeOff2 + SIZE_FIELD_SIZE + i));
 
                     newSize += Integer.bitCount(newVal & 0xFF);
 
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 f5ec83b..655dc47 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
@@ -1463,9 +1463,9 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
                 }
 
                 if (e instanceof StorageException)
-                    throw (StorageException) e;
+                    throw (StorageException)e;
 
-                throw e instanceof IOException ? (IOException) e : new IOException(e);
+                throw e instanceof IOException ? (IOException)e : new IOException(e);
             }
         }
         catch (IOException e) {
@@ -2636,7 +2636,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
      */
     public static ByteBuffer prepareSerializerVersionBuffer(long idx, int ver, boolean compacted, ByteBuffer buf) {
         // Write record type.
-        buf.put((byte) (WALRecord.RecordType.HEADER_RECORD.ordinal() + 1));
+        buf.put((byte)(WALRecord.RecordType.HEADER_RECORD.ordinal() + 1));
 
         // Write position.
         RecordV1Serializer.putPosition(buf, new WALPointer(idx, 0, 0));
@@ -2841,7 +2841,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
                     currDesc = zipFile;
             }
 
-            return (ReadFileHandle) super.initReadHandle(currDesc, start);
+            return (ReadFileHandle)super.initReadHandle(currDesc, start);
         }
 
         /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
index 83c882c..c99c97e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
@@ -568,7 +568,7 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
                 return ((ReencryptionStartRecord)record).dataSize();
 
             case INDEX_ROOT_PAGE_RENAME_RECORD:
-                return ((IndexRenameRootPageRecord) record).dataSize();
+                return ((IndexRenameRootPageRecord)record).dataSize();
 
             case PARTITION_CLEARING_START_RECORD:
                 return 4 + 4 + 8;
@@ -1832,7 +1832,7 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
 
             case META_PAGE_UPDATE_LAST_ALLOCATED_INDEX:
                 MetaPageUpdateLastAllocatedIndex mpUpdateLastAllocatedIdx =
-                        (MetaPageUpdateLastAllocatedIndex) rec;
+                        (MetaPageUpdateLastAllocatedIndex)rec;
 
                 buf.putInt(mpUpdateLastAllocatedIdx.groupId());
                 buf.putLong(mpUpdateLastAllocatedIdx.pageId());
@@ -1842,7 +1842,7 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
                 break;
 
             case PART_META_UPDATE_STATE:
-                PartitionMetaStateRecord partMetaStateRecord = (PartitionMetaStateRecord) rec;
+                PartitionMetaStateRecord partMetaStateRecord = (PartitionMetaStateRecord)rec;
 
                 buf.putInt(partMetaStateRecord.groupId());
 
@@ -1855,7 +1855,7 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
                 break;
 
             case PAGE_LIST_META_RESET_COUNT_RECORD:
-                PageListMetaResetCountRecord pageListMetaResetCntRecord = (PageListMetaResetCountRecord) rec;
+                PageListMetaResetCountRecord pageListMetaResetCntRecord = (PageListMetaResetCountRecord)rec;
 
                 buf.putInt(pageListMetaResetCntRecord.groupId());
                 buf.putLong(pageListMetaResetCntRecord.pageId());
@@ -1863,7 +1863,7 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
                 break;
 
             case ROTATED_ID_PART_RECORD:
-                RotatedIdPartRecord rotatedIdPartRecord = (RotatedIdPartRecord) rec;
+                RotatedIdPartRecord rotatedIdPartRecord = (RotatedIdPartRecord)rec;
 
                 buf.putInt(rotatedIdPartRecord.groupId());
                 buf.putLong(rotatedIdPartRecord.pageId());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
index b782a96..37c2e13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
@@ -85,7 +85,7 @@ public class GridCacheDistributedQueryFuture<K, V, R> extends GridCacheQueryFutu
 
         this.reqId = reqId;
 
-        qryMgr = (GridCacheDistributedQueryManager<K, V>) ctx.queries();
+        qryMgr = (GridCacheDistributedQueryManager<K, V>)ctx.queries();
 
         streams = new ConcurrentHashMap<>(nodes.size());
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
index b40c134..dfa03d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
@@ -252,7 +252,7 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda
                     ArrayList unwrapped = new ArrayList();
 
                     for (Object o: data) {
-                        ScoredCacheEntry e = (ScoredCacheEntry) o;
+                        ScoredCacheEntry e = (ScoredCacheEntry)o;
 
                         Object uKey = CacheObjectUtils.unwrapBinary(
                             cctx.cacheObjectContext(), e.getKey(), qry.query().keepBinary(), true, null);
@@ -276,7 +276,7 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda
                 if (query().query().type() == GridCacheQueryType.INDEX)
                     onMeta(metadata);
 
-                onPage(nodeId, (Collection<R>) data, lastPage);
+                onPage(nodeId, (Collection<R>)data, lastPage);
 
                 if (isDone())
                     clear();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index dd68152..fdbcf48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -116,7 +116,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
             byte[] data;
 
             try {
-                IgniteInternalCache<?, ?> cache = ((IgniteEx) ignite).cachex(cacheName);
+                IgniteInternalCache<?, ?> cache = ((IgniteEx)ignite).cachex(cacheName);
 
                 assert cache != null;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/reducer/CacheQueryReducer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/reducer/CacheQueryReducer.java
index b827c2f..a8a5fef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/reducer/CacheQueryReducer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/reducer/CacheQueryReducer.java
@@ -52,7 +52,7 @@ public abstract class CacheQueryReducer<T> extends GridIteratorAdapter<T> {
      */
     public static <T> T get(CompletableFuture<?> fut) throws IgniteCheckedException {
         try {
-            return (T) fut.get();
+            return (T)fut.get();
         }
         catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -63,7 +63,7 @@ public abstract class CacheQueryReducer<T> extends GridIteratorAdapter<T> {
             Throwable t = e.getCause();
 
             if (t instanceof IgniteCheckedException)
-                throw (IgniteCheckedException) t;
+                throw (IgniteCheckedException)t;
 
             throw new IgniteCheckedException("Page future was completed with unexpected error.", e);
         }
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 a95a223..b5c20c9 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
@@ -2286,7 +2286,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
 
         for (final IgniteInternalTx tx : activeTransactions()) {
             if (!tx.local() && nearVer.equals(tx.nearXidVersion()))
-                fut.add((IgniteInternalFuture) tx.finishFuture());
+                fut.add((IgniteInternalFuture)tx.finishFuture());
         }
 
         fut.markInitialized();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
index ba32fcc..0036bb2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
@@ -87,7 +87,7 @@ public abstract class AbstractDataLeafIO extends BPlusLeafIO<CacheSearchRow> imp
     /** {@inheritDoc} */
     @Override public void store(long dstPageAddr, int dstIdx, BPlusIO<CacheSearchRow> srcIo, long srcPageAddr,
         int srcIdx) {
-        RowLinkIO rowIo = (RowLinkIO) srcIo;
+        RowLinkIO rowIo = (RowLinkIO)srcIo;
 
         long link = rowIo.getLink(srcPageAddr, srcIdx);
         int hash = rowIo.getHash(srcPageAddr, srcIdx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index fb67160..48a6507 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -116,7 +116,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
         long startTime = cctx.kernalContext().discovery().gridStartTime();
 
         if (startTime != 0)
-            offset = (int) ((startTime - TOP_VER_BASE_TIME) / 1000);
+            offset = (int)((startTime - TOP_VER_BASE_TIME) / 1000);
 
         last = new GridCacheVersion(0, order.get(), 0, dataCenterId);
 
@@ -289,9 +289,9 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
         long ord = order.incrementAndGet();
 
         GridCacheVersion next = new GridCacheVersion(
-            (int) topVer,
+            (int)topVer,
             ord,
-            (int) nodeOrder,
+            (int)nodeOrder,
             dataCenterId);
 
         last = next;
@@ -310,9 +310,9 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
         long ord = loadOrder.incrementAndGet();
 
         GridCacheVersion next = new GridCacheVersion(
-            (int) topVer,
+            (int)topVer,
             ord,
-            (int) nodeOrder,
+            (int)nodeOrder,
             dataCenterId);
 
         last = next;
@@ -365,7 +365,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
      * Update grid start time.
      */
     public void gridStartTime(long startTime) {
-        offset = (int) ((startTime - TOP_VER_BASE_TIME) / 1000);
+        offset = (int)((startTime - TOP_VER_BASE_TIME) / 1000);
 
         isolatedStreamerVer = new GridCacheVersion(1 + offset, 0, 1, dataCenterId);
     }
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 a04eb1b..fb7bb00 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
@@ -476,7 +476,7 @@ public class BaselineTopology implements Serializable {
 
         for (BaselineNode node : nodes) {
             if (bltConsIds.contains(node.consistentId()))
-                res += (long) node.consistentId().hashCode();
+                res += (long)node.consistentId().hashCode();
         }
 
         return res;
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 16bd67f..f09fdd1 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
@@ -46,7 +46,7 @@ public class BaselineTopologyHistory implements Serializable {
     /** */
     void restoreHistory(ReadOnlyMetastorage metastorage, int lastId) throws IgniteCheckedException {
         for (int i = 0; i < lastId; i++) {
-            BaselineTopologyHistoryItem histItem = (BaselineTopologyHistoryItem) metastorage.read(METASTORE_BLT_HIST_PREFIX + i);
+            BaselineTopologyHistoryItem histItem = (BaselineTopologyHistoryItem)metastorage.read(METASTORE_BLT_HIST_PREFIX + i);
 
             if (histItem != null)
                 hist.add(histItem);
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 6730652..967f8d7 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
@@ -498,7 +498,7 @@ public class GridClusterStateProcessor extends GridProcessorAdapter implements I
 
         ctx.event().addLocalEventListener(
             event -> {
-                DiscoveryEvent discoEvt = (DiscoveryEvent) event;
+                DiscoveryEvent discoEvt = (DiscoveryEvent)event;
 
                 if (discoEvt.eventNode().isClient() || discoEvt.eventNode().isDaemon())
                     return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index 1284c43..1884a35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -532,7 +532,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
         }
         else {
             if (data.hasJoiningNodeData())
-                onDiscoveryDataReceivedV1((DiscoveryData) data.joiningNodeData());
+                onDiscoveryDataReceivedV1((DiscoveryData)data.joiningNodeData());
         }
     }
 
@@ -561,7 +561,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
 
             if (nodeSpecData != null) {
                 for (Map.Entry<UUID, Serializable> e : nodeSpecData.entrySet())
-                    onDiscoveryDataReceivedV1((DiscoveryData) e.getValue());
+                    onDiscoveryDataReceivedV1((DiscoveryData)e.getValue());
             }
         }
     }
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 346a553..62bed72 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
@@ -162,7 +162,7 @@ public abstract class AtomicDataStructureProxy<V extends AtomicDataStructureValu
         }
 
         if (cause instanceof IgniteCheckedException)
-            return U.convertException((IgniteCheckedException) cause);
+            return U.convertException((IgniteCheckedException)cause);
         else if (cause instanceof EntryProcessorException)
             return new IgniteException(cause.getMessage(), cause);
         else {
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 e88fd73..1a8063d 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
@@ -1209,7 +1209,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
 
         CIX1<GridCacheQueueHeader> afterRmv = new CIX1<GridCacheQueueHeader>() {
             @Override public void applyx(GridCacheQueueHeader hdr) throws IgniteCheckedException {
-                hdr = (GridCacheQueueHeader) cctx.cache().withNoRetries().getAndRemove(new GridCacheQueueHeaderKey(name));
+                hdr = (GridCacheQueueHeader)cctx.cache().withNoRetries().getAndRemove(new GridCacheQueueHeaderKey(name));
 
                 if (hdr == null || hdr.empty())
                     return;
@@ -1413,7 +1413,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
                 GridCacheCountDownLatchValue retVal = (val == null ? new GridCacheCountDownLatchValue(cnt, autoDel,
                     ctx.discovery().gridStartTime()) : null);
 
-                GridCacheCountDownLatchValue latchVal = retVal != null ? retVal : (GridCacheCountDownLatchValue) val;
+                GridCacheCountDownLatchValue latchVal = retVal != null ? retVal : (GridCacheCountDownLatchValue)val;
 
                 assert latchVal != null;
 
@@ -1439,7 +1439,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
             @Override public boolean applyx(AtomicDataStructureValue val) throws IgniteCheckedException {
                 assert val != null && val instanceof GridCacheCountDownLatchValue;
 
-                GridCacheCountDownLatchValue latchVal = (GridCacheCountDownLatchValue) val;
+                GridCacheCountDownLatchValue latchVal = (GridCacheCountDownLatchValue)val;
 
                 if (latchVal.get() > 0) {
                     throw new IgniteCheckedException("Failed to remove count down latch " +
@@ -1493,13 +1493,13 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
 
                 //check Cluster state against semaphore state
                 if (val != null && failoverSafe) {
-                    GridCacheSemaphoreState semState = (GridCacheSemaphoreState) val;
+                    GridCacheSemaphoreState semState = (GridCacheSemaphoreState)val;
 
                     boolean updated = false;
 
                     Map<UUID, Integer> waiters = semState.getWaiters();
 
-                    Integer permit = ((GridCacheSemaphoreState) val).getCount();
+                    Integer permit = ((GridCacheSemaphoreState)val).getCount();
 
                     for (UUID nodeId : new HashSet<>(waiters.keySet())) {
 
@@ -1539,7 +1539,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
             @Override public boolean applyx(AtomicDataStructureValue val) throws IgniteCheckedException {
                 assert val != null && val instanceof GridCacheSemaphoreState;
 
-                GridCacheSemaphoreState semVal = (GridCacheSemaphoreState) val;
+                GridCacheSemaphoreState semVal = (GridCacheSemaphoreState)val;
 
                 if (semVal.getCount() < 0)
                     throw new IgniteCheckedException("Failed to remove semaphore with blocked threads. ");
@@ -1605,7 +1605,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
             @Override public boolean applyx(AtomicDataStructureValue val) throws IgniteCheckedException {
                 assert val != null && val instanceof GridCacheLockState;
 
-                GridCacheLockState lockVal = (GridCacheLockState) val;
+                GridCacheLockState lockVal = (GridCacheLockState)val;
 
                 if (lockVal.get() > 0 && !broken)
                     throw new IgniteCheckedException("Failed to remove reentrant lock with blocked threads. ");
@@ -1800,7 +1800,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
 
         CIX1<GridCacheSetHeader> afterRmv = new CIX1<GridCacheSetHeader>() {
             @Override public void applyx(GridCacheSetHeader hdr) throws IgniteCheckedException {
-                hdr = (GridCacheSetHeader) cctx.cache().withNoRetries().getAndRemove(new GridCacheSetHeaderKey(name));
+                hdr = (GridCacheSetHeader)cctx.cache().withNoRetries().getAndRemove(new GridCacheSetHeaderKey(name));
 
                 if (hdr != null)
                     cctx.dataStructures().removeSetData(hdr.id(), hdr.separated());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DistributedCollectionMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DistributedCollectionMetadata.java
index d1e543e..d4e6199 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DistributedCollectionMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DistributedCollectionMetadata.java
@@ -84,7 +84,7 @@ public class DistributedCollectionMetadata extends AtomicDataStructureValue {
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         type = (DataStructureType)in.readObject();
-        cfg = (CollectionConfiguration) in.readObject();
-        cacheName = (String) in.readObject();
+        cfg = (CollectionConfiguration)in.readObject();
+        cacheName = (String)in.readObject();
     }
 }
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 bb8b5e3..6231da6 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
@@ -126,7 +126,7 @@ public class GridMarshallerMappingProcessor extends GridProcessorAdapter {
         if (ctx.clientNode())
             ctx.event().addLocalEventListener(new GridLocalEventListener() {
                 @Override public void onEvent(Event evt) {
-                    DiscoveryEvent evt0 = (DiscoveryEvent) evt;
+                    DiscoveryEvent evt0 = (DiscoveryEvent)evt;
 
                     if (!ctx.isStopping()) {
                         for (ClientRequestFuture fut : clientReqSyncMap.values())
@@ -172,7 +172,7 @@ public class GridMarshallerMappingProcessor extends GridProcessorAdapter {
         @Override public void onMessage(UUID nodeId, Object msg, byte plc) {
             assert msg instanceof MissingMappingRequestMessage : msg;
 
-            MissingMappingRequestMessage msg0 = (MissingMappingRequestMessage) msg;
+            MissingMappingRequestMessage msg0 = (MissingMappingRequestMessage)msg;
 
             byte platformId = msg0.platformId();
             int typeId = msg0.typeId();
@@ -204,7 +204,7 @@ public class GridMarshallerMappingProcessor extends GridProcessorAdapter {
         @Override public void onMessage(UUID nodeId, Object msg, byte plc) {
             assert msg instanceof MissingMappingResponseMessage : msg;
 
-            MissingMappingResponseMessage msg0 = (MissingMappingResponseMessage) msg;
+            MissingMappingResponseMessage msg0 = (MissingMappingResponseMessage)msg;
 
             byte platformId = msg0.platformId();
             int typeId = msg0.typeId();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java
index 0af2bdf..609c537 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java
@@ -80,7 +80,7 @@ public final class MarshallerMappingItem implements Serializable {
         if (!(obj instanceof MarshallerMappingItem))
             return false;
 
-        MarshallerMappingItem that = (MarshallerMappingItem) obj;
+        MarshallerMappingItem that = (MarshallerMappingItem)obj;
 
         return platformId == that.platformId
                 && typeId == that.typeId
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
index c6c4708..1c6157b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
@@ -271,10 +271,10 @@ public class GridMetricManager extends GridManagerAdapter<MetricExporterSpi> imp
 
                     try {
                         metastorage.iterate(HITRATE_CFG_PREFIX, (name, val) -> onHitRateConfigChanged(
-                            name.substring(HITRATE_CFG_PREFIX.length() + 1), (Long) val));
+                            name.substring(HITRATE_CFG_PREFIX.length() + 1), (Long)val));
 
                         metastorage.iterate(HISTOGRAM_CFG_PREFIX, (name, val) -> onHistogramConfigChanged(
-                            name.substring(HISTOGRAM_CFG_PREFIX.length() + 1), (long[]) val));
+                            name.substring(HISTOGRAM_CFG_PREFIX.length() + 1), (long[])val));
                     }
                     catch (IgniteCheckedException e) {
                         throw new IgniteException(e);
@@ -282,11 +282,11 @@ public class GridMetricManager extends GridManagerAdapter<MetricExporterSpi> imp
 
                     metastorage.listen(n -> n.startsWith(HITRATE_CFG_PREFIX),
                         (name, oldVal, newVal) -> onHitRateConfigChanged(
-                            name.substring(HITRATE_CFG_PREFIX.length() + 1), (Long) newVal));
+                            name.substring(HITRATE_CFG_PREFIX.length() + 1), (Long)newVal));
 
                     metastorage.listen(n -> n.startsWith(HISTOGRAM_CFG_PREFIX),
                         (name, oldVal, newVal) -> onHistogramConfigChanged(
-                            name.substring(HISTOGRAM_CFG_PREFIX.length() + 1), (long[]) newVal));
+                            name.substring(HISTOGRAM_CFG_PREFIX.length() + 1), (long[])newVal));
                 }
 
                 /** {@inheritDoc} */
@@ -523,7 +523,7 @@ public class GridMetricManager extends GridManagerAdapter<MetricExporterSpi> imp
             return null;
         }
 
-        return (T) m;
+        return (T)m;
     }
 
     /**
@@ -568,7 +568,7 @@ public class GridMetricManager extends GridManagerAdapter<MetricExporterSpi> imp
      */
     private long totalSysMemory() {
         try {
-            com.sun.management.OperatingSystemMXBean sunOs = (com.sun.management.OperatingSystemMXBean) os;
+            com.sun.management.OperatingSystemMXBean sunOs = (com.sun.management.OperatingSystemMXBean)os;
 
             return sunOs.getTotalPhysicalMemorySize();
         }
@@ -629,7 +629,7 @@ public class GridMetricManager extends GridManagerAdapter<MetricExporterSpi> imp
             long cpuTime;
 
             try {
-                com.sun.management.OperatingSystemMXBean sunOs = (com.sun.management.OperatingSystemMXBean) os;
+                com.sun.management.OperatingSystemMXBean sunOs = (com.sun.management.OperatingSystemMXBean)os;
 
                 cpuTime = sunOs.getProcessCpuTime();
             }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
index 45b4146..9c09939 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
@@ -69,7 +69,7 @@ public class ClientMessage implements Message, Externalizable {
 
         if (cnt < 0) {
             for (; cnt < 0 && buf.hasRemaining(); cnt++)
-                buf.put((byte) ((msgSize >> (8 * (4 + cnt))) & 0xFF));
+                buf.put((byte)((msgSize >> (8 * (4 + cnt))) & 0xFF));
 
             if (cnt < 0)
                 return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultWithIo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultWithIo.java
index 5a8c6f1..b8b0c05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultWithIo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultWithIo.java
@@ -43,7 +43,7 @@ public final class JdbcResultWithIo {
      * @return Response.
      */
     public <R extends JdbcResult> R response() {
-        return (R) res;
+        return (R)res;
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java
index 58ae98f..62212ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java
@@ -109,7 +109,7 @@ public class OdbcColumnMeta {
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (o instanceof OdbcColumnMeta) {
-            OdbcColumnMeta other = (OdbcColumnMeta) o;
+            OdbcColumnMeta other = (OdbcColumnMeta)o;
 
             return this == other || schemaName.equals(other.schemaName) && tableName.equals(other.tableName) &&
                 columnName.equals(other.columnName) && dataType.equals(other.dataType) &&
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
index 2d0d2d4..7717114 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
@@ -265,7 +265,7 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
 
         // Writing status.
         if (ver.compareTo(OdbcConnectionContext.VER_2_1_5) < 0) {
-            writer.writeByte((byte) (msg.status() == ClientListenerResponse.STATUS_SUCCESS ?
+            writer.writeByte((byte)(msg.status() == ClientListenerResponse.STATUS_SUCCESS ?
                 ClientListenerResponse.STATUS_SUCCESS : ClientListenerResponse.STATUS_FAILED));
         } else
             writer.writeInt(msg.status());
@@ -281,7 +281,7 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
         if (res0 == null)
             return new ClientMessage(writer.array());
         else if (res0 instanceof OdbcQueryExecuteResult) {
-            OdbcQueryExecuteResult res = (OdbcQueryExecuteResult) res0;
+            OdbcQueryExecuteResult res = (OdbcQueryExecuteResult)res0;
 
             if (log.isDebugEnabled())
                 log.debug("Resulting query ID: " + res.queryId());
@@ -295,7 +295,7 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
             writeAffectedRows(writer, res.affectedRows());
         }
         else if (res0 instanceof OdbcQueryExecuteBatchResult) {
-            OdbcQueryExecuteBatchResult res = (OdbcQueryExecuteBatchResult) res0;
+            OdbcQueryExecuteBatchResult res = (OdbcQueryExecuteBatchResult)res0;
 
             writer.writeBoolean(res.errorMessage() == null);
             writeAffectedRows(writer, res.affectedRows());
@@ -309,14 +309,14 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
             }
         }
         else if (res0 instanceof OdbcStreamingBatchResult) {
-            OdbcStreamingBatchResult res = (OdbcStreamingBatchResult) res0;
+            OdbcStreamingBatchResult res = (OdbcStreamingBatchResult)res0;
 
             writer.writeString(res.error());
             writer.writeInt(res.status());
             writer.writeLong(res.order());
         }
         else if (res0 instanceof OdbcQueryFetchResult) {
-            OdbcQueryFetchResult res = (OdbcQueryFetchResult) res0;
+            OdbcQueryFetchResult res = (OdbcQueryFetchResult)res0;
 
             if (log.isDebugEnabled())
                 log.debug("Resulting query ID: " + res.queryId());
@@ -343,7 +343,7 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
             }
         }
         else if (res0 instanceof OdbcQueryMoreResultsResult) {
-            OdbcQueryMoreResultsResult res = (OdbcQueryMoreResultsResult) res0;
+            OdbcQueryMoreResultsResult res = (OdbcQueryMoreResultsResult)res0;
 
             if (log.isDebugEnabled())
                 log.debug("Resulting query ID: " + res.queryId());
@@ -370,7 +370,7 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
             }
         }
         else if (res0 instanceof OdbcQueryCloseResult) {
-            OdbcQueryCloseResult res = (OdbcQueryCloseResult) res0;
+            OdbcQueryCloseResult res = (OdbcQueryCloseResult)res0;
 
             if (log.isDebugEnabled())
                 log.debug("Resulting query ID: " + res.getQueryId());
@@ -378,14 +378,14 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
             writer.writeLong(res.getQueryId());
         }
         else if (res0 instanceof OdbcQueryGetColumnsMetaResult) {
-            OdbcQueryGetColumnsMetaResult res = (OdbcQueryGetColumnsMetaResult) res0;
+            OdbcQueryGetColumnsMetaResult res = (OdbcQueryGetColumnsMetaResult)res0;
 
             Collection<OdbcColumnMeta> columnsMeta = res.meta();
 
             writeResultsetMeta(writer, columnsMeta);
         }
         else if (res0 instanceof OdbcQueryGetTablesMetaResult) {
-            OdbcQueryGetTablesMetaResult res = (OdbcQueryGetTablesMetaResult) res0;
+            OdbcQueryGetTablesMetaResult res = (OdbcQueryGetTablesMetaResult)res0;
 
             Collection<OdbcTableMeta> tablesMeta = res.meta();
 
@@ -397,14 +397,14 @@ public class OdbcMessageParser implements ClientListenerMessageParser {
                 tableMeta.writeBinary(writer);
         }
         else if (res0 instanceof OdbcQueryGetParamsMetaResult) {
-            OdbcQueryGetParamsMetaResult res = (OdbcQueryGetParamsMetaResult) res0;
+            OdbcQueryGetParamsMetaResult res = (OdbcQueryGetParamsMetaResult)res0;
 
             byte[] typeIds = res.typeIds();
 
             SqlListenerUtils.writeObject(writer, typeIds, true);
         }
         else if (res0 instanceof OdbcQueryGetResultsetMetaResult) {
-            OdbcQueryGetResultsetMetaResult res = (OdbcQueryGetResultsetMetaResult) res0;
+            OdbcQueryGetResultsetMetaResult res = (OdbcQueryGetResultsetMetaResult)res0;
 
             writeResultsetMeta(writer, res.columnsMetadata());
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcTableMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcTableMeta.java
index 7770472..b7aead4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcTableMeta.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcTableMeta.java
@@ -63,7 +63,7 @@ public class OdbcTableMeta {
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (o instanceof OdbcTableMeta) {
-            OdbcTableMeta other = (OdbcTableMeta) o;
+            OdbcTableMeta other = (OdbcTableMeta)o;
 
             return this == other ||
                     Objects.equals(catalog, other.catalog) && Objects.equals(schema, other.schema) &&
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
index 4bdad60..e25df1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
@@ -218,7 +218,7 @@ public class OdbcUtils {
             List<?> res = iter.next();
 
             if (!res.isEmpty()) {
-                Long affected = (Long) res.get(0);
+                Long affected = (Long)res.get(0);
 
                 if (affected != null)
                     return affected;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
index 98bbfad..d8c8d21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
@@ -377,7 +377,7 @@ public class PlatformContextImpl implements PlatformContext, PartitionsExchangeA
         else {
             writer.writeBoolean(true);
 
-            BinaryMetadata meta0 = ((BinaryTypeImpl) meta).metadata();
+            BinaryMetadata meta0 = ((BinaryTypeImpl)meta).metadata();
 
             PlatformUtils.writeBinaryMetadata(writer, meta0, includeSchemas);
         }
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 4ebc8fa..6ce5e36 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
@@ -473,7 +473,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
     @Override public long processInLongOutLong(int type, long val) throws IgniteCheckedException {
         switch (type) {
             case OP_LOGGER_IS_LEVEL_ENABLED: {
-                return loggerIsLevelEnabled((int) val) ? TRUE : FALSE;
+                return loggerIsLevelEnabled((int)val) ? TRUE : FALSE;
             }
 
             case OP_RELEASE_START: {
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 f6a1ed6..c8326f8 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
@@ -1382,7 +1382,7 @@ public class PlatformCache extends PlatformAbstractTarget {
     private PlatformQueryCursor runQuery(Query qry) throws IgniteCheckedException {
 
         try {
-            QueryCursorEx cursor = (QueryCursorEx) cache.query(qry);
+            QueryCursorEx cursor = (QueryCursorEx)cache.query(qry);
 
             return new PlatformQueryCursor(platformCtx, cursor,
                 qry.getPageSize() > 0 ? qry.getPageSize() : Query.DFLT_PAGE_SIZE);
@@ -1402,7 +1402,7 @@ public class PlatformCache extends PlatformAbstractTarget {
     private PlatformFieldsQueryCursor runFieldsQuery(Query qry)
         throws IgniteCheckedException {
         try {
-            QueryCursorEx cursor = (QueryCursorEx) cache.query(qry);
+            QueryCursorEx cursor = (QueryCursorEx)cache.query(qry);
 
             return new PlatformFieldsQueryCursor(platformCtx, cursor,
                 qry.getPageSize() > 0 ? qry.getPageSize() : Query.DFLT_PAGE_SIZE);
@@ -1727,7 +1727,7 @@ public class PlatformCache extends PlatformAbstractTarget {
         @Override public void write(BinaryRawWriterEx writer, Object obj, Throwable err) {
             assert obj instanceof Map;
 
-            PlatformUtils.writeNullableMap(writer, (Map) obj);
+            PlatformUtils.writeNullableMap(writer, (Map)obj);
         }
 
         /** <inheritDoc /> */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientNotification.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientNotification.java
index 8539fc6..26658c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientNotification.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientNotification.java
@@ -81,7 +81,7 @@ public class ClientNotification extends ClientListenerResponse implements Client
     @Override public void encode(ClientConnectionContext ctx, BinaryRawWriterEx writer) {
         writer.writeLong(rsrcId);
 
-        short flags = (short) (ClientFlag.NOTIFICATION | (status() == ClientStatus.SUCCESS ? 0 : ClientFlag.ERROR));
+        short flags = (short)(ClientFlag.NOTIFICATION | (status() == ClientStatus.SUCCESS ? 0 : ClientFlag.ERROR));
 
         writer.writeShort(flags);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
index 4eaf887..7510dfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
@@ -170,17 +170,17 @@ public class ClientRequestHandler implements ClientListenerRequestHandler {
      */
     private int getStatus(Throwable e) {
         if (e instanceof IgniteClientException)
-            return ((IgniteClientException) e).statusCode();
+            return ((IgniteClientException)e).statusCode();
 
         if (e instanceof IgniteIllegalStateException) {
-            IgniteIllegalStateException ex = (IgniteIllegalStateException) e;
+            IgniteIllegalStateException ex = (IgniteIllegalStateException)e;
 
             if (ex.getMessage().startsWith("Grid is in invalid state"))
                 return ClientStatus.INVALID_NODE_STATE;
         }
 
         if (e instanceof IllegalStateException) {
-            IllegalStateException ex = (IllegalStateException) e;
+            IllegalStateException ex = (IllegalStateException)e;
 
             if (ex.getMessage().contains("grid is stopping"))
                 return ClientStatus.INVALID_NODE_STATE;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResourceRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResourceRegistry.java
index faa0e7f..edb2d4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResourceRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResourceRegistry.java
@@ -61,7 +61,7 @@ public class ClientResourceRegistry {
                 "Failed to find resource with id: " + hnd
             );
 
-        return (T) obj;
+        return (T)obj;
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypePutRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypePutRequest.java
index e02272f..cc4b019 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypePutRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypePutRequest.java
@@ -46,7 +46,7 @@ public class ClientBinaryTypePutRequest extends ClientRequest {
 
     /** {@inheritDoc} */
     @Override public ClientResponse process(ClientConnectionContext ctx) {
-        BinaryContext binCtx = ((CacheObjectBinaryProcessorImpl) ctx.kernalContext().cacheObjects()).binaryContext();
+        BinaryContext binCtx = ((CacheObjectBinaryProcessorImpl)ctx.kernalContext().cacheObjects()).binaryContext();
 
         binCtx.updateMetadata(meta.typeId(), meta, false);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheConfigurationSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheConfigurationSerializer.java
index 5f4d659..2ea2a70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheConfigurationSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheConfigurationSerializer.java
@@ -359,7 +359,7 @@ public class ClientCacheConfigurationSerializer {
                     break;
 
                 case PARTITION_LOSS_POLICY:
-                    cfg.setPartitionLossPolicy(PartitionLossPolicy.fromOrdinal((byte) reader.readInt()));
+                    cfg.setPartitionLossPolicy(PartitionLossPolicy.fromOrdinal((byte)reader.readInt()));
                     break;
 
                 case QUERY_DETAIL_METRICS_SIZE:
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheEntryEventNotification.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheEntryEventNotification.java
index 4f2db8b..084689c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheEntryEventNotification.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheEntryEventNotification.java
@@ -57,19 +57,19 @@ public class ClientCacheEntryEventNotification extends ClientNotification {
 
             switch (evt.getEventType()) {
                 case CREATED:
-                    writer.writeByte((byte) 0);
+                    writer.writeByte((byte)0);
                     break;
 
                 case UPDATED:
-                    writer.writeByte((byte) 1);
+                    writer.writeByte((byte)1);
                     break;
 
                 case REMOVED:
-                    writer.writeByte((byte) 2);
+                    writer.writeByte((byte)2);
                     break;
 
                 case EXPIRED:
-                    writer.writeByte((byte) 3);
+                    writer.writeByte((byte)3);
                     break;
 
                 default:
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetConfigurationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetConfigurationRequest.java
index d28c78e..8ce666a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetConfigurationRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetConfigurationRequest.java
@@ -46,7 +46,7 @@ public class ClientCacheGetConfigurationRequest extends ClientCacheRequest {
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public ClientResponse process(ClientConnectionContext ctx) {
-        CacheConfiguration cfg = ((IgniteCache<Object, Object>) rawCache(ctx))
+        CacheConfiguration cfg = ((IgniteCache<Object, Object>)rawCache(ctx))
                 .getConfiguration(CacheConfiguration.class);
 
         return new ClientCacheGetConfigurationResponse(requestId(), cfg, protocolCtx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java
index 5075ca7..fda6a54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheQueryContinuousRequest.java
@@ -113,7 +113,7 @@ public class ClientCacheQueryContinuousRequest extends ClientCacheRequest {
             throw new IgniteClientException(ClientStatus.FAILED,
                     "Filter must be a BinaryObject: " + filter.getClass());
 
-        BinaryObjectImpl bo = (BinaryObjectImpl) filter;
+        BinaryObjectImpl bo = (BinaryObjectImpl)filter;
 
         switch (filterPlatform) {
             case ClientPlatform.JAVA: {
@@ -121,7 +121,7 @@ public class ClientCacheQueryContinuousRequest extends ClientCacheRequest {
                     PlatformJavaObjectFactoryProxy prx = bo.deserialize();
 
                     CacheEntryEventSerializableFilter rmtFilter =
-                            (CacheEntryEventSerializableFilter) prx.factory(ctx.kernalContext()).create();
+                            (CacheEntryEventSerializableFilter)prx.factory(ctx.kernalContext()).create();
 
                     return FactoryBuilder.factoryOf(rmtFilter);
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java
index ed0cb79..df5de45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlFieldsQueryRequest.java
@@ -77,7 +77,7 @@ public class ClientCacheSqlFieldsQueryRequest extends ClientCacheDataRequest imp
         boolean enforceJoinOrder = reader.readBoolean();
         boolean collocated = reader.readBoolean();
         boolean lazy = reader.readBoolean();
-        int timeout = (int) reader.readLong();
+        int timeout = (int)reader.readLong();
         includeFieldNames = reader.readBoolean();
 
         SqlFieldsQuery qry = stmtType == JdbcStatementType.ANY_STATEMENT_TYPE
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlQueryRequest.java
index 5002d1d..29b0de8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheSqlQueryRequest.java
@@ -49,7 +49,7 @@ public class ClientCacheSqlQueryRequest extends ClientCacheDataRequest implement
                 .setLocal(reader.readBoolean())
                 .setReplicatedOnly(reader.readBoolean())
                 .setPageSize(reader.readInt())
-                .setTimeout((int) reader.readLong(), TimeUnit.MILLISECONDS);
+                .setTimeout((int)reader.readLong(), TimeUnit.MILLISECONDS);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesEndpointsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesEndpointsResponse.java
index eaf4f9e..5e8214f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesEndpointsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cluster/ClientClusterGroupGetNodesEndpointsResponse.java
@@ -128,7 +128,7 @@ public class ClientClusterGroupGetNodesEndpointsResponse extends ClientResponse
             return false; // No client connector.
 
         writeUuid(writer, node.id());
-        writer.writeInt((int) port);
+        writer.writeInt((int)port);
 
         Collection<String> addrs = node.addresses();
         Collection<String> hosts = node.hostNames();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java
index 9f4fc62..ee01a1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java
@@ -84,7 +84,7 @@ public class ClientExecuteTaskRequest extends ClientRequest {
             // Deserialize as part of process() call - not in constructor - for proper error handling.
             // Failure to deserialize binary object should not be treated as a failure to decode request.
             if ((flags & ClientComputeTask.KEEP_BINARY_FLAG_MASK) == 0 && arg instanceof BinaryObject)
-                arg0 = ((BinaryObject) arg).deserialize();
+                arg0 = ((BinaryObject)arg).deserialize();
 
             task.execute(taskId, taskName, arg0, nodeIds, flags, timeout);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/streamer/ClientDataStreamerReader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/streamer/ClientDataStreamerReader.java
index 8acc992..25bdae2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/streamer/ClientDataStreamerReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/streamer/ClientDataStreamerReader.java
@@ -67,7 +67,7 @@ class ClientDataStreamerReader {
             return null;
 
         if (obj instanceof CacheObject)
-            return (T) obj;
+            return (T)obj;
 
         int pos1 = in.position();
 
@@ -75,6 +75,6 @@ class ClientDataStreamerReader {
 
         byte[] objBytes = in.readByteArray(pos1 - pos0);
 
-        return isKey ? (T) new KeyCacheObjectImpl(obj, objBytes, -1) : (T) new CacheObjectImpl(obj, objBytes);
+        return isKey ? (T)new KeyCacheObjectImpl(obj, objBytes, -1) : (T)new CacheObjectImpl(obj, objBytes);
     }
 }
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 532fd8c..10457a6 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
@@ -415,7 +415,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
 
                 ClusterNode node = prj.node(nodeId);
 
-                return new PlatformClusterGroup(platformCtx, (ClusterGroupEx) prj.forHost(node));
+                return new PlatformClusterGroup(platformCtx, (ClusterGroupEx)prj.forHost(node));
             }
 
             default:
@@ -429,7 +429,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
             throws IgniteCheckedException {
         switch (type) {
             case OP_FOR_OTHERS: {
-                PlatformClusterGroup exclude = (PlatformClusterGroup) arg;
+                PlatformClusterGroup exclude = (PlatformClusterGroup)arg;
 
                 assert exclude != null;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java
index 0b70c28..8bfdab0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java
@@ -103,7 +103,7 @@ public abstract class PlatformAbstractTask implements ComputeTask<Object, Void>
                 }
             }
 
-            ComputeJobResultPolicy plc0 = ComputeJobResultPolicy.fromOrdinal((byte) plc);
+            ComputeJobResultPolicy plc0 = ComputeJobResultPolicy.fromOrdinal((byte)plc);
 
             assert plc0 != null : plc;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
index 089ec4b..aa73c0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
@@ -149,7 +149,7 @@ public class PlatformCompute extends PlatformAbstractTarget {
             }
 
             case OP_EXEC_ASYNC:
-                return wrapListenable((PlatformListenable) executeJavaTask(reader, true));
+                return wrapListenable((PlatformListenable)executeJavaTask(reader, true));
 
             case OP_WITH_EXECUTOR: {
                 String executorName = reader.readString();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
index f5cf9a2..fe6a59e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
@@ -189,12 +189,12 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
                 return TRUE;
 
             case OP_SET_PER_NODE_BUFFER_SIZE:
-                ldr.perNodeBufferSize((int) val);
+                ldr.perNodeBufferSize((int)val);
 
                 return TRUE;
             
             case OP_SET_PER_THREAD_BUFFER_SIZE:
-                ldr.perThreadBufferSize((int) val);
+                ldr.perThreadBufferSize((int)val);
 
                 return TRUE;
 
@@ -204,7 +204,7 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
                 return TRUE;
 
             case OP_SET_PER_NODE_PARALLEL_OPS:
-                ldr.perNodeParallelOperations((int) val);
+                ldr.perNodeParallelOperations((int)val);
 
                 return TRUE;
 
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 b73bfc2..99a0d93 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
@@ -215,7 +215,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
                     int cnt = reader.readInt();
 
                     for (int i = 0; i < cnt; i++)
-                        loaded.put((K) reader.readObjectDetached(), (V) reader.readObjectDetached());
+                        loaded.put((K)reader.readObjectDetached(), (V)reader.readObjectDetached());
                 }
             });
 
@@ -241,7 +241,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
                     int cnt = reader.readInt();
 
                     for (int i = 0; i < cnt; i++)
-                        clo.apply((K) reader.readObjectDetached(), (V) reader.readObjectDetached());
+                        clo.apply((K)reader.readObjectDetached(), (V)reader.readObjectDetached());
                 }
             });
         }
@@ -344,7 +344,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
                     // they share a single session, but sessionEnd is called on each store.
                     // Same thing happens on platform side: session is shared; each store must be notified,
                     // then session should be closed.
-                    Collection<Long> stores = (Collection<Long>) ses.properties().get(KEY_SES_STORES);
+                    Collection<Long> stores = (Collection<Long>)ses.properties().get(KEY_SES_STORES);
                     assert stores != null;
 
                     stores.remove(ptr);
@@ -442,7 +442,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
         }
 
         // Keep track of all stores that use current session (cross-cache tx uses single session for all caches).
-        Collection<Long> stores = (Collection<Long>) ses.properties().get(KEY_SES_STORES);
+        Collection<Long> stores = (Collection<Long>)ses.properties().get(KEY_SES_STORES);
 
         if (stores == null) {
             stores = new HashSet<>();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConsoleStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConsoleStream.java
index 1060843..609e56f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConsoleStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConsoleStream.java
@@ -46,7 +46,7 @@ public class PlatformDotNetConsoleStream extends OutputStream {
 
     /** {@inheritDoc} */
     @Override public void write(int b) throws IOException {
-        String s = String.valueOf((char) b);
+        String s = String.valueOf((char)b);
 
         PlatformCallbackGateway.consoleWrite(s, isErr);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
index 1a40cd0..5c463bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
@@ -253,7 +253,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
 
         int[] eventTypes = readEventTypes(reader);
 
-        return (EventAdapter) events.waitForLocal(filter, eventTypes);
+        return (EventAdapter)events.waitForLocal(filter, eventTypes);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformLocalEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformLocalEventListener.java
index 56a19cf..f070704 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformLocalEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformLocalEventListener.java
@@ -78,7 +78,7 @@ public class PlatformLocalEventListener implements IgnitePredicate<Event> {
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
-        return this == o || o != null && getClass() == o.getClass() && id == ((PlatformLocalEventListener) o).id;
+        return this == o || o != null && getClass() == o.getClass() && id == ((PlatformLocalEventListener)o).id;
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java
index a9a8d51..3f5e1d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java
@@ -61,7 +61,7 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
 
     /** {@inheritDoc} */
     @Override public void writeBoolean(boolean val) {
-        writeByte(val ? (byte) 1 : (byte) 0);
+        writeByte(val ? (byte)1 : (byte)0);
     }
 
     /** {@inheritDoc} */
@@ -234,7 +234,7 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
 
     /** {@inheritDoc} */
     @Override public void unsafeWriteBoolean(boolean val) {
-        unsafeWriteByte(val ? (byte) 1 : (byte) 0);
+        unsafeWriteByte(val ? (byte)1 : (byte)0);
     }
 
     /** {@inheritDoc} */
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 864075c..e32342d 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
@@ -207,7 +207,7 @@ public class PlatformServices extends PlatformAbstractTarget {
                 PlatformUtils.writeNullableCollection(writer, svcs,
                     new PlatformWriterClosure<Service>() {
                         @Override public void write(BinaryRawWriterEx writer, Service svc) {
-                            writer.writeLong(((PlatformService) svc).pointer());
+                            writer.writeLong(((PlatformService)svc).pointer());
                         }
                     },
                     new IgnitePredicate<Service>() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index 9ac69d32..87d8614 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -386,7 +386,7 @@ public class PlatformConfigurationUtils {
 
         out.writeBoolean(true);
 
-        Map<String, Object> attrs = ((AttributeNodeFilter) nodeFilter).getAttrs();
+        Map<String, Object> attrs = ((AttributeNodeFilter)nodeFilter).getAttrs();
 
         out.writeInt(attrs.size());
 
@@ -502,24 +502,24 @@ public class PlatformConfigurationUtils {
             f = ((PlatformDotNetAffinityFunction)f).getFunc();
 
         if (f instanceof RendezvousAffinityFunction) {
-            out.writeByte((byte) 2);
+            out.writeByte((byte)2);
 
-            RendezvousAffinityFunction f0 = (RendezvousAffinityFunction) f;
+            RendezvousAffinityFunction f0 = (RendezvousAffinityFunction)f;
             out.writeInt(f0.getPartitions());
             out.writeBoolean(f0.isExcludeNeighbors());
-            out.writeByte((byte) 0);  // override flags
+            out.writeByte((byte)0);  // override flags
             out.writeObject(null);  // user func
 
             writeAffinityBackupFilter(out, f0.getAffinityBackupFilter());
         }
         else if (f instanceof PlatformAffinityFunction) {
-            PlatformAffinityFunction f0 = (PlatformAffinityFunction) f;
+            PlatformAffinityFunction f0 = (PlatformAffinityFunction)f;
             AffinityFunction baseFunc = f0.getBaseFunc();
 
             if (baseFunc instanceof RendezvousAffinityFunction) {
-                RendezvousAffinityFunction rendezvous = (RendezvousAffinityFunction) baseFunc;
+                RendezvousAffinityFunction rendezvous = (RendezvousAffinityFunction)baseFunc;
 
-                out.writeByte((byte) 2);
+                out.writeByte((byte)2);
                 out.writeInt(f0.partitions());
                 out.writeBoolean(rendezvous.isExcludeNeighbors());
                 out.writeByte(f0.getOverrideFlags());
@@ -528,7 +528,7 @@ public class PlatformConfigurationUtils {
                 writeAffinityBackupFilter(out, rendezvous.getAffinityBackupFilter());
             }
             else {
-                out.writeByte((byte) 3);
+                out.writeByte((byte)3);
                 out.writeInt(f0.partitions());
                 out.writeBoolean(false);  // exclude neighbors
                 out.writeByte(f0.getOverrideFlags());
@@ -547,7 +547,7 @@ public class PlatformConfigurationUtils {
      */
     private static void writeAffinityBackupFilter(BinaryRawWriter out, Object filter) {
         if (filter instanceof ClusterNodeAttributeAffinityBackupFilter) {
-            ClusterNodeAttributeAffinityBackupFilter backupFilter = (ClusterNodeAttributeAffinityBackupFilter) filter;
+            ClusterNodeAttributeAffinityBackupFilter backupFilter = (ClusterNodeAttributeAffinityBackupFilter)filter;
 
             String[] attrs = backupFilter.getAttributeNames();
             out.writeInt(attrs.length);
@@ -781,7 +781,7 @@ public class PlatformConfigurationUtils {
         Object consId = in.readObjectDetached();
 
         if (consId instanceof Serializable) {
-            cfg.setConsistentId((Serializable) consId);
+            cfg.setConsistentId((Serializable)consId);
         } else if (consId != null) {
             throw new IgniteException("IgniteConfiguration.ConsistentId should be Serializable.");
         }
@@ -1216,7 +1216,7 @@ public class PlatformConfigurationUtils {
             for (CachePluginConfiguration cfg : plugins) {
                 if (cfg instanceof PlatformCachePluginConfiguration) {
                     writer.writeBoolean(false);  // Pure platform plugin.
-                    writer.writeObject(((PlatformCachePluginConfiguration) cfg).nativeCfg());
+                    writer.writeObject(((PlatformCachePluginConfiguration)cfg).nativeCfg());
                 }
             }
         }
@@ -1424,7 +1424,7 @@ public class PlatformConfigurationUtils {
 
         if (comm instanceof TcpCommunicationSpi) {
             w.writeBoolean(true);
-            TcpCommunicationSpi tcp = (TcpCommunicationSpi) comm;
+            TcpCommunicationSpi tcp = (TcpCommunicationSpi)comm;
 
             w.writeInt(tcp.getAckSendThreshold());
             w.writeInt(tcp.getConnectionsPerNode());
@@ -1509,11 +1509,11 @@ public class PlatformConfigurationUtils {
         EventStorageSpi evtStorageSpi = cfg.getEventStorageSpi();
 
         if (evtStorageSpi == null)
-            w.writeByte((byte) 0);
+            w.writeByte((byte)0);
         else if (evtStorageSpi instanceof NoopEventStorageSpi)
-            w.writeByte((byte) 1);
+            w.writeByte((byte)1);
         else if (evtStorageSpi instanceof MemoryEventStorageSpi) {
-            w.writeByte((byte) 2);
+            w.writeByte((byte)2);
 
             w.writeLong(((MemoryEventStorageSpi)evtStorageSpi).getExpireCount());
             w.writeLong(((MemoryEventStorageSpi)evtStorageSpi).getExpireAgeMs());
@@ -1538,17 +1538,17 @@ public class PlatformConfigurationUtils {
         if (failureHnd instanceof NoOpFailureHandler) {
             w.writeBoolean(true);
 
-            w.writeByte((byte) 0);
+            w.writeByte((byte)0);
         }
         else if (failureHnd instanceof StopNodeFailureHandler) {
             w.writeBoolean(true);
 
-            w.writeByte((byte) 1);
+            w.writeByte((byte)1);
         }
         else if (failureHnd instanceof StopNodeOrHaltFailureHandler) {
             w.writeBoolean(true);
 
-            w.writeByte((byte) 2);
+            w.writeByte((byte)2);
 
             w.writeBoolean(((StopNodeOrHaltFailureHandler)failureHnd).tryStop());
 
@@ -1610,7 +1610,7 @@ public class PlatformConfigurationUtils {
                 w.writeString(a.toString());
 
             if (isMcast) {
-                TcpDiscoveryMulticastIpFinder multiFinder = (TcpDiscoveryMulticastIpFinder) finder;
+                TcpDiscoveryMulticastIpFinder multiFinder = (TcpDiscoveryMulticastIpFinder)finder;
 
                 w.writeString(multiFinder.getLocalAddress());
                 w.writeString(multiFinder.getMulticastGroup());
@@ -2010,7 +2010,7 @@ public class PlatformConfigurationUtils {
                 .setCheckpointingFrequency(in.readLong())
                 .setCheckpointingPageBufferSize(in.readLong())
                 .setCheckpointingThreads(in.readInt())
-                .setLockWaitTime((int) in.readLong())
+                .setLockWaitTime((int)in.readLong())
                 .setWalHistorySize(in.readInt())
                 .setWalSegments(in.readInt())
                 .setWalSegmentSize(in.readInt())
@@ -2018,7 +2018,7 @@ public class PlatformConfigurationUtils {
                 .setWalArchivePath(in.readString())
                 .setWalMode(WALMode.fromOrdinal(in.readInt()))
                 .setWalBufferSize(in.readInt())
-                .setWalFlushFrequency((int) in.readLong())
+                .setWalFlushFrequency((int)in.readLong())
                 .setWalFsyncDelayNanos(in.readLong())
                 .setWalRecordIteratorBufferSize(in.readInt())
                 .setAlwaysWriteFullPages(in.readBoolean())
@@ -2040,7 +2040,7 @@ public class PlatformConfigurationUtils {
                 .setStoragePath(in.readString())
                 .setCheckpointFrequency(in.readLong())
                 .setCheckpointThreads(in.readInt())
-                .setLockWaitTime((int) in.readLong())
+                .setLockWaitTime((int)in.readLong())
                 .setWalHistorySize(in.readInt())
                 .setWalSegments(in.readInt())
                 .setWalSegmentSize(in.readInt())
@@ -2048,7 +2048,7 @@ public class PlatformConfigurationUtils {
                 .setWalArchivePath(in.readString())
                 .setWalMode(WALMode.fromOrdinal(in.readInt()))
                 .setWalThreadLocalBufferSize(in.readInt())
-                .setWalFlushFrequency((int) in.readLong())
+                .setWalFlushFrequency((int)in.readLong())
                 .setWalFsyncDelayNanos(in.readLong())
                 .setWalRecordIteratorBufferSize(in.readInt())
                 .setAlwaysWriteFullPages(in.readBoolean())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java
index 437c405..dabb04c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformFutureUtils.java
@@ -225,37 +225,37 @@ public class PlatformFutureUtils {
                     else {
                         switch (typ) {
                             case TYP_BYTE:
-                                gate.futureByteResult(futPtr, (byte) res);
+                                gate.futureByteResult(futPtr, (byte)res);
 
                                 break;
 
                             case TYP_BOOL:
-                                gate.futureBoolResult(futPtr, (boolean) res ? 1 : 0);
+                                gate.futureBoolResult(futPtr, (boolean)res ? 1 : 0);
 
                                 break;
 
                             case TYP_SHORT:
-                                gate.futureShortResult(futPtr, (short) res);
+                                gate.futureShortResult(futPtr, (short)res);
 
                                 break;
 
                             case TYP_CHAR:
-                                gate.futureCharResult(futPtr, (char) res);
+                                gate.futureCharResult(futPtr, (char)res);
 
                                 break;
 
                             case TYP_INT:
-                                gate.futureIntResult(futPtr, (int) res);
+                                gate.futureIntResult(futPtr, (int)res);
 
                                 break;
 
                             case TYP_FLOAT:
-                                gate.futureFloatResult(futPtr, Float.floatToIntBits((float) res));
+                                gate.futureFloatResult(futPtr, Float.floatToIntBits((float)res));
 
                                 break;
 
                             case TYP_LONG:
-                                gate.futureLongResult(futPtr, (long) res);
+                                gate.futureLongResult(futPtr, (long)res);
 
                                 break;
 
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 a97934f..542b67d 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,10 +623,10 @@ public class PlatformUtils {
      */
     private static void writeEventType(BinaryRawWriterEx writer, EventType evtType) {
         switch (evtType) {
-            case CREATED: writer.writeByte((byte) 0); break;
-            case UPDATED: writer.writeByte((byte) 1); break;
-            case REMOVED: writer.writeByte((byte) 2); break;
-            case EXPIRED: writer.writeByte((byte) 3); break;
+            case CREATED: writer.writeByte((byte)0); break;
+            case UPDATED: writer.writeByte((byte)1); break;
+            case REMOVED: writer.writeByte((byte)2); break;
+            case EXPIRED: writer.writeByte((byte)3); break;
             default:
                 throw new IllegalArgumentException("Unknown event type: " + evtType);
         }
@@ -717,7 +717,7 @@ public class PlatformUtils {
      * @return Platform processor.
      */
     public static PlatformProcessor platformProcessor(Ignite grid) {
-        GridKernalContext ctx = ((IgniteKernal) grid).context();
+        GridKernalContext ctx = ((IgniteKernal)grid).context();
 
         return ctx.platform();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index b2550f2..6a8fbf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -194,7 +194,7 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
     /** {@inheritDoc} */
     @Override public void onJoiningNodeDataReceived(JoiningNodeDiscoveryData data) {
         if (data.hasJoiningNodeData()) {
-            Map<String, Serializable> pluginsData = (Map<String, Serializable>) data.joiningNodeData();
+            Map<String, Serializable> pluginsData = (Map<String, Serializable>)data.joiningNodeData();
 
             applyPluginsData(data.joiningNodeId(), pluginsData);
         }
@@ -209,7 +209,7 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
 
             for (Serializable v : nodeSpecificData.values()) {
                 if (v != null) {
-                    Map<String, Serializable> pluginsData = (Map<String, Serializable>) v;
+                    Map<String, Serializable> pluginsData = (Map<String, Serializable>)v;
 
                     applyPluginsData(joiningNodeId, pluginsData);
                 }
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 5ada406..461a559 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
@@ -593,7 +593,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                     assert F.eq(cacheDesc.deploymentId(), msg.deploymentId());
 
                     if (msg.operation() instanceof SchemaAlterTableAddColumnOperation) {
-                        SchemaAlterTableAddColumnOperation alterOp = (SchemaAlterTableAddColumnOperation) msg.operation();
+                        SchemaAlterTableAddColumnOperation alterOp = (SchemaAlterTableAddColumnOperation)msg.operation();
 
                         try {
                             for (QueryField field : alterOp.columns()) {
@@ -1293,7 +1293,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
         IgniteCacheObjectProcessor cacheObjProc = ctx.cacheObjects();
 
         if (cacheObjProc instanceof CacheObjectBinaryProcessorImpl) {
-            CacheObjectBinaryProcessorImpl binProc = (CacheObjectBinaryProcessorImpl) cacheObjProc;
+            CacheObjectBinaryProcessorImpl binProc = (CacheObjectBinaryProcessorImpl)cacheObjProc;
 
             Class<?> cls = U.box(U.classForName(clsName, null, true));
 
@@ -3387,7 +3387,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             throw new IllegalStateException("Failed to execute query (grid is stopping).");
 
         try {
-            final GridCacheContext<K, V> cctx = (GridCacheContext<K, V>) ctx.cache().internalCache(cacheName).context();
+            final GridCacheContext<K, V> cctx = (GridCacheContext<K, V>)ctx.cache().internalCache(cacheName).context();
 
             return executeQuery(GridCacheQueryType.INDEX, valCls, cctx,
                 new IgniteOutClosureX<IndexQueryResult<K, V>>() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
index d209f62..0a6a9ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
@@ -609,7 +609,7 @@ public class QueryTypeDescriptorImpl implements GridQueryTypeDescriptor {
             boolean isKey = false;
 
             if (F.eq(prop.name(), keyFieldAlias()) || (keyFieldName == null && F.eq(prop.name(), KEY_FIELD_NAME))) {
-                propVal = key instanceof KeyCacheObject ? ((CacheObject) key).value(coCtx, true) : key;
+                propVal = key instanceof KeyCacheObject ? ((CacheObject)key).value(coCtx, true) : key;
 
                 isKey = true;
             }
@@ -629,7 +629,7 @@ public class QueryTypeDescriptorImpl implements GridQueryTypeDescriptor {
                     if (!U.box(prop.type()).isAssignableFrom(U.box(propVal.getClass()))) {
                         // Some reference type arrays end up being converted to Object[]
                         if (!(prop.type().isArray() && Object[].class == propVal.getClass() &&
-                            Arrays.stream((Object[]) propVal).
+                            Arrays.stream((Object[])propVal).
                             noneMatch(x -> x != null && !U.box(prop.type().getComponentType()).isAssignableFrom(U.box(x.getClass())))))
                         {
                             throw new IgniteSQLException("Type for a column '" + prop.name() +
@@ -692,7 +692,7 @@ public class QueryTypeDescriptorImpl implements GridQueryTypeDescriptor {
                 Class<?> propType;
 
                 if (F.eq(idxField, keyFieldAlias()) || F.eq(idxField, KEY_FIELD_NAME)) {
-                    propVal = key instanceof KeyCacheObject ? ((CacheObject) key).value(coCtx, true) : key;
+                    propVal = key instanceof KeyCacheObject ? ((CacheObject)key).value(coCtx, true) : key;
 
                     propType = propVal == null ? null : propVal.getClass();
                 }
@@ -714,7 +714,7 @@ public class QueryTypeDescriptorImpl implements GridQueryTypeDescriptor {
                     if (!U.box(propType).isAssignableFrom(U.box(propVal.getClass()))) {
                         // Some reference type arrays end up being converted to Object[]
                         if (!(propType.isArray() && Object[].class == propVal.getClass() &&
-                            Arrays.stream((Object[]) propVal).
+                            Arrays.stream((Object[])propVal).
                                 noneMatch(x -> x != null && !U.box(propType.getComponentType()).isAssignableFrom(U.box(x.getClass())))))
                         {
                             throw new IgniteSQLException("Type for a column '" + idxField +
@@ -727,7 +727,7 @@ public class QueryTypeDescriptorImpl implements GridQueryTypeDescriptor {
                 else if (coCtx.kernalContext().cacheObjects().typeId(propType.getName()) !=
                     ((BinaryObject)propVal).type().typeId()) {
                     // Check for classes/enums implementing indexed interfaces.
-                    String clsName = ((BinaryObject) propVal).type().typeName();
+                    String clsName = ((BinaryObject)propVal).type().typeName();
                     try {
                         final Class<?> cls = Class.forName(clsName);
 
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 46416cb..073cbc7 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
@@ -1209,7 +1209,7 @@ public class QueryUtils {
 
         long tmp = TimeUnit.MILLISECONDS.convert(timeout, timeUnit);
 
-        return (int) tmp;
+        return (int)tmp;
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/property/QueryBinaryProperty.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/property/QueryBinaryProperty.java
index 6f7ac96..e3c49e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/property/QueryBinaryProperty.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/property/QueryBinaryProperty.java
@@ -115,7 +115,7 @@ public class QueryBinaryProperty implements GridQueryProperty {
             obj = isKeyProp ? key : val;
 
         if (obj instanceof BinaryObject) {
-            BinaryObject obj0 = (BinaryObject) obj;
+            BinaryObject obj0 = (BinaryObject)obj;
 
             return fieldValue(obj0);
         }
@@ -157,15 +157,15 @@ public class QueryBinaryProperty implements GridQueryProperty {
         if (!(obj instanceof BinaryObjectBuilder))
             throw new UnsupportedOperationException("Individual properties can be set for binary builders only");
 
-        setValue0((BinaryObjectBuilder) obj, propName, propVal, type());
+        setValue0((BinaryObjectBuilder)obj, propName, propVal, type());
 
         if (needsBuild) {
-            obj = ((BinaryObjectBuilder) obj).build();
+            obj = ((BinaryObjectBuilder)obj).build();
 
             assert parent != null;
 
             // And now let's set this newly constructed object to parent
-            setValue0((BinaryObjectBuilder) srcObj, parent.propName, obj, obj.getClass());
+            setValue0((BinaryObjectBuilder)srcObj, parent.propName, obj, obj.getClass());
         }
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsKey.java
index d061320..04c8876 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsKey.java
@@ -63,7 +63,7 @@ public class StatisticsKey implements Serializable {
     @Override public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        StatisticsKey statsKey = (StatisticsKey) o;
+        StatisticsKey statsKey = (StatisticsKey)o;
         return Objects.equals(schema, statsKey.schema) &&
             Objects.equals(obj, statsKey.obj);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsTarget.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsTarget.java
index 3b89ea3..3bad03d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsTarget.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsTarget.java
@@ -83,7 +83,7 @@ public class StatisticsTarget {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        StatisticsTarget that = (StatisticsTarget) o;
+        StatisticsTarget that = (StatisticsTarget)o;
 
         return Objects.equals(key, that.key) &&
             Arrays.equals(columns, that.columns);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/config/StatisticsColumnOverrides.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/config/StatisticsColumnOverrides.java
index 51f0051..2e980a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/config/StatisticsColumnOverrides.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/config/StatisticsColumnOverrides.java
@@ -98,7 +98,7 @@ public class StatisticsColumnOverrides implements Serializable {
         if (o == null || getClass() != o.getClass())
             return false;
 
-        StatisticsColumnOverrides that = (StatisticsColumnOverrides) o;
+        StatisticsColumnOverrides that = (StatisticsColumnOverrides)o;
 
         return Objects.equals(nulls, that.nulls) && Objects.equals(distinct, that.distinct) &&
             Objects.equals(total, that.total) && Objects.equals(size, that.size);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java
index 54ace50..32ee110 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java
@@ -124,7 +124,7 @@ public class GridClientCacheBean implements Serializable {
         if (obj == null || getClass() != obj.getClass())
             return false;
 
-        GridClientCacheBean other = (GridClientCacheBean) obj;
+        GridClientCacheBean other = (GridClientCacheBean)obj;
 
         return name == null ? other.name == null : name.equals(other.name);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
index 19d8af1..4994307 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -186,7 +186,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
         if (log.isDebugEnabled())
             log.debug("Handling task REST request: " + req);
 
-        GridRestTaskRequest req0 = (GridRestTaskRequest) req;
+        GridRestTaskRequest req0 = (GridRestTaskRequest)req;
 
         final GridFutureAdapter<GridRestResponse> fut = new GridFutureAdapter<>();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
index 3265df1..3e83cb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java
@@ -160,7 +160,7 @@ public class GridMemcachedMessage implements GridClientMessage {
 
     /** {@inheritDoc} */
     @Override public void requestId(long reqId) {
-        U.intToBytes((int) reqId, opaque, 0);
+        U.intToBytes((int)reqId, opaque, 0);
     }
 
     /** {@inheritDoc} */
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 e2e9a1c..3983941 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
@@ -294,7 +294,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
             restReq.key(req.key());
 
             if (cmd == CACHE_REMOVE_ALL) {
-                Object[] keys = (Object[]) req.value();
+                Object[] keys = (Object[])req.value();
 
                 if (keys != null) {
                     Map<Object, Object> map = new HashMap<>();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlKeyword.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlKeyword.java
index 7c69c5b..355095d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlKeyword.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlKeyword.java
@@ -329,7 +329,7 @@ public class SqlKeyword {
         try {
             for (Field field : SqlKeyword.class.getDeclaredFields()) {
                 if (F.eq(String.class, field.getType())) {
-                    String val = (String) field.get(null);
+                    String val = (String)field.get(null);
 
                     KEYWORDS.add(val);
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java
index ea86498..baaaeb4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBoundedLinkedHashSet.java
@@ -75,7 +75,7 @@ public class GridBoundedLinkedHashSet<E> extends GridSerializableSet<E> implemen
     public GridBoundedLinkedHashSet(Collection<? extends E> c, int maxCap) {
         assert maxCap > 0;
 
-        map = new GridBoundedLinkedHashMap<>(Math.max((int) (c.size() / 0.75f) + 1, 16), maxCap);
+        map = new GridBoundedLinkedHashMap<>(Math.max((int)(c.size() / 0.75f) + 1, 16), maxCap);
 
         addAll(c);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java
index 61792d1..642ddaa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentPhantomHashSet.java
@@ -345,7 +345,7 @@ public class GridConcurrentPhantomHashSet<E> implements Set<E> {
     private void removeStale() {
         PhantomReferenceElement<E> ref;
 
-        while ((ref = (PhantomReferenceElement<E>) refQ.poll()) != null) {
+        while ((ref = (PhantomReferenceElement<E>)refQ.poll()) != null) {
             store.remove(ref);
 
             onGc(ref.get());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java
index e6aa1bd..e6c00fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentWeakHashSet.java
@@ -345,7 +345,7 @@ public class GridConcurrentWeakHashSet<E> implements Set<E> {
     private void removeStale() {
         WeakReferenceElement<E> ref;
 
-        while ((ref = (WeakReferenceElement<E>) gcQ.poll()) != null) {
+        while ((ref = (WeakReferenceElement<E>)gcQ.poll()) != null) {
             store.remove(ref);
 
             onGc(ref.get());
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 18f9334..f9f6ae2 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 ea817db..f3c0d8b 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
@@ -6264,7 +6264,7 @@ public abstract class IgniteUtils {
             return -1;
         }
 
-        return (attr instanceof Long) ? (Long) attr : -1;
+        return (attr instanceof Long) ? (Long)attr : -1;
     }
 
     /**
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 98fcf9d..fb78f68 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
@@ -730,7 +730,7 @@ public class StripedExecutor implements ExecutorService {
 
                         while (true) {
                             if (cur != idx) {
-                                Deque<Runnable> queue = (Deque<Runnable>) ((StripeConcurrentQueue) others[cur]).queue;
+                                Deque<Runnable> queue = (Deque<Runnable>)((StripeConcurrentQueue)others[cur]).queue;
 
                                 if (queue.size() > IGNITE_TASKS_STEALING_THRESHOLD && (r = queue.pollLast()) != null)
                                     return r;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java
index 731b93b..d14030b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridByteArrayOutputStream.java
@@ -78,7 +78,7 @@ public class GridByteArrayOutputStream extends OutputStream {
         if (newCnt > buf.length)
             buf = Arrays.copyOf(buf, Math.max(buf.length << 1, newCnt));
 
-        buf[cnt] = (byte) b;
+        buf[cnt] = (byte)b;
 
         cnt = newCnt;
     }
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 1c1894f..4373ed6 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
@@ -93,7 +93,7 @@ public class GridReversedLinesFileReader implements Closeable {
 
         randomAccessFile = new RandomAccessFile(file, "r");
         totalByteLength = randomAccessFile.length();
-        int lastBlockLength = (int) (totalByteLength % blockSize);
+        int lastBlockLength = (int)(totalByteLength % blockSize);
         if (lastBlockLength > 0) {
             totalBlockCount = totalByteLength / blockSize + 1;
         } else {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java
index 59c9968..356b584 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java
@@ -216,7 +216,7 @@ public class IpcSharedMemorySpace implements Closeable {
             if (closed.get())
                 throw new IgniteCheckedException("Shared memory segment has been closed: " + this);
 
-            return (int) IpcSharedMemoryUtils.readSharedMemory(shmemPtr, buf, off, len, timeout);
+            return (int)IpcSharedMemoryUtils.readSharedMemory(shmemPtr, buf, off, len, timeout);
         }
         finally {
             lock.readLock().unlock();
@@ -247,7 +247,7 @@ public class IpcSharedMemorySpace implements Closeable {
             if (closed.get())
                 throw new IgniteCheckedException("Shared memory segment has been closed: " + this);
 
-            return (int) IpcSharedMemoryUtils.readSharedMemoryByteBuffer(shmemPtr, buf, off, len, timeout);
+            return (int)IpcSharedMemoryUtils.readSharedMemoryByteBuffer(shmemPtr, buf, off, len, timeout);
         }
         finally {
             lock.readLock().unlock();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index e7c06a1..fb29bb0 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -1232,7 +1232,7 @@ public class GridFunc {
      * @return Whether or not the given collection is {@code null} or empty.
      */
     public static boolean isEmpty(@Nullable Iterable<?> c) {
-        return c == null || (c instanceof Collection<?> ? ((Collection<?>) c).isEmpty() : !c.iterator().hasNext());
+        return c == null || (c instanceof Collection<?> ? ((Collection<?>)c).isEmpty() : !c.iterator().hasNext());
     }
 
     /**
@@ -1497,7 +1497,7 @@ public class GridFunc {
      * @return Predicate that evaluates to {@code true} if its free variable is not {@code null}.
      */
     public static <T> IgnitePredicate<T> notNull() {
-        return (IgnitePredicate<T>) IS_NOT_NULL;
+        return (IgnitePredicate<T>)IS_NOT_NULL;
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 9da0493..50ff443 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -2968,7 +2968,7 @@ public class GridNioServer<T> {
         if (outboundMessagesQueueSizeMetric == null)
             return -1;
 
-        return (int) outboundMessagesQueueSizeMetric.value();
+        return (int)outboundMessagesQueueSizeMetric.value();
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 61d420c..b337b7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -902,9 +902,9 @@ public class GridToStringBuilder {
             if (cls.isArray())
                 addArray(buf, cls, val);
             else if (val instanceof Collection)
-                addCollection(buf, (Collection) val);
+                addCollection(buf, (Collection)val);
             else if (val instanceof Map)
-                addMap(buf, (Map<?, ?>) val);
+                addMap(buf, (Map<?, ?>)val);
             else
                 buf.a(val);
         }
@@ -927,7 +927,7 @@ public class GridToStringBuilder {
             return;
         }
 
-        Object[] arr = (Object[]) obj;
+        Object[] arr = (Object[])obj;
 
         buf.a(arrType.getSimpleName()).a(" [");
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index a82518f..c7cf2a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -640,7 +640,7 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
 
         if (protoVer > V1) {
             diskPageCompression = DiskPageCompression.fromOrdinal(in.readByte());
-            diskPageCompressionLevel = (Integer) in.readObject();
+            diskPageCompressionLevel = (Integer)in.readObject();
         }
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
index 2da2a15..5469b2b 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
@@ -64,7 +64,7 @@ public class VisorCacheJdbcType extends VisorDataTransferObject {
         List<VisorCacheJdbcType> res = new ArrayList<>();
 
         if (factory instanceof CacheJdbcPojoStoreFactory) {
-            CacheJdbcPojoStoreFactory jdbcFactory = (CacheJdbcPojoStoreFactory) factory;
+            CacheJdbcPojoStoreFactory jdbcFactory = (CacheJdbcPojoStoreFactory)factory;
 
             JdbcType[] jdbcTypes = jdbcFactory.getTypes();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityTask.java
index 1b30a34..e9d69ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityTask.java
@@ -103,7 +103,7 @@ public class VisorConnectivityTask
             Map<ClusterNode, Boolean> statuses = new HashMap<>();
 
             if (spi instanceof TcpCommunicationSpi) {
-                BitSet set = ((TcpCommunicationSpi) spi).checkConnection(nodes).get();
+                BitSet set = ((TcpCommunicationSpi)spi).checkConnection(nodes).get();
 
                 for (int i = 0; i < nodes.size(); i++) {
                     ClusterNode node = nodes.get(i);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index 0f5abc6..17997aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -450,7 +450,7 @@ public class VisorGridConfiguration extends VisorDataTransferObject {
         binaryCfg = (VisorBinaryConfiguration)in.readObject();
         cacheKeyCfgs = U.readList(in);
         hadoopCfg = (VisorHadoopConfiguration)in.readObject();
-        sqlConnCfg = (VisorSqlConnectorConfiguration) in.readObject();
+        sqlConnCfg = (VisorSqlConnectorConfiguration)in.readObject();
         srvcCfgs = U.readList(in);
 
         if (protoVer > V1)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
index 6b53a10..3ae84ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
@@ -109,7 +109,7 @@ public class PersistenceTask extends VisorOneNodeTask<PersistenceTaskArg, Persis
             MaintenanceRegistry mntcReg = ignite.context().maintenanceRegistry();
             MaintenanceTask task = mntcReg.activeMaintenanceTask(CORRUPTED_DATA_FILES_MNTC_TASK_NAME);
 
-            File workDir = ((FilePageStoreManager) ignite.context().cache().context().pageStore()).workDir();
+            File workDir = ((FilePageStoreManager)ignite.context().cache().context().pageStore()).workDir();
 
             switch (backupSettings.cleanAndBackupType()) {
                 case ALL:
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskArg.java
index c48f936..47b7801 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskArg.java
@@ -77,6 +77,6 @@ public class PersistenceTaskArg extends IgniteDataTransferObject {
     /** {@inheritDoc} */
     @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
         op = PersistenceOperation.fromOrdinal(in.readByte());
-        cleanAndBackupSettings = (PersistenceCleanAndBackupSettings) in.readObject();
+        cleanAndBackupSettings = (PersistenceCleanAndBackupSettings)in.readObject();
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index c92a69c..ad69955 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -742,7 +742,7 @@ public class VisorTaskUtils {
      */
     public static Integer evictionPolicyMaxSize(@Nullable Factory plc) {
         if (plc instanceof AbstractEvictionPolicyFactory)
-            return ((AbstractEvictionPolicyFactory) plc).getMaxSize();
+            return ((AbstractEvictionPolicyFactory)plc).getMaxSize();
 
         return null;
     }
@@ -1258,6 +1258,6 @@ public class VisorTaskUtils {
     public static boolean isRestartingCache(IgniteEx ignite, String cacheName) {
         IgniteCacheProxy<Object, Object> proxy = ignite.context().cache().jcache(cacheName);
 
-        return proxy instanceof IgniteCacheProxyImpl && ((IgniteCacheProxyImpl) proxy).isRestarting();
+        return proxy instanceof IgniteCacheProxyImpl && ((IgniteCacheProxyImpl)proxy).isRestarting();
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetAffinityFunction.java
index 35eb777..29d4f37 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetAffinityFunction.java
@@ -134,7 +134,7 @@ public class PlatformDotNetAffinityFunction implements AffinityFunction, Externa
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        func = (PlatformAffinityFunction) in.readObject();
+        func = (PlatformAffinityFunction)in.readObject();
     }
 
     /**
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 7342ec0..3510a84 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
@@ -71,7 +71,7 @@ public class ExponentialBackoffTimeoutStrategy implements TimeoutStrategy {
      * @return Next exponential backoff timeout.
      */
     public static long backoffTimeout(long timeout, long maxTimeout) {
-        return (long) Math.min(timeout * DLFT_BACKOFF_COEFF, maxTimeout);
+        return (long)Math.min(timeout * DLFT_BACKOFF_COEFF, maxTimeout);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java
index b506f9b..cac5c0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java
@@ -204,7 +204,7 @@ public class TcpCommunicationMetricsListener {
         assert consistentId != null;
 
         if (msg instanceof GridIoMessage) {
-            msg = ((GridIoMessage) msg).message();
+            msg = ((GridIoMessage)msg).message();
 
             updateMessageTypeMap(msg);
 
@@ -225,7 +225,7 @@ public class TcpCommunicationMetricsListener {
         assert consistentId != null;
 
         if (msg instanceof GridIoMessage) {
-            msg = ((GridIoMessage) msg).message();
+            msg = ((GridIoMessage)msg).message();
 
             updateMessageTypeMap(msg);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionKey.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionKey.java
index a107c87..41b2c7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectionKey.java
@@ -106,7 +106,7 @@ public class ConnectionKey {
         if (o == null || getClass() != o.getClass())
             return false;
 
-        ConnectionKey key = (ConnectionKey) o;
+        ConnectionKey key = (ConnectionKey)o;
 
         return idx == key.idx && nodeId.equals(key.nodeId);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java
index 8b2a86c..63b26eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfigInitializer.java
@@ -96,7 +96,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
         if (cfg.addrRslvr() == null)
             cfg.addrRslvr(addrRslvr);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -139,7 +139,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
         if (cfg.localAddress() == null)
             cfg.localAddress(locAddr);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -163,7 +163,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setLocalPort(int locPort) {
         cfg.localPort(locPort);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -239,7 +239,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setUsePairedConnections(boolean usePairedConnections) {
         cfg.usePairedConnections(usePairedConnections);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -255,7 +255,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setConnectionsPerNode(int maxConnectionsPerNode) {
         cfg.connectionsPerNode(maxConnectionsPerNode);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -281,7 +281,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setSharedMemoryPort(int shmemPort) {
         cfg.shmemPort(shmemPort);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -306,7 +306,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setIdleConnectionTimeout(long idleConnTimeout) {
         cfg.idleConnectionTimeout(idleConnTimeout);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -340,7 +340,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setSocketWriteTimeout(long sockWriteTimeout) {
         cfg.socketWriteTimeout(sockWriteTimeout);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -364,7 +364,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setAckSendThreshold(int ackSndThreshold) {
         cfg.ackSendThreshold(ackSndThreshold);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -388,7 +388,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setUnacknowledgedMessagesBufferSize(int unackedMsgsBufSize) {
         cfg.unackedMsgsBufferSize(unackedMsgsBufSize);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -410,7 +410,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
 
         failureDetectionTimeoutEnabled(false);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -443,7 +443,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
 
         failureDetectionTimeoutEnabled(false);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -472,7 +472,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
 
         failureDetectionTimeoutEnabled(false);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -499,7 +499,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setDirectBuffer(boolean directBuf) {
         cfg.directBuffer(directBuf);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -532,7 +532,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setDirectSendBuffer(boolean directSndBuf) {
         cfg.directSendBuffer(directSndBuf);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -547,7 +547,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setSelectorsCount(int selectorsCnt) { ;
         cfg.selectorsCount(selectorsCnt);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -580,7 +580,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setSelectorSpins(long selectorSpins) {
         cfg.selectorSpins(selectorSpins);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /** */
@@ -608,7 +608,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setTcpNoDelay(boolean tcpNoDelay) {
         cfg.tcpNoDelay(tcpNoDelay);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -644,7 +644,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setFilterReachableAddresses(boolean filterReachableAddresses) {
         cfg.filterReachableAddresses(filterReachableAddresses);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -659,7 +659,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setSocketReceiveBuffer(int sockRcvBuf) {
         cfg.socketReceiveBuffer(sockRcvBuf);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -683,7 +683,7 @@ public abstract class TcpCommunicationConfigInitializer extends IgniteSpiAdapter
     public TcpCommunicationSpi setSocketSendBuffer(int sockSndBuf) {
 cfg.socketSendBuffer(sockSndBuf);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -710,7 +710,7 @@ cfg.socketSendBuffer(sockSndBuf);
     public TcpCommunicationSpi setMessageQueueLimit(int msgQueueLimit) {
         cfg.messageQueueLimit(msgQueueLimit);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -779,7 +779,7 @@ cfg.socketSendBuffer(sockSndBuf);
     public TcpCommunicationSpi setForceClientToServerConnections(boolean forceClientToSrvConnections) {
         cfg.forceClientToSrvConnections(forceClientToSrvConnections);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -799,7 +799,7 @@ cfg.socketSendBuffer(sockSndBuf);
     public TcpCommunicationSpi setSlowClientQueueLimit(int slowClientQueueLimit) {
         cfg.slowClientQueueLimit(slowClientQueueLimit);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /**
@@ -813,7 +813,7 @@ cfg.socketSendBuffer(sockSndBuf);
     @Override public TcpCommunicationSpi setName(String name) {
         super.setName(name);
 
-        return (TcpCommunicationSpi) this;
+        return (TcpCommunicationSpi)this;
     }
 
     /** {@inheritDoc} */
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 208e2c0..26fb50a 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
@@ -797,7 +797,7 @@ class ClientImpl extends TcpDiscoveryImpl {
                 msg.client(true);
 
                 if (msg instanceof TraceableMessage)
-                    tracing.messages().beforeSend((TraceableMessage) msg);
+                    tracing.messages().beforeSend((TraceableMessage)msg);
 
                 spi.writeToSocket(sock, msg, timeoutHelper.nextTimeoutChunk(spi.getSocketTimeout()));
 
@@ -2167,7 +2167,7 @@ class ClientImpl extends TcpDiscoveryImpl {
             spi.stats.onMessageProcessingStarted(msg);
 
             if (msg instanceof TraceableMessage)
-                tracing.messages().beforeSend((TraceableMessage) msg);
+                tracing.messages().beforeSend((TraceableMessage)msg);
 
             if (msg instanceof TcpDiscoveryNodeAddedMessage)
                 processNodeAddedMessage((TcpDiscoveryNodeAddedMessage)msg);
@@ -2191,7 +2191,7 @@ class ClientImpl extends TcpDiscoveryImpl {
             spi.stats.onMessageProcessingFinished(msg);
 
             if (msg instanceof TraceableMessage)
-                tracing.messages().finishProcessing((TraceableMessage) msg);
+                tracing.messages().finishProcessing((TraceableMessage)msg);
 
             if (spi.ensured(msg)
                     && state == CONNECTED
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 131ec8f..f98d7e5 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
@@ -3032,7 +3032,7 @@ class ServerImpl extends TcpDiscoveryImpl {
             }
 
             if (msg instanceof TraceableMessage) {
-                TraceableMessage tMsg = (TraceableMessage) msg;
+                TraceableMessage tMsg = (TraceableMessage)msg;
 
                 // If we read this message from socket.
                 if (fromSocket)
@@ -3165,7 +3165,7 @@ class ServerImpl extends TcpDiscoveryImpl {
             notifiedDiscovery.set(false);
 
             if (msg instanceof TraceableMessage) {
-                TraceableMessage tMsg = (TraceableMessage) msg;
+                TraceableMessage tMsg = (TraceableMessage)msg;
 
                 tracing.messages().afterReceive(tMsg);
             }
@@ -3181,7 +3181,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                             "ignoring message [msg=" + msg + ", locNode=" + locNode + ']');
 
                     if (msg instanceof TraceableMessage)
-                        ((TraceableMessage) msg).spanContainer().span()
+                        ((TraceableMessage)msg).spanContainer().span()
                             .addLog(() -> "Ring failed")
                             .setStatus(SpanStatus.ABORTED)
                             .end();
@@ -3216,7 +3216,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                     }
 
                     if (msg instanceof TraceableMessage)
-                        ((TraceableMessage) msg).spanContainer().span()
+                        ((TraceableMessage)msg).spanContainer().span()
                             .addLog(() -> "Local node order not initialized")
                             .setStatus(SpanStatus.ABORTED)
                             .end();
@@ -3292,7 +3292,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                 (msg instanceof TcpDiscoveryNodeAddedMessage
                     || msg instanceof TcpDiscoveryJoinRequestMessage
                     || notifiedDiscovery.get())) {
-                TraceableMessage tMsg = (TraceableMessage) msg;
+                TraceableMessage tMsg = (TraceableMessage)msg;
 
                 tracing.messages().finishProcessing(tMsg);
             }
@@ -3396,7 +3396,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                 msgLsnr.apply(msg);
 
             if (msg instanceof TraceableMessage)
-                tracing.messages().beforeSend((TraceableMessage) msg);
+                tracing.messages().beforeSend((TraceableMessage)msg);
 
             sendMessageToClients(msg);
 
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 df45930..250bcdb 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
@@ -153,7 +153,7 @@ abstract class TcpDiscoveryImpl {
         log = spi.log;
 
         if (spi.ignite() instanceof IgniteEx)
-            tracing = ((IgniteEx) spi.ignite()).context().tracing();
+            tracing = ((IgniteEx)spi.ignite()).context().tracing();
         else
             tracing = new NoopTracing();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index b333e4d..6890d20 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -484,7 +484,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Ignite
     /** {@inheritDoc} */
     @Override public boolean isClient() {
         if (!cacheCliInit) {
-            Boolean clientModeAttr = ((ClusterNode) this).attribute(IgniteNodeAttributes.ATTR_CLIENT_MODE);
+            Boolean clientModeAttr = ((ClusterNode)this).attribute(IgniteNodeAttributes.ATTR_CLIENT_MODE);
 
             cacheCli = clientModeAttr != null && clientModeAttr;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
index aaa3165..1e3ae22 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
@@ -62,7 +62,7 @@ public class TcpDiscoveryNodesRing {
         @Override public boolean apply(ClusterNode node) {
             assert node instanceof TcpDiscoveryNode : node;
 
-            return ((TcpDiscoveryNode) node).clientRouterNodeId() != null;
+            return ((TcpDiscoveryNode)node).clientRouterNodeId() != null;
         }
     };
 
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java
index 49f0c15..0e63934 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamAdapter.java
@@ -98,7 +98,7 @@ public abstract class StreamAdapter<T, K, V> {
     @Deprecated
     public StreamTupleExtractor<T, K, V> getTupleExtractor() {
         if (singleTupleExtractor instanceof StreamTupleExtractor)
-            return (StreamTupleExtractor) singleTupleExtractor;
+            return (StreamTupleExtractor)singleTupleExtractor;
 
         throw new IllegalArgumentException("This method is deprecated and only relevant if using an old " +
             "StreamTupleExtractor; use getSingleTupleExtractor instead");
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java
index 88a5ba8..429349d 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedDeque8.java
@@ -271,12 +271,12 @@ public class ConcurrentLinkedDeque8<E>
 
     @SuppressWarnings("unchecked")
     Node<E> prevTerminator() {
-        return (Node<E>) PREV_TERMINATOR;
+        return (Node<E>)PREV_TERMINATOR;
     }
 
     @SuppressWarnings("unchecked")
     Node<E> nextTerminator() {
-        return (Node<E>) NEXT_TERMINATOR;
+        return (Node<E>)NEXT_TERMINATOR;
     }
 
     public static final class Node<E> {
@@ -1660,7 +1660,7 @@ public class ConcurrentLinkedDeque8<E>
         Object item;
         while ((item = s.readObject()) != null) {
             @SuppressWarnings("unchecked")
-            Node<E> newNode = new Node<E>((E) item);
+            Node<E> newNode = new Node<E>((E)item);
             if (h == null)
                 h = t = newNode;
             else {
@@ -1718,7 +1718,7 @@ public class ConcurrentLinkedDeque8<E>
 
                             f.setAccessible(true);
 
-                            return (Unsafe) f.get(null);
+                            return (Unsafe)f.get(null);
                         }
                     });
             }
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
index 1f0d2df..788f59c 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentLinkedHashMap.java
@@ -1140,7 +1140,7 @@ public class ConcurrentLinkedHashMap<K, V> extends AbstractMap<K, V> implements
      * @param m the map
      */
     public ConcurrentLinkedHashMap(Map<? extends K, ? extends V> m) {
-        this(Math.max((int) (m.size() / DFLT_LOAD_FACTOR) + 1, DFLT_INIT_CAP),
+        this(Math.max((int)(m.size() / DFLT_LOAD_FACTOR) + 1, DFLT_INIT_CAP),
             DFLT_LOAD_FACTOR, DFLT_CONCUR_LVL);
 
         putAll(m);
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java
index 2ed03ff..6bfb82c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java
@@ -273,7 +273,7 @@ public class RebalanceCancellationTest extends GridCommonAbstractTest {
 
         // Trigger rebalancing.
         IgniteConfiguration cfg1 = getConfiguration(getTestIgniteInstanceName(1));
-        TestRecordingCommunicationSpi spi2 = (TestRecordingCommunicationSpi) cfg1.getCommunicationSpi();
+        TestRecordingCommunicationSpi spi2 = (TestRecordingCommunicationSpi)cfg1.getCommunicationSpi();
         spi2.blockMessages(TestRecordingCommunicationSpi.blockDemandMessageForGroup(CU.cacheId(cache0Name)));
 
         GridTestUtils.runAsync(new Callable<Void>() {
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 3b972ef..37accba 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
@@ -166,11 +166,11 @@ public class ResetLostPartitionTest extends GridCommonAbstractTest {
 
         // Start node 1 with empty PDS. Rebalance will be started, only sys cache will be rebalanced.
         IgniteConfiguration cfg1 = getConfiguration(getTestIgniteInstanceName(1));
-        TestRecordingCommunicationSpi spi1 = (TestRecordingCommunicationSpi) cfg1.getCommunicationSpi();
+        TestRecordingCommunicationSpi spi1 = (TestRecordingCommunicationSpi)cfg1.getCommunicationSpi();
         spi1.blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionDemandMessage) {
-                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage) msg;
+                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage)msg;
 
                     return msg0.groupId() != CU.cacheId("ignite-sys-cache");
                 }
diff --git a/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java
index dcb78ef..2144827 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertTrue;
 public class ClientConfigurationTest {
     /** Per test timeout */
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /** Serialization/deserialization. */
     @Test
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 673dc69..59a4120 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
@@ -106,7 +106,7 @@ public class FunctionalTest {
     /** Per test timeout */
     @SuppressWarnings("deprecation")
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /**
      * Tested API:
@@ -1192,7 +1192,7 @@ public class FunctionalTest {
                 fail();
             }
             catch (ClientException e) {
-                ClientServerError cause = (ClientServerError) e.getCause();
+                ClientServerError cause = (ClientServerError)e.getCause();
                 assertEquals(ClientStatus.TX_LIMIT_EXCEEDED, cause.getCode());
             }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java b/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java
index 96ac7b6..f7681fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertNull;
 public class IgniteBinaryTest {
     /** Per test timeout */
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /**
      * Unmarshalling schema-less Ignite binary objects into Java static types.
diff --git a/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java b/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java
index f97e7b7..b86cf32 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertTrue;
 public class LoadTest {
     /** Per test timeout */
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /**
      * Test thin client in multi-thread environment.
diff --git a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTestAsync.java b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTestAsync.java
index bbda4d5..5f1d3c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTestAsync.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTestAsync.java
@@ -29,7 +29,7 @@ public class ReliabilityTestAsync extends ReliabilityTest {
             cache.putAsync(key, val).get();
         } catch (InterruptedException | ExecutionException e) {
             if (e.getCause() instanceof RuntimeException)
-                throw (RuntimeException) e.getCause();
+                throw (RuntimeException)e.getCause();
 
             throw new RuntimeException(e);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
index ee05dd0..0093dbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java
@@ -427,13 +427,13 @@ public abstract class ClusterGroupAbstractTest extends GridCommonAbstractTest im
      * @throws Exception If failed.
      */
     private void call3(AtomicInteger cnt) throws Exception {
-        IgniteFuture<String> fut = compute(prj).applyAsync(clrJob, (String) null);
+        IgniteFuture<String> fut = compute(prj).applyAsync(clrJob, (String)null);
 
         waitForExecution(fut);
 
         cnt.set(0);
 
-        compute(prj).apply(clrJob, (String) null);
+        compute(prj).apply(clrJob, (String)null);
 
         waitForValue(cnt, 1);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
index 340faba..c4f4752 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
@@ -165,7 +165,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
                 @Override public boolean apply(Event evt) {
                     assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED : evt;
 
-                    evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes());
+                    evts.put(cnt.getAndIncrement(), ((DiscoveryEvent)evt).topologyNodes());
 
                     latch.countDown();
 
@@ -232,7 +232,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
                     assert evt.type() == EVT_NODE_JOINED
                         || evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED : evt;
 
-                    evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes());
+                    evts.put(cnt.getAndIncrement(), ((DiscoveryEvent)evt).topologyNodes());
 
                     latch.countDown();
 
@@ -349,10 +349,10 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
                 @Override public boolean apply(Event evt) {
                     assert evt.type() == EVT_NODE_JOINED : evt;
 
-                    X.println(">>>>>>> Joined " + F.viewReadOnly(((DiscoveryEvent) evt).topologyNodes(),
+                    X.println(">>>>>>> Joined " + F.viewReadOnly(((DiscoveryEvent)evt).topologyNodes(),
                         NODE_2ID));
 
-                    evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes());
+                    evts.put(cnt.getAndIncrement(), ((DiscoveryEvent)evt).topologyNodes());
 
                     return true;
                 }
@@ -401,7 +401,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
 
                 g.events().localListen(new IgnitePredicate<Event>() {
                     @Override public boolean apply(Event evt) {
-                        DiscoveryEvent discoEvt = (DiscoveryEvent) evt;
+                        DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
 
                         if (discoEvt.topologyNodes().size() != 3)
                             err.compareAndSet(null, new IgniteCheckedException("Invalid discovery event [evt=" + discoEvt +
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
index 506ff68..405f29e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
@@ -222,7 +222,7 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest {
     @Test
     public void testCacheNodes() throws Exception {
         // Validate only original node is available.
-        GridDiscoveryManager discoMgr = ((IgniteKernal) ignite).context().discovery();
+        GridDiscoveryManager discoMgr = ((IgniteKernal)ignite).context().discovery();
 
         Collection<ClusterNode> nodes = discoMgr.allNodes();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java
index 0c92b43..51dfe84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalTestUtils.java
@@ -39,6 +39,6 @@ public class GridKernalTestUtils {
     public static GridKernalContext context(Ignite ignite) {
         assert ignite != null;
 
-        return ((IgniteKernal) ignite).context();
+        return ((IgniteKernal)ignite).context();
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java
index e07a375..031461d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java
@@ -85,10 +85,10 @@ public class GridSameVmStartupSelfTest extends GridCommonAbstractTest {
 
                     if (evt instanceof DiscoveryEvent) {
                         // Local node can send METRICS_UPDATED event.
-                        assert ((DiscoveryEvent) evt).eventNode().id().equals(grid1LocNodeId) ||
+                        assert ((DiscoveryEvent)evt).eventNode().id().equals(grid1LocNodeId) ||
                             evt.type() == EVT_NODE_METRICS_UPDATED :
                             "Received event about invalid node [received=" +
-                                ((DiscoveryEvent) evt).eventNode().id() + ", expected=" + grid1LocNodeId +
+                                ((DiscoveryEvent)evt).eventNode().id() + ", expected=" + grid1LocNodeId +
                                 ", type=" + evt.type() + ']';
 
                         if (tcpDiscovery) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
index 5f58b86..e9e4cd2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java
@@ -82,7 +82,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
 
         Collection<Event> evts = ignite.events().localQuery(new PE() {
             @Override public boolean apply(Event evt) {
-                return ((TaskEvent) evt).taskSessionId().equals(execId);
+                return ((TaskEvent)evt).taskSessionId().equals(execId);
             }
         }, EVT_TASK_TIMEDOUT);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientCheckClusterGroupLocalIdAfterReconnect.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientCheckClusterGroupLocalIdAfterReconnect.java
index 61c7fe3..93a4673 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientCheckClusterGroupLocalIdAfterReconnect.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientCheckClusterGroupLocalIdAfterReconnect.java
@@ -93,7 +93,7 @@ public class IgniteClientCheckClusterGroupLocalIdAfterReconnect extends GridComm
 
         CountDownLatch topicSignal = new CountDownLatch(2);
 
-        messaging.localListen("topic", (IgniteBiPredicate<UUID, Object>) (uuid, n) -> {
+        messaging.localListen("topic", (IgniteBiPredicate<UUID, Object>)(uuid, n) -> {
             topicSignal.countDown();
 
             return true;
@@ -104,7 +104,7 @@ public class IgniteClientCheckClusterGroupLocalIdAfterReconnect extends GridComm
 
         CountDownLatch discSignal = new CountDownLatch(1);
 
-        client.events().localListen((IgnitePredicate<DiscoveryEvent>) evt -> {
+        client.events().localListen((IgnitePredicate<DiscoveryEvent>)evt -> {
             discSignal.countDown();
 
             return true;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
index ddac18e..2056a1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
@@ -123,7 +123,7 @@ public class IgniteSlowClientDetectionSelfTest extends GridCommonAbstractTest {
                 @Override public boolean apply(Event evt) {
                     assertEquals("Unexpected event: " + evt, evt.type(), EventType.EVT_NODE_FAILED);
 
-                    DiscoveryEvent evt0 = (DiscoveryEvent) evt;
+                    DiscoveryEvent evt0 = (DiscoveryEvent)evt;
 
                     assertEquals(slowClientNode, evt0.eventNode());
                     assertEquals(6L, evt0.topologyVersion());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java b/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java
index 95a8266..422d5c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java
@@ -386,7 +386,7 @@ public class TestRecordingCommunicationSpi extends TcpCommunicationSpi {
         return new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionDemandMessage) {
-                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage) msg;
+                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage)msg;
 
                     return msg0.groupId() == grpId;
                 }
@@ -401,7 +401,7 @@ public class TestRecordingCommunicationSpi extends TcpCommunicationSpi {
         return new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionsSingleMessage) {
-                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage) msg;
+                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage)msg;
 
                     return msg0.exchangeId() != null;
                 }
@@ -416,7 +416,7 @@ public class TestRecordingCommunicationSpi extends TcpCommunicationSpi {
         return new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionsSingleMessage) {
-                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage) msg;
+                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage)msg;
 
                     return msg0.exchangeId() == null;
                 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
index 77c717c..d340aaa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
@@ -214,9 +214,9 @@ public class TransactionsMXBeanImplTest extends GridCommonAbstractTest {
         clientNodes.forEach((igniteEx, bean) -> igniteEx.context().distributedMetastorage().listen(
             (key) -> key.startsWith(DIST_CONF_PREFIX),
             (String key, Serializable oldVal, Serializable newVal) -> {
-                if ((long) newVal == 200)
+                if ((long)newVal == 200)
                     updateLatches.get(igniteEx).get(0).countDown();
-                if ((long) newVal == 300)
+                if ((long)newVal == 300)
                     updateLatches.get(igniteEx).get(1).countDown();
             }
         ));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/AffinityKey.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/AffinityKey.java
index 1b4daee..e02ca58 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/AffinityKey.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/AffinityKey.java
@@ -48,7 +48,7 @@ public class AffinityKey {
         if (o == null || getClass() != o.getClass())
             return false;
 
-        AffinityKey that = (AffinityKey) o;
+        AffinityKey that = (AffinityKey)o;
 
         return key == that.key && aff == that.aff;
     }
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 e087f4c..0577770 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
@@ -325,8 +325,8 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
      */
     private void validateNested(int key, EnumType val, boolean registered) throws Exception {
         if (registered) {
-            EnumHolder res1 = (EnumHolder) cache1.get(key);
-            EnumHolder res2 = (EnumHolder) cache2.get(key);
+            EnumHolder res1 = (EnumHolder)cache1.get(key);
+            EnumHolder res2 = (EnumHolder)cache2.get(key);
 
             assertEquals(val, res1.val);
             assertEquals(val, res2.val);
@@ -593,8 +593,8 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
             assertEquals(DeclaredBodyEnum.ONE, cache2.get(1));
         }
 
-        validate((BinaryObject) cacheBinary1.get(1), DeclaredBodyEnum.ONE);
-        validate((BinaryObject) cacheBinary2.get(1), DeclaredBodyEnum.ONE);
+        validate((BinaryObject)cacheBinary1.get(1), DeclaredBodyEnum.ONE);
+        validate((BinaryObject)cacheBinary2.get(1), DeclaredBodyEnum.ONE);
     }
 
     /**
@@ -623,11 +623,11 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
         assertEquals(2, arrBinary1.length);
         assertEquals(2, arrBinary2.length);
 
-        validate((BinaryObject) arrBinary1[0], EnumType.ONE);
-        validate((BinaryObject) arrBinary1[1], EnumType.TWO);
+        validate((BinaryObject)arrBinary1[0], EnumType.ONE);
+        validate((BinaryObject)arrBinary1[1], EnumType.TWO);
 
-        validate((BinaryObject) arrBinary2[0], EnumType.ONE);
-        validate((BinaryObject) arrBinary2[1], EnumType.TWO);
+        validate((BinaryObject)arrBinary2[0], EnumType.ONE);
+        validate((BinaryObject)arrBinary2[1], EnumType.TWO);
     }
 
     /**
@@ -644,8 +644,8 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
             assertEquals(val, cache2.get(key));
         }
 
-        validate((BinaryObject) cacheBinary1.get(key), val);
-        validate((BinaryObject) cacheBinary2.get(key), val);
+        validate((BinaryObject)cacheBinary1.get(key), val);
+        validate((BinaryObject)cacheBinary2.get(key), val);
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index 0496816..d6abe5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -459,27 +459,27 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
             Object expVal = U.field(ctx.obj, fieldName);
 
             if (val instanceof BinaryObject)
-                val = ((BinaryObject) val).deserialize();
+                val = ((BinaryObject)val).deserialize();
 
             if (val != null && val.getClass().isArray()) {
                 assertNotNull(expVal);
 
                 if (val instanceof byte[])
-                    assertTrue(Arrays.equals((byte[]) expVal, (byte[]) val));
+                    assertTrue(Arrays.equals((byte[])expVal, (byte[])val));
                 else if (val instanceof boolean[])
-                    assertTrue(Arrays.equals((boolean[]) expVal, (boolean[]) val));
+                    assertTrue(Arrays.equals((boolean[])expVal, (boolean[])val));
                 else if (val instanceof short[])
-                    assertTrue(Arrays.equals((short[]) expVal, (short[]) val));
+                    assertTrue(Arrays.equals((short[])expVal, (short[])val));
                 else if (val instanceof char[])
-                    assertTrue(Arrays.equals((char[]) expVal, (char[]) val));
+                    assertTrue(Arrays.equals((char[])expVal, (char[])val));
                 else if (val instanceof int[])
-                    assertTrue(Arrays.equals((int[]) expVal, (int[]) val));
+                    assertTrue(Arrays.equals((int[])expVal, (int[])val));
                 else if (val instanceof long[])
-                    assertTrue(Arrays.equals((long[]) expVal, (long[]) val));
+                    assertTrue(Arrays.equals((long[])expVal, (long[])val));
                 else if (val instanceof float[])
-                    assertTrue(Arrays.equals((float[]) expVal, (float[]) val));
+                    assertTrue(Arrays.equals((float[])expVal, (float[])val));
                 else if (val instanceof double[])
-                    assertTrue(Arrays.equals((double[]) expVal, (double[]) val));
+                    assertTrue(Arrays.equals((double[])expVal, (double[])val));
                 else {
                     Object[] expVal0 = (Object[])expVal;
                     Object[] val0 = (Object[])val;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
index b73b389..e58d969 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
@@ -165,7 +165,7 @@ public class BinaryObjectBuilderDefaultMappersSelfTest extends GridCommonAbstrac
         assertEquals(expectedHashCode("Class"), po.type().typeId());
         assertEquals(BinaryArrayIdentityResolver.instance().hashCode(po), po.hashCode());
 
-        assertEquals((byte) 1, po.<Byte>field("byteField").byteValue());
+        assertEquals((byte)1, po.<Byte>field("byteField").byteValue());
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
index ddd4a92..130b375 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
@@ -566,7 +566,7 @@ public class BinarySerialiedFieldComparatorSelfTest extends GridCommonAbstractTe
                 builder.setField((String)parts[i++], parts[i++]);
         }
 
-        return (BinaryObjectImpl) builder.build();
+        return (BinaryObjectImpl)builder.build();
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessDiscoveryTest.java
index e911e2c..d761184 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessDiscoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessDiscoveryTest.java
@@ -142,7 +142,7 @@ public class ThinClientPartitionAwarenessDiscoveryTest extends ThinClientAbstrac
 
         ClientAddressFinder addrFinder = () ->
             IgnitionEx.allGrids().stream().map(node -> {
-                int port = (Integer) node.cluster().localNode().attributes().get(CLIENT_LISTENER_PORT);
+                int port = (Integer)node.cluster().localNode().attributes().get(CLIENT_LISTENER_PORT);
 
                 if (exclude.contains(port - DFLT_PORT))
                     return null;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java b/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java
index c9f8095..3a03daf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java
@@ -39,7 +39,7 @@ import org.junit.runners.Parameterized;
 public class FullyConnectedComponentSearcherTest {
     /** Per test timeout */
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /** Adjacency matrix provider for each test. */
     private AdjacencyMatrixProvider provider;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
index 69165f1..6917c42 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
@@ -243,7 +243,7 @@ public class DirectByteBufferStreamImplV2ByteOrderSelfTest {
         short[] arr = new short[ARR_LEN];
 
         for (int i = 0; i < ARR_LEN; i++)
-            arr[i] = (short) RND.nextInt();
+            arr[i] = (short)RND.nextInt();
 
         testWriteArrayInternal(arr, false, false, 1);
         testWriteArrayInternal(arr, false, true, 1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index f7f50f4..50f1a42 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -125,7 +125,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
     private GridCheckpointManager checkpoints(Ignite ignite) {
         assert ignite != null;
 
-        return ((IgniteKernal) ignite).context().checkpoint();
+        return ((IgniteKernal)ignite).context().checkpoint();
     }
 
     /** {@inheritDoc} */
@@ -190,7 +190,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 @Override public boolean apply(Event evt) {
                     assert evt instanceof CheckpointEvent;
 
-                    CheckpointEvent e = (CheckpointEvent) evt;
+                    CheckpointEvent e = (CheckpointEvent)evt;
 
                     info("Checkpoint event: " + e);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteCommunicationBalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteCommunicationBalanceTest.java
index 59e6b79..9ceb9e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteCommunicationBalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteCommunicationBalanceTest.java
@@ -123,7 +123,7 @@ public class IgniteCommunicationBalanceTest extends GridCommonAbstractTest {
             waitNioBalanceStop(Collections.singletonList(client), 10_000);
 
             final GridNioServer srv =
-                ((GridNioServerWrapper) GridTestUtils.getFieldValue(client.configuration().getCommunicationSpi(), "nioSrvWrapper")).nio();
+                ((GridNioServerWrapper)GridTestUtils.getFieldValue(client.configuration().getCommunicationSpi(), "nioSrvWrapper")).nio();
 
             ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
@@ -251,9 +251,9 @@ public class IgniteCommunicationBalanceTest extends GridCommonAbstractTest {
         final List<GridNioServer> srvs = new ArrayList<>();
 
         for (Ignite node : nodes) {
-            TcpCommunicationSpi spi = (TcpCommunicationSpi) node.configuration().getCommunicationSpi();
+            TcpCommunicationSpi spi = (TcpCommunicationSpi)node.configuration().getCommunicationSpi();
 
-            GridNioServer srv = ((GridNioServerWrapper) GridTestUtils.getFieldValue(spi, "nioSrvWrapper")).nio();
+            GridNioServer srv = ((GridNioServerWrapper)GridTestUtils.getFieldValue(spi, "nioSrvWrapper")).nio();
 
             srvs.add(srv);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDifferentLocalDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDifferentLocalDeploymentSelfTest.java
index bc02380..b11923f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDifferentLocalDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDifferentLocalDeploymentSelfTest.java
@@ -109,9 +109,9 @@ public class GridDifferentLocalDeploymentSelfTest extends GridCommonAbstractTest
 
         ClassLoader clsLdr2 = getExternalClassLoader();
 
-        Class<ComputeTask> taskCls11 = (Class<ComputeTask>) clsLdr1.loadClass(TASK_NAME1);
-        Class<ComputeTask> taskCls12 = (Class<ComputeTask>) clsLdr2.loadClass(TASK_NAME1);
-        Class<ComputeTask> taskCls21 = (Class<ComputeTask>) clsLdr2.loadClass(TASK_NAME2);
+        Class<ComputeTask> taskCls11 = (Class<ComputeTask>)clsLdr1.loadClass(TASK_NAME1);
+        Class<ComputeTask> taskCls12 = (Class<ComputeTask>)clsLdr2.loadClass(TASK_NAME1);
+        Class<ComputeTask> taskCls21 = (Class<ComputeTask>)clsLdr2.loadClass(TASK_NAME2);
 
         IgniteInternalFuture f1 = GridTestUtils.runAsync(() -> {
             for (int i = 0; i < 10; ++i) {
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 e68bc00..82257b8 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
@@ -119,7 +119,7 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA
 
             assert "true".equals(g.cluster().localNode().attribute(PREFER_IPV4));
 
-            checkIsClientFlag((IgniteEx) g);
+            checkIsClientFlag((IgniteEx)g);
         }
 
         System.setProperty(PREFER_IPV4, "false");
@@ -397,7 +397,7 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA
 
             assert val.equals(g.cluster().localNode().attribute(PREFER_IPV4));
 
-            checkIsClientFlag((IgniteEx) g);
+            checkIsClientFlag((IgniteEx)g);
         }
     }
 
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 d374ddb..575cd1b 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
@@ -2337,7 +2337,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
             if (!(obj instanceof NestedReadWriteObject))
                 return false;
 
-            NestedReadWriteObject o = (NestedReadWriteObject) obj;
+            NestedReadWriteObject o = (NestedReadWriteObject)obj;
 
             return o.val == val && Objects.equals(o.str, str) && Objects.equals(o.obj1, obj1)
                 && Objects.equals(o.obj2, obj2);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
index 620cd6e..d027d93 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
@@ -95,7 +95,7 @@ public class AtomicCacheAffinityConfigurationTest extends GridCommonAbstractTest
 
                 GridCacheContext cctx = GridTestUtils.getFieldValue(atomic, AtomicDataStructureProxy.class, "ctx");
 
-                TestAffinityFunction aff = (TestAffinityFunction) cctx.config().getAffinity();
+                TestAffinityFunction aff = (TestAffinityFunction)cctx.config().getAffinity();
 
                 assertNotNull(aff);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationAbstractTest.java
index 5cd16ee..70893da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationAbstractTest.java
@@ -145,7 +145,7 @@ public class CacheConfigurationSerializationAbstractTest extends GridCommonAbstr
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnDiscoveryTest.java
index 2ad1379..b106207 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnDiscoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnDiscoveryTest.java
@@ -65,7 +65,7 @@ public class CacheConfigurationSerializationOnDiscoveryTest extends CacheConfigu
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
 
         restartNodesAndCheck(persistenceEnabled);
     }
@@ -93,7 +93,7 @@ public class CacheConfigurationSerializationOnDiscoveryTest extends CacheConfigu
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
 
         restartNodesAndCheck(persistenceEnabled);
     }
@@ -123,7 +123,7 @@ public class CacheConfigurationSerializationOnDiscoveryTest extends CacheConfigu
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
 
         restartNodesAndCheck(persistenceEnabled);
     }
@@ -153,7 +153,7 @@ public class CacheConfigurationSerializationOnDiscoveryTest extends CacheConfigu
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
 
         restartNodesAndCheck(persistenceEnabled);
     }
@@ -183,7 +183,7 @@ public class CacheConfigurationSerializationOnDiscoveryTest extends CacheConfigu
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
 
         restartNodesAndCheck(persistenceEnabled);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnExchangeTest.java
index 5480bd6..dbd73f1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationSerializationOnExchangeTest.java
@@ -49,7 +49,7 @@ public class CacheConfigurationSerializationOnExchangeTest extends CacheConfigur
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
 
         restartNodesAndCheck(persistenceEnabled);
     }
@@ -73,7 +73,7 @@ public class CacheConfigurationSerializationOnExchangeTest extends CacheConfigur
         awaitPartitionMapExchange();
 
         for (Ignite node : G.allGrids())
-            checkCaches((IgniteEx) node);
+            checkCaches((IgniteEx)node);
 
         restartNodesAndCheck(persistenceEnabled);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupLocalConfigurationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupLocalConfigurationSelfTest.java
index bc176ff..b7f54d9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupLocalConfigurationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupLocalConfigurationSelfTest.java
@@ -112,7 +112,7 @@ public class CacheGroupLocalConfigurationSelfTest extends GridCommonAbstractTest
     private void executeTest() throws Exception {
         startGrid(0);
 
-        IgniteKernal ignite = (IgniteKernal) startGrid("secondNode");
+        IgniteKernal ignite = (IgniteKernal)startGrid("secondNode");
 
         GridCacheProcessor cacheProc = ignite.context().cache();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
index 4a51834..b085f40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
@@ -633,7 +633,7 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            TestValue that = (TestValue) o;
+            TestValue that = (TestValue)o;
 
             return val1.equals(that.val1) && val2.equals(that.val2);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
index c9dcfb7..56d5383 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
@@ -976,7 +976,7 @@ public class CacheInterceptorPartitionCounterRandomOperationsTest extends GridCo
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            TestValue that = (TestValue) o;
+            TestValue that = (TestValue)o;
 
             return val1.equals(that.val1) && val2.equals(that.val2);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java
index 286b1ba..6ef740b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java
@@ -669,7 +669,7 @@ public class CacheMetricsManageTest extends GridCommonAbstractTest {
             commSpi0.stopBlock();
         }
 
-        IgniteTxManager txManager = ((IgniteEx) ig).context().cache().context().tm();
+        IgniteTxManager txManager = ((IgniteEx)ig).context().cache().context().tm();
 
         assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() {
             @Override public boolean apply() {
@@ -790,7 +790,7 @@ public class CacheMetricsManageTest extends GridCommonAbstractTest {
 
         CacheMetricsMXBean mxBeanCache = mxBean(0, cacheName, CacheLocalMetricsMXBeanImpl.class);
 
-        IgniteTxManager txManager = ((IgniteEx) ig).context().cache().context().tm();
+        IgniteTxManager txManager = ((IgniteEx)ig).context().cache().context().tm();
 
         final TransactionsMXBean txMXBean1 = txMXBean(0);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java
index f293619..4dfc918 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNoAffinityExchangeTest.java
@@ -142,7 +142,7 @@ public class CacheNoAffinityExchangeTest extends GridCommonAbstractTest {
                 new AffinityTopologyVersion(4, 3).equals(grid(3).context().discovery().topologyVersionEx()),
             5_000));
 
-        TestDiscoverySpi discoSpi = (TestDiscoverySpi) grid(2).context().discovery().getInjectedDiscoverySpi();
+        TestDiscoverySpi discoSpi = (TestDiscoverySpi)grid(2).context().discovery().getInjectedDiscoverySpi();
 
         CountDownLatch latch = new CountDownLatch(1);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
index 0b03087..002e486 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
@@ -119,7 +119,7 @@ public class CacheRebalancingSelfTest extends GridCommonAbstractTest {
     private static IgniteInternalFuture internalFuture(IgniteFuture fut) {
         assertTrue(fut.toString(), fut instanceof IgniteFutureImpl);
 
-        return ((IgniteFutureImpl) fut).internalFuture();
+        return ((IgniteFutureImpl)fut).internalFuture();
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreTxPutAllMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreTxPutAllMultiNodeTest.java
index 8b50735..afc654c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreTxPutAllMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreTxPutAllMultiNodeTest.java
@@ -95,7 +95,7 @@ public class CacheStoreTxPutAllMultiNodeTest extends GridCommonAbstractTest {
 
         startGrid(3);
 
-        IgniteTxManager txMgr = ((IgniteEx) client).context().cache().context().tm();
+        IgniteTxManager txMgr = ((IgniteEx)client).context().cache().context().tm();
 
         long curTime = U.currentTimeMillis();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
index 0ee0906..892779f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
@@ -140,7 +140,7 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs
 
         assertTrue(((IgniteCacheProxy)cache0).context().store().configured());
         if (atomicityMode() != ATOMIC)
-            assertEquals(clientStore, ((IgniteCacheProxy) clientCache).context().store().configured());
+            assertEquals(clientStore, ((IgniteCacheProxy)clientCache).context().store().configured());
 
         List<TransactionConcurrency> tcList = new ArrayList<>();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java
index 4537c7d..a31feaf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java
@@ -78,7 +78,7 @@ public class ClientSlowDiscoveryAbstractTest extends GridCommonAbstractTest {
         /** {@inheritDoc} */
         @Override protected void startMessageProcess(TcpDiscoveryAbstractMessage msg) {
             if (msg instanceof TcpDiscoveryNodeAddFinishedMessage && interceptor != null)
-                interceptor.apply((TcpDiscoveryNodeAddFinishedMessage) msg);
+                interceptor.apply((TcpDiscoveryNodeAddFinishedMessage)msg);
         }
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTopologyChangeTest.java
index 0588432..6a3c021 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTopologyChangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTopologyChangeTest.java
@@ -68,7 +68,7 @@ public class ClientSlowDiscoveryTopologyChangeTest extends ClientSlowDiscoveryAb
      */
     @Test
     public void testClientJoinAndCacheStop() throws Exception {
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
 
         awaitPartitionMapExchange();
 
@@ -82,7 +82,7 @@ public class ClientSlowDiscoveryTopologyChangeTest extends ClientSlowDiscoveryAb
             if (!(msg instanceof GridDhtPartitionsSingleMessage))
                 return false;
 
-            GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage) msg;
+            GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage)msg;
 
             return Optional.ofNullable(singleMsg.exchangeId())
                 .map(GridDhtPartitionExchangeId::topologyVersion)
@@ -101,7 +101,7 @@ public class ClientSlowDiscoveryTopologyChangeTest extends ClientSlowDiscoveryAb
             if (!(msg instanceof DynamicCacheChangeBatch))
                 return;
 
-            DynamicCacheChangeBatch cacheChangeBatch = (DynamicCacheChangeBatch) msg;
+            DynamicCacheChangeBatch cacheChangeBatch = (DynamicCacheChangeBatch)msg;
 
             boolean hasCacheStopReq = cacheChangeBatch.requests().stream()
                 .anyMatch(req -> req.stop() && req.cacheName().equals(CACHE_NAME));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTransactionRemapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTransactionRemapTest.java
index b09ea99..d408333 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTransactionRemapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryTransactionRemapTest.java
@@ -456,7 +456,7 @@ public class ClientSlowDiscoveryTransactionRemapTest extends ClientSlowDiscovery
 
         // After resume second client join, transaction should be timed out and rolled back.
         if (concurrency == PESSIMISTIC) {
-            assertThrowsWithCause((Callable<Object>) txFut::get, TransactionTimeoutException.class);
+            assertThrowsWithCause((Callable<Object>)txFut::get, TransactionTimeoutException.class);
 
             // Check that initial data is not changed by rollbacked transaction.
             for (int k = 0; k < KEYS_SET; k++)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ConcurrentCacheStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ConcurrentCacheStartTest.java
index 0fdff92..f11a7e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ConcurrentCacheStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ConcurrentCacheStartTest.java
@@ -36,7 +36,7 @@ public class ConcurrentCacheStartTest extends GridCommonAbstractTest {
     @Test
     public void test() throws Exception {
         try {
-            final IgniteEx ignite = (IgniteEx) startGrids(4);
+            final IgniteEx ignite = (IgniteEx)startGrids(4);
 
             for (int k = 0; k < 100; k++) {
                 final String cacheName = "cache" + k;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
index 719b0fb..5110fc1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
@@ -276,7 +276,7 @@ public abstract class GridAbstractCacheInterceptorRebalanceTest extends GridComm
             final MutableEntry<Integer, Integer> entry,
             final Object... arguments
         ) throws EntryProcessorException {
-            entry.setValue((Integer) arguments[0]);
+            entry.setValue((Integer)arguments[0]);
 
             return null;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 62ed4ae..03d77a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -188,7 +188,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
     private void putAndRemove(long duration,
         final TransactionConcurrency txConcurrency,
         final TransactionIsolation txIsolation) throws Exception {
-        assertEquals(testClientNode(), (boolean) grid(0).configuration().isClientMode());
+        assertEquals(testClientNode(), (boolean)grid(0).configuration().isClientMode());
 
         grid(0).destroyCache(DEFAULT_CACHE_NAME);
 
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 e8221b9..6c82c44 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
@@ -463,7 +463,7 @@ public class GridCacheConcurrentTxMultiNodeLoadTest extends GridCommonAbstractTe
 
             doWork();
 
-            GridNearCacheAdapter near = (GridNearCacheAdapter)((IgniteKernal) ignite).internalCache(DEFAULT_CACHE_NAME);
+            GridNearCacheAdapter near = (GridNearCacheAdapter)((IgniteKernal)ignite).internalCache(DEFAULT_CACHE_NAME);
             GridDhtCacheAdapter dht = near.dht();
 
             long start = cntrs.get2().get();
@@ -698,7 +698,7 @@ public class GridCacheConcurrentTxMultiNodeLoadTest extends GridCommonAbstractTe
         private <T> Object get(String cacheKey, String terminalId) {
             Object key = new AffinityKey<>(cacheKey, terminalId);
 
-            return (T) ignite.cache(DEFAULT_CACHE_NAME).get(key);
+            return (T)ignite.cache(DEFAULT_CACHE_NAME).get(key);
         }
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
index ae77b81..179eae5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
@@ -104,9 +104,9 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr
 
         g.events().localListen(new IgnitePredicate<Event>() {
             @Override public boolean apply(Event evt) {
-                CacheEvent e = (CacheEvent) evt;
+                CacheEvent e = (CacheEvent)evt;
 
-                oldVal.set((String) e.oldValue());
+                oldVal.set((String)e.oldValue());
 
                 latch.countDown();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLongRunningTransactionDiagnosticsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLongRunningTransactionDiagnosticsTest.java
index 891634e..5db06ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLongRunningTransactionDiagnosticsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLongRunningTransactionDiagnosticsTest.java
@@ -171,7 +171,7 @@ public class GridCacheLongRunningTransactionDiagnosticsTest extends GridCommonAb
 
         client.context().io().addMessageListener(
             GridTopic.TOPIC_JOB,
-            (nodeId, msg, plc) -> taskNameContainer.append(((GridJobExecuteRequest) msg).getTaskName())
+            (nodeId, msg, plc) -> taskNameContainer.append(((GridJobExecuteRequest)msg).getTaskName())
         );
 
         try (Transaction tx = client.transactions().txStart(PESSIMISTIC, REPEATABLE_READ, TX_TIMEOUT, 1)) {
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 ac7d90c..5c54020 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
@@ -513,7 +513,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCommonAbst
 
             if (o == null || getClass() != o.getClass()) return false;
 
-            TestKey testKey = (TestKey) o;
+            TestKey testKey = (TestKey)o;
 
             return key == testKey.key;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java
index ca05a4a..5ae8595 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java
@@ -67,7 +67,7 @@ public class GridCacheQueryEmbeddedValue implements Serializable {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        GridCacheQueryEmbeddedValue that = (GridCacheQueryEmbeddedValue) o;
+        GridCacheQueryEmbeddedValue that = (GridCacheQueryEmbeddedValue)o;
 
         if (embeddedField1 != that.embeddedField1) return false;
         if (embeddedField2 != that.embeddedField2) return false;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
index adadb1a..248adc7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
@@ -333,7 +333,7 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            final TestObj testObj = (TestObj) o;
+            final TestObj testObj = (TestObj)o;
 
             return val != null ? val.equals(testObj.val) : testObj.val == null;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
index 2f2042b..b5f73f900b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
@@ -142,7 +142,7 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
                                 cache.put(i, i);
 
                             for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++) {
-                                assertEquals(i, (int) cache.get(i));
+                                assertEquals(i, (int)cache.get(i));
 
                                 if (isNearCacheNode)
                                     assertEquals((Integer)i, cache.localPeek(i, CachePeekMode.ONHEAP));
@@ -188,6 +188,6 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
             cache.put(i, i);
 
         for (int i = 100; i < 200; i++)
-            assertEquals(i, (int) cache.get(i));
+            assertEquals(i, (int)cache.get(i));
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalIgniteSerializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalIgniteSerializationTest.java
index ffd263c..c8495c9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalIgniteSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridLocalIgniteSerializationTest.java
@@ -173,7 +173,7 @@ public class GridLocalIgniteSerializationTest extends GridCommonAbstractTest {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            final SimpleTestObject simpleTestObj = (SimpleTestObject) o;
+            final SimpleTestObject simpleTestObj = (SimpleTestObject)o;
 
             return val != null ? val.equals(simpleTestObj.val) : simpleTestObj.val == null;
 
@@ -241,7 +241,7 @@ public class GridLocalIgniteSerializationTest extends GridCommonAbstractTest {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            final SerializableTestObject that = (SerializableTestObject) o;
+            final SerializableTestObject that = (SerializableTestObject)o;
 
             return val != null ? val.equals(that.val) : that.val == null;
 
@@ -303,7 +303,7 @@ public class GridLocalIgniteSerializationTest extends GridCommonAbstractTest {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            final ExternalizableTestObject that = (ExternalizableTestObject) o;
+            final ExternalizableTestObject that = (ExternalizableTestObject)o;
 
             return val != null ? val.equals(that.val) : that.val == null;
 
@@ -362,7 +362,7 @@ public class GridLocalIgniteSerializationTest extends GridCommonAbstractTest {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            final BinarylizableTestObject that = (BinarylizableTestObject) o;
+            final BinarylizableTestObject that = (BinarylizableTestObject)o;
 
             return val != null ? val.equals(that.val) : that.val == null;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridTransactionsSystemUserTimeMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridTransactionsSystemUserTimeMetricsTest.java
index af2a130..c492fbc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridTransactionsSystemUserTimeMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridTransactionsSystemUserTimeMetricsTest.java
@@ -277,7 +277,7 @@ public class GridTransactionsSystemUserTimeMetricsTest extends GridCommonAbstrac
             igniteEx.context().distributedMetastorage().listen(
                     (key) -> key.startsWith(DIST_CONF_PREFIX),
                     (String key, Serializable oldVal, Serializable newVal) -> {
-                        if (key.endsWith("longTransactionTimeDumpThreshold") && (long) newVal == threshold)
+                        if (key.endsWith("longTransactionTimeDumpThreshold") && (long)newVal == threshold)
                             thresholdLatch.countDown();
                     });
 
@@ -288,7 +288,7 @@ public class GridTransactionsSystemUserTimeMetricsTest extends GridCommonAbstrac
             igniteEx.context().distributedMetastorage().listen(
                     (key) -> key.startsWith(DIST_CONF_PREFIX),
                     (String key, Serializable oldVal, Serializable newVal) -> {
-                        if (key.endsWith("transactionTimeDumpSamplesCoefficient") && (double) newVal == coefficient)
+                        if (key.endsWith("transactionTimeDumpSamplesCoefficient") && (double)newVal == coefficient)
                             coefficientLatch.countDown();
                     });
 
@@ -299,7 +299,7 @@ public class GridTransactionsSystemUserTimeMetricsTest extends GridCommonAbstrac
             igniteEx.context().distributedMetastorage().listen(
                     (key) -> key.startsWith(DIST_CONF_PREFIX),
                     (String key, Serializable oldVal, Serializable newVal) -> {
-                        if (key.endsWith("longTransactionTimeDumpSamplesPerSecondLimit") && (int) newVal == limit)
+                        if (key.endsWith("longTransactionTimeDumpSamplesPerSecondLimit") && (int)newVal == limit)
                             limitLatch.countDown();
                     });
 
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 032eb0d..3dd794f 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
@@ -222,7 +222,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst
             @Override public Integer call() throws Exception {
                 info("Start operation.");
 
-                Integer put = (Integer) clientCache().get(1);
+                Integer put = (Integer)clientCache().get(1);
 
                 info("Stop operation.");
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
index 6c5e7c1..c945c0c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
@@ -224,7 +224,7 @@ public class IgniteCacheBinaryEntryProcessorSelfTest extends GridCommonAbstractT
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            TestValue testVal = (TestValue) o;
+            TestValue testVal = (TestValue)o;
 
             return val.equals(testVal.val);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 8433f54..1367d64 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -2472,7 +2472,7 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
         tx = txShouldBeUsed() ? transactions().txStart() : null;
 
         try {
-            assertEquals(1, (int) cache.getAndPutIfAbsentAsync("key2", 3).get());
+            assertEquals(1, (int)cache.getAndPutIfAbsentAsync("key2", 3).get());
 
             if (tx != null)
                 tx.commit();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index 67496fc..ad0e67b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -1517,7 +1517,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            ListenerTestValue that = (ListenerTestValue) o;
+            ListenerTestValue that = (ListenerTestValue)o;
 
             return val1.equals(that.val1) && val2.equals(that.val2);
         }
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 65f5df6..e952c80 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
@@ -4228,7 +4228,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
             if (key instanceof MapperTestKey1)
                 return ((MapperTestKey1)key).p1;
             else if (key instanceof BinaryObject)
-                ((BinaryObject) key).field("p1");
+                ((BinaryObject)key).field("p1");
 
             return key;
         }
@@ -4248,7 +4248,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
             if (key instanceof MapperTestKey1)
                 return ((MapperTestKey1)key).p2;
             else if (key instanceof BinaryObject)
-                ((BinaryObject) key).field("p2");
+                ((BinaryObject)key).field("p2");
 
             return key;
         }
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 b922436..29bba06 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
@@ -864,7 +864,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
 
                 assertTrue(e.exists());
 
-                assertEquals(val + 1, (int) e.getValue());
+                assertEquals(val + 1, (int)e.getValue());
 
                 return val;
             }
@@ -987,7 +987,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            TestValue testVal = (TestValue) o;
+            TestValue testVal = (TestValue)o;
 
             return val.equals(testVal.val);
 
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 c67444c..e1004aa 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
@@ -397,9 +397,9 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
                 assertEquals(size, cache0.size(NEAR));
                 assertEquals(size, cache0.size(ALL));
 
-                assertEquals(size, (int) cache0.sizeAsync().get());
+                assertEquals(size, (int)cache0.sizeAsync().get());
 
-                assertEquals(size, (int) cache0.sizeAsync(PRIMARY).get());
+                assertEquals(size, (int)cache0.sizeAsync(PRIMARY).get());
             }
 
             for (int i = 0; i < HEAP_ENTRIES; i++) {
@@ -419,7 +419,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
                 assertEquals(size, cache0.size(NEAR));
                 assertEquals(size, cache0.size(ALL));
 
-                assertEquals(size, (int) cache0.sizeAsync().get());
+                assertEquals(size, (int)cache0.sizeAsync().get());
             }
 
             checkEmpty();
@@ -509,9 +509,9 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
             assertEquals(size, cache0.sizeLong(part, NEAR));
             assertEquals(size, cache0.sizeLong(part, ALL));
 
-            assertEquals(size, (long) cache0.sizeAsync().get());
+            assertEquals(size, (long)cache0.sizeAsync().get());
 
-            assertEquals(size, (long) cache0.sizeLongAsync(part, PRIMARY).get());
+            assertEquals(size, (long)cache0.sizeLongAsync(part, PRIMARY).get());
         }
 
         for (int i = 0; i < HEAP_ENTRIES; i++) {
@@ -531,7 +531,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
             assertEquals(size, cache0.sizeLong(part, NEAR));
             assertEquals(size, cache0.sizeLong(part, ALL));
 
-            assertEquals(size, (long) cache0.sizeAsync().get());
+            assertEquals(size, (long)cache0.sizeAsync().get());
         }
     }
 
@@ -1276,7 +1276,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
 
             size += cache.localSize(PRIMARY);
 
-            assertEquals(exp, (int) cache.sizeAsync(PRIMARY).get());
+            assertEquals(exp, (int)cache.sizeAsync(PRIMARY).get());
         }
 
         assertEquals(exp, size);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java
index 8844d7b..1bf47cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheStartFailoverTest.java
@@ -268,7 +268,7 @@ public class IgniteClientCacheStartFailoverTest extends GridCommonAbstractTest {
         TestRecordingCommunicationSpi.spi(ignite(0)).blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 return msg instanceof GridDhtPartitionsFullMessage &&
-                    ((GridDhtPartitionsFullMessage) msg).exchangeId() == null;
+                    ((GridDhtPartitionsFullMessage)msg).exchangeId() == null;
             }
         });
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
index ad0daa5..6649072 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
@@ -520,7 +520,7 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl
 
                 Assert.assertNotNull("node=" + ignite.name() + ", key=" + k, val);
 
-                Assert.assertTrue("node=" + ignite.name() + ", key=" + k + ", val=" + val, (int) val == k);
+                Assert.assertTrue("node=" + ignite.name() + ", key=" + k + ", val=" + val, (int)val == k);
             }
 
             for (int k : addedKeys) {
@@ -528,7 +528,7 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl
 
                 Assert.assertNotNull("node=" + ignite.name() + ", key=" + k, val);
 
-                Assert.assertTrue("node=" + ignite.name() + ", key=" + k + ", val=" + val, (int) val == k);
+                Assert.assertTrue("node=" + ignite.name() + ", key=" + k + ", val=" + val, (int)val == k);
             }
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java
index 8898140..0c34afb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java
@@ -156,7 +156,7 @@ public class IgniteDynamicCacheStartCoordinatorFailoverTest extends GridCommonAb
             cache.put(i, i);
 
         for (int i = 0; i < cnt; ++i) {
-            Integer v = (Integer) cache.get(i);
+            Integer v = (Integer)cache.get(i);
 
             assertNotNull(v);
             assertEquals(i, v.intValue());
@@ -189,9 +189,9 @@ public class IgniteDynamicCacheStartCoordinatorFailoverTest extends GridCommonAb
                 GridIoMessage msg0 = (GridIoMessage)msg;
 
                 if (msg0.message() instanceof GridDhtPartitionsSingleMessage) {
-                    Boolean attr = (Boolean) node.attributes().get(COORDINATOR_ATTRIBUTE);
+                    Boolean attr = (Boolean)node.attributes().get(COORDINATOR_ATTRIBUTE);
 
-                    GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage) msg0.message();
+                    GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage)msg0.message();
 
                     Exception err = singleMsg.getError();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java
index 72d9f9c..6985f91 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java
@@ -47,7 +47,7 @@ public class IgniteIncompleteCacheObjectSelfTest extends GridCommonAbstractTest
         int off = 0;
         int len = 3;
 
-        final TestCacheObject obj = new TestCacheObject((byte) 1);
+        final TestCacheObject obj = new TestCacheObject((byte)1);
 
         // Write part of the cache object and cut on header (3 bytes instead of 5)
         assert CacheObjectAdapter.putValue(obj.cacheObjectType(), dataBuf, off, len, data, 0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java
index c1ad6e0..ed89fb9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java
@@ -197,7 +197,7 @@ public class IgniteMarshallerCacheClassNameConflictTest extends GridCommonAbstra
                 DiscoveryNotification notification
             ) {
                 DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null
-                        : (DiscoveryCustomMessage) U.field(notification.getCustomMsgData(), "delegate");
+                        : (DiscoveryCustomMessage)U.field(notification.getCustomMsgData(), "delegate");
 
                 if (customMsg != null) {
                     //don't want to make this class public, using equality of class name instead of instanceof operator
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 f65370b..c523792 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
@@ -211,7 +211,7 @@ public class IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest {
             startGrid(0);
         }
         catch (IgniteCheckedException e) {
-            verifyException((IgniteCheckedException) e.getCause());
+            verifyException((IgniteCheckedException)e.getCause());
         }
     }
 
@@ -258,7 +258,7 @@ public class IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest {
                 DiscoveryNotification notification
             ) {
                 DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null
-                    : (DiscoveryCustomMessage) U.field(notification.getCustomMsgData(), "delegate");
+                    : (DiscoveryCustomMessage)U.field(notification.getCustomMsgData(), "delegate");
 
                 if (customMsg != null) {
                     //don't want to make this class public, using equality of class name instead of instanceof operator
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
index 8aac685..e9591de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
@@ -138,7 +138,7 @@ public class IgniteTxConfigCacheSelfTest extends GridCommonAbstractTest {
      * @return Internal cache instance.
      */
     protected IgniteInternalCache<Object, Object> getSystemCache(final Ignite ignite, final String cacheName) {
-        return ((IgniteKernal) ignite).context().cache().cache(cacheName);
+        return ((IgniteKernal)ignite).context().cache().cache(cacheName);
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
index cf7ccf7..3cd0959 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
@@ -392,7 +392,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             onRemoveItemQueried(putCntr, ignite, i);
 
             if (i % 50 == 0)
-                ((IgniteKernal) ignite).internalCache(DEFAULT_CACHE_NAME).context().tm().printMemoryStats();
+                ((IgniteKernal)ignite).internalCache(DEFAULT_CACHE_NAME).context().tm().printMemoryStats();
         }
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java
index 540f343..a1a18f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java
@@ -248,7 +248,7 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
             final int delay = 5_000;
 
             if (msg instanceof GridDhtPartitionDemandMessage) {
-                GridDhtPartitionDemandMessage demandMsg = (GridDhtPartitionDemandMessage) msg;
+                GridDhtPartitionDemandMessage demandMsg = (GridDhtPartitionDemandMessage)msg;
 
                 if (demandMsg.groupId() == GridCacheUtils.cacheId(GridCacheUtils.UTILITY_CACHE_NAME))
                     return 0;
@@ -271,7 +271,7 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
             final int delay = 1_000;
 
             if (msg instanceof GridDhtPartitionsSingleMessage) {
-                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage) msg;
+                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage)msg;
 
                 if (singleMsg.exchangeId() != null)
                     return delay;
@@ -288,7 +288,7 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
             final int delay = 5_000;
 
             if (msg instanceof GridDhtPartitionsSingleMessage) {
-                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage) msg;
+                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage)msg;
 
                 if (singleMsg.exchangeId() != null)
                     return delay;
@@ -349,7 +349,7 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
             final int delay = 5_000;
 
             if (msg instanceof GridDhtPartitionsSingleMessage) {
-                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage) msg;
+                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage)msg;
 
                 if (singleMsg.exchangeId() != null) {
                     joiningNodeSentSingleMsg.countDown();
@@ -383,14 +383,14 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
         awaitPartitionMapExchange();
 
         // Check that affinity are equal on all nodes.
-        AffinityTopologyVersion affVer = ((IgniteEx) ignite(1)).cachex(CACHE_NAME)
+        AffinityTopologyVersion affVer = ((IgniteEx)ignite(1)).cachex(CACHE_NAME)
             .context().shared().exchange().readyAffinityVersion();
 
         List<List<ClusterNode>> expAssignment = null;
         IgniteEx expAssignmentNode = null;
 
         for (Ignite node : G.allGrids()) {
-            IgniteEx nodeEx = (IgniteEx) node;
+            IgniteEx nodeEx = (IgniteEx)node;
 
             List<List<ClusterNode>> assignment = nodeEx.cachex(CACHE_NAME).context().affinity().assignments(affVer);
 
@@ -464,7 +464,7 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
         // Delay sending full messages (without exchange id).
         spi.blockMessages((node, msg) -> {
             if (msg instanceof GridDhtPartitionsFullMessage) {
-                GridDhtPartitionsFullMessage fullMsg = (GridDhtPartitionsFullMessage) msg;
+                GridDhtPartitionsFullMessage fullMsg = (GridDhtPartitionsFullMessage)msg;
 
                 if (fullMsg.exchangeId() != null && pred.test(node)) {
                     log.warning("Blocked sending " + msg + " to " + node);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/SetTxTimeoutOnPartitionMapExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/SetTxTimeoutOnPartitionMapExchangeTest.java
index d0d1001..11c4af5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/SetTxTimeoutOnPartitionMapExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/SetTxTimeoutOnPartitionMapExchangeTest.java
@@ -126,7 +126,7 @@ public class SetTxTimeoutOnPartitionMapExchangeTest extends GridCommonAbstractTe
      */
     @Test
     public void testSetTxTimeoutDuringPartitionMapExchange() throws Exception {
-        IgniteEx ig = (IgniteEx) startGrids(2);
+        IgniteEx ig = (IgniteEx)startGrids(2);
 
         checkSetTxTimeoutDuringPartitionMapExchange(ig);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/TransactionValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/TransactionValidationTest.java
index 5813aed..14e1d49 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/TransactionValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/TransactionValidationTest.java
@@ -98,7 +98,7 @@ public class TransactionValidationTest extends GridCommonAbstractTest {
         try (Transaction tx = txCrd.transactions().txStart()) {
             cache0.put(1, 1);
 
-            boolean isNearCache = ((GatewayProtectedCacheProxy) cache1).context().cache() instanceof GridNearTransactionalCache;
+            boolean isNearCache = ((GatewayProtectedCacheProxy)cache1).context().cache() instanceof GridNearTransactionalCache;
 
             if (nearCache)
                 assertTrue("Must be near cache", isNearCache);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
index 9b1067a..d909701 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
@@ -108,7 +108,7 @@ public class WalModeChangeAdvancedSelfTest extends WalModeChangeCommonAbstractSe
         for (int i = 0; i < 10; i++)
             cache1.put(i, i);
 
-        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager) ((IgniteEx)srv).context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager)((IgniteEx)srv).context().cache().context().database();
 
         dbMrg0.forceCheckpoint("cp").futureFor(CheckpointState.FINISHED).get();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java
index 944b85d9..8c1bb48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java
@@ -244,7 +244,7 @@ public abstract class WalModeChangeCommonAbstractSelfTest extends GridCommonAbst
         }
         catch (Exception e) {
             if (jdbc) {
-                e = (Exception) e.getCause();
+                e = (Exception)e.getCause();
 
                 assert e instanceof SQLException : e.getClass().getName();
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java
index bed00ac..d8def5d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java
@@ -199,11 +199,11 @@ public class BinaryMetadataUpdatesFlowTest extends GridCommonAbstractTest {
         discoveryHook = new DiscoveryHook() {
             @Override public void beforeDiscovery(DiscoveryCustomMessage customMsg) {
                 if (customMsg instanceof MetadataUpdateProposedMessage) {
-                    if (((MetadataUpdateProposedMessage) customMsg).typeId() == BINARY_TYPE_ID)
+                    if (((MetadataUpdateProposedMessage)customMsg).typeId() == BINARY_TYPE_ID)
                         GridTestUtils.setFieldValue(customMsg, "typeId", 1);
                 }
                 else if (customMsg instanceof MetadataUpdateAcceptedMessage) {
-                    if (((MetadataUpdateAcceptedMessage) customMsg).typeId() == BINARY_TYPE_ID)
+                    if (((MetadataUpdateAcceptedMessage)customMsg).typeId() == BINARY_TYPE_ID)
                         GridTestUtils.setFieldValue(customMsg, "typeId", 1);
                 }
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
index 4bcbd7d..39b393b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
@@ -185,7 +185,7 @@ public class GridCacheBinaryObjectMetadataExchangeMultinodeTest extends GridComm
             @Override public Object call() throws Exception {
                 barrier.await(MAX_AWAIT, TimeUnit.MILLISECONDS);
 
-                return ((BinaryObject) ignite2.cache(DEFAULT_CACHE_NAME).withKeepBinary().get(1)).field("f1");
+                return ((BinaryObject)ignite2.cache(DEFAULT_CACHE_NAME).withKeepBinary().get(1)).field("f1");
             }
         });
 
@@ -211,7 +211,7 @@ public class GridCacheBinaryObjectMetadataExchangeMultinodeTest extends GridComm
             }
         }).get();
 
-        int fld = ((BinaryObject) ignite0.cache(DEFAULT_CACHE_NAME).withKeepBinary().get(1)).field(intFieldName);
+        int fld = ((BinaryObject)ignite0.cache(DEFAULT_CACHE_NAME).withKeepBinary().get(1)).field(intFieldName);
 
         assertEquals(fld, 101);
 
@@ -308,11 +308,11 @@ public class GridCacheBinaryObjectMetadataExchangeMultinodeTest extends GridComm
         discoveryHook = new DiscoveryHook() {
             @Override public void beforeDiscovery(DiscoveryCustomMessage customMsg) {
                 if (customMsg instanceof MetadataUpdateProposedMessage) {
-                    if (((MetadataUpdateProposedMessage) customMsg).typeId() == BINARY_TYPE_ID)
+                    if (((MetadataUpdateProposedMessage)customMsg).typeId() == BINARY_TYPE_ID)
                         GridTestUtils.setFieldValue(customMsg, "typeId", 1);
                 }
                 else if (customMsg instanceof MetadataUpdateAcceptedMessage) {
-                    if (((MetadataUpdateAcceptedMessage) customMsg).typeId() == BINARY_TYPE_ID)
+                    if (((MetadataUpdateAcceptedMessage)customMsg).typeId() == BINARY_TYPE_ID)
                         GridTestUtils.setFieldValue(customMsg, "typeId", 1);
                 }
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index c295d71..c4ebc18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -517,7 +517,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
         assertTrue(bObj instanceof BinaryObject);
         assertEquals(Collections.singletonList(null).getClass(), cBinary.getClass());
 
-        assertEquals(Integer.valueOf(123), ((BinaryObject) bObj).field("val"));
+        assertEquals(Integer.valueOf(123), ((BinaryObject)bObj).field("val"));
     }
 
     /**
@@ -1438,7 +1438,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            ComplexBinaryFieldsListHashedKey that = (ComplexBinaryFieldsListHashedKey) o;
+            ComplexBinaryFieldsListHashedKey that = (ComplexBinaryFieldsListHashedKey)o;
 
             return secondField.equals(that.secondField) &&
                 thirdField.equals(that.thirdField);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
index f318efd..11c9690 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
@@ -221,7 +221,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
 
             boolean client = i > 3;
 
-            assertEquals((Object) client, ignite(i).configuration().isClientMode());
+            assertEquals((Object)client, ignite(i).configuration().isClientMode());
 
             binaries = ignite(i).binary();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 8d5ff67..c6465eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -146,7 +146,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr
      */
     private void assertSetIteratorsCleared() {
         for (int i = 0; i < gridCount(); i++) {
-            IgniteKernal grid = (IgniteKernal) grid(i);
+            IgniteKernal grid = (IgniteKernal)grid(i);
 
             for (IgniteCache cache : grid.caches()) {
                 GridCacheQueryManager queries = grid.internalCache(cache.getName()).context().queries();
@@ -154,7 +154,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr
                 Map map = GridTestUtils.getFieldValue(queries, GridCacheQueryManager.class, "qryIters");
 
                 for (Object obj : map.values())
-                    assertEquals("Iterators not removed for grid " + i, 0, ((Map) obj).size());
+                    assertEquals("Iterators not removed for grid " + i, 0, ((Map)obj).size());
             }
         }
     }
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 0f587aa..f85c5c5 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
@@ -1644,7 +1644,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe
                                 l.lock();
 
                                 try {
-                                    long opsCounter = (long) ignite.getOrCreateCache(OPS_COUNTER).get(OPS_COUNTER);
+                                    long opsCounter = (long)ignite.getOrCreateCache(OPS_COUNTER).get(OPS_COUNTER);
 
                                     if (opsCounter == opsCount)
                                         break;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
index 2ba0eba..e58b643 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
@@ -333,9 +333,9 @@ public abstract class IgniteSemaphoreAbstractSelfTest extends IgniteAtomicsAbstr
         Runnable runnable = new Runnable() {
             /** {@inheritDoc} */
             @Override public void run() {
-                IgniteFutureImpl impl = (IgniteFutureImpl<Integer>) igniteFuture;
+                IgniteFutureImpl impl = (IgniteFutureImpl<Integer>)igniteFuture;
 
-                GridFutureAdapter fut = (GridFutureAdapter) (impl.internalFuture());
+                GridFutureAdapter fut = (GridFutureAdapter)(impl.internalFuture());
                 fut.onDone(true);
             }
         };
@@ -377,9 +377,9 @@ public abstract class IgniteSemaphoreAbstractSelfTest extends IgniteAtomicsAbstr
                     @Override public void run() {
                         try {
                             Thread.sleep(1000);
-                            IgniteFutureImpl impl = (IgniteFutureImpl<Integer>) igniteFuture;
+                            IgniteFutureImpl impl = (IgniteFutureImpl<Integer>)igniteFuture;
 
-                            GridFutureAdapter fut = (GridFutureAdapter) (impl.internalFuture());
+                            GridFutureAdapter fut = (GridFutureAdapter)(impl.internalFuture());
                             fut.onDone(true);
                         } catch (InterruptedException e) {
                             throw new RuntimeException(e.getMessage());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
index f4ef208..1a7999b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
@@ -156,9 +156,9 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac
             assert PARTITIONED == grid(i).cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class).getCacheMode();
 
             try (Transaction tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
-                Integer val = (Integer) grid(i).cache(DEFAULT_CACHE_NAME).get(key);
+                Integer val = (Integer)grid(i).cache(DEFAULT_CACHE_NAME).get(key);
 
-                assertEquals("Simple check failed for node: " + i, (Integer) i, val);
+                assertEquals("Simple check failed for node: " + i, (Integer)i, val);
 
                 grid(i).cache(DEFAULT_CACHE_NAME).put(key, i + 1);
 
@@ -183,11 +183,11 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac
             try (Transaction tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
                 GridCacheInternalKey key = new GridCacheInternalKeyImpl(name, "testGroup");
 
-                GridCacheAtomicLongValue atomicVal = ((GridCacheAtomicLongValue) grid(i).cache(DEFAULT_CACHE_NAME).get(key));
+                GridCacheAtomicLongValue atomicVal = ((GridCacheAtomicLongValue)grid(i).cache(DEFAULT_CACHE_NAME).get(key));
 
                 assertNotNull(atomicVal);
 
-                assertEquals("Custom check failed for node: " + i, (long) i, atomicVal.get());
+                assertEquals("Custom check failed for node: " + i, (long)i, atomicVal.get());
 
                 atomicVal.set(i + 1);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index 956270e..89bce14 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -560,7 +560,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
 
         int key = 1;
 
-        List<ClusterNode> affNodes = (List<ClusterNode>) ig.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
+        List<ClusterNode> affNodes = (List<ClusterNode>)ig.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
         assert affNodes.size() == 2;
 
@@ -646,7 +646,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
 
         int key = 1;
 
-        List<ClusterNode> affNodes = (List<ClusterNode>) ig.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
+        List<ClusterNode> affNodes = (List<ClusterNode>)ig.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
         assert affNodes.size() == 2;
 
@@ -724,7 +724,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
 
         awaitPartitionMapExchange();
 
-        affNodes = (List<ClusterNode>) ig.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
+        affNodes = (List<ClusterNode>)ig.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
         assertEquals(primary.localNode(), affNodes.get(0));
         assertEquals(backup.localNode(), affNodes.get(1));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
index f170a6f..2372a9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
@@ -1358,11 +1358,11 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest {
             ClusterNode locNode = node.cluster().localNode();
 
             if (crdNode == null || locNode.order() < crdNode.localNode().order())
-                crdNode = (IgniteEx) node;
+                crdNode = (IgniteEx)node;
         }
 
         for (Ignite node : nodes) {
-            IgniteEx node0 = (IgniteEx) node;
+            IgniteEx node0 = (IgniteEx)node;
 
             if (node0.localNode().id().equals(crdNode.localNode().id()))
                 continue;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index a23d96b..60649f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -1394,7 +1394,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
         awaitPartitionMapExchange();
 
         TestRecordingCommunicationSpi spi0 =
-            (TestRecordingCommunicationSpi) ignite0.configuration().getCommunicationSpi(), spi2, spi3;
+            (TestRecordingCommunicationSpi)ignite0.configuration().getCommunicationSpi(), spi2, spi3;
 
         // Prevent exchange completion.
         spi0.blockMessages(GridDhtPartitionsFullMessage.class, ignite2.name());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java
index ceaa17b..6cd5d2e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java
@@ -339,7 +339,7 @@ public class CachePartitionLostAfterSupplierHasLeftTest extends GridCommonAbstra
         TestRecordingCommunicationSpi.spi(grid(0)).blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionSupplyMessage) {
-                    GridDhtPartitionSupplyMessage msg0 = (GridDhtPartitionSupplyMessage) msg;
+                    GridDhtPartitionSupplyMessage msg0 = (GridDhtPartitionSupplyMessage)msg;
 
                     return msg0.groupId() == CU.cacheId(DEFAULT_CACHE_NAME);
                 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
index 4bbece7..3a7a3fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
@@ -105,7 +105,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
     public void testPrimaryAndBackupDead() throws Exception {
         backupCnt = 1;
 
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(4);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(4);
 
         crd.cluster().baselineAutoAdjustEnabled(false);
         crd.cluster().active(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
index 244fe0a..3b6ee28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
@@ -199,7 +199,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb
                 return true;
 
             if (obj instanceof MyValue) {
-                MyValue myObj = (MyValue) obj;
+                MyValue myObj = (MyValue)obj;
 
                 return data.equals(myObj.data);
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index a517611..4ca2763 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -1471,7 +1471,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
         assertTrue(((GridNearTxPrepareRequest)msgs.get(0)).firstClientRequest());
 
         for (int i = 1; i < msgs.size(); i++)
-            assertFalse(((GridNearTxPrepareRequest) msgs.get(i)).firstClientRequest());
+            assertFalse(((GridNearTxPrepareRequest)msgs.get(i)).firstClientRequest());
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
index 9fa226d..60ad7c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
@@ -465,9 +465,9 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
 
             for (int i = 0; i < 100; i++) {
                 try (Transaction tx = g0.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
-                    Integer val = (Integer) g0.cache(DEFAULT_CACHE_NAME).get(i);
+                    Integer val = (Integer)g0.cache(DEFAULT_CACHE_NAME).get(i);
 
-                    assertEquals((Integer) i, val);
+                    assertEquals((Integer)i, val);
                 }
             }
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
index 22f8f4a..b066b64 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
@@ -98,7 +98,7 @@ public class GridCachePartitionsStateValidationTest extends GridCommonAbstractTe
      */
     @Test
     public void testValidationIfPartitionCountersAreInconsistent() throws Exception {
-        IgniteEx ignite = (IgniteEx) startGrids(2);
+        IgniteEx ignite = (IgniteEx)startGrids(2);
         ignite.cluster().active(true);
 
         awaitPartitionMapExchange();
@@ -159,7 +159,7 @@ public class GridCachePartitionsStateValidationTest extends GridCommonAbstractTe
 
         for (int it = 0; it < 10; it++) {
             SingleMessageInterceptorCommunicationSpi spi =
-                (SingleMessageInterceptorCommunicationSpi) ignite.configuration().getCommunicationSpi();
+                (SingleMessageInterceptorCommunicationSpi)ignite.configuration().getCommunicationSpi();
             spi.clear();
 
             // Stop load future.
@@ -274,8 +274,8 @@ public class GridCachePartitionsStateValidationTest extends GridCommonAbstractTe
 
         /** {@inheritDoc} */
         @Override public void sendMessage(ClusterNode node, Message msg, IgniteInClosure<IgniteException> ackC) throws IgniteSpiException {
-            if (((GridIoMessage) msg).message() instanceof GridDhtPartitionsSingleMessage) {
-                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage) ((GridIoMessage) msg).message();
+            if (((GridIoMessage)msg).message() instanceof GridDhtPartitionsSingleMessage) {
+                GridDhtPartitionsSingleMessage singleMsg = (GridDhtPartitionsSingleMessage)((GridIoMessage)msg).message();
 
                 // We're interesting for only exchange messages and when node is stopped.
                 if (singleMsg.exchangeId() != null && singleMsg.exchangeId().isLeft() && !singleMsg.client()) {
@@ -287,7 +287,7 @@ public class GridCachePartitionsStateValidationTest extends GridCommonAbstractTe
             }
 
             try {
-                if (((GridIoMessage) msg).message() instanceof GridDhtPartitionsFullMessage) {
+                if (((GridIoMessage)msg).message() instanceof GridDhtPartitionsFullMessage) {
                     if (blockFullMsgLatch != null)
                         blockFullMsgLatch.await();
                 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/BlockedEvictionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/BlockedEvictionsTest.java
index d45382e..af87d87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/BlockedEvictionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/BlockedEvictionsTest.java
@@ -325,7 +325,7 @@ public class BlockedEvictionsTest extends GridCommonAbstractTest {
         IgniteEx g0 = startGrid(0, new DependencyResolver() {
             @Override public <T> T resolve(T instance) {
                 if (instance instanceof GridDhtPartitionTopologyImpl) {
-                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl) instance;
+                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl)instance;
 
                     top.partitionFactory(new GridDhtPartitionTopologyImpl.PartitionFactory() {
                         @Override public GridDhtLocalPartition create(
@@ -345,7 +345,7 @@ public class BlockedEvictionsTest extends GridCommonAbstractTest {
                     });
                 }
                 else if (instance instanceof IgniteCacheOffheapManager) {
-                    IgniteCacheOffheapManager mgr = (IgniteCacheOffheapManager) instance;
+                    IgniteCacheOffheapManager mgr = (IgniteCacheOffheapManager)instance;
 
                     IgniteCacheOffheapManager spied = Mockito.spy(mgr);
 
@@ -360,7 +360,7 @@ public class BlockedEvictionsTest extends GridCommonAbstractTest {
                         }
                     }).when(spied).stop();
 
-                    return (T) spied;
+                    return (T)spied;
                 }
 
                 return instance;
@@ -419,7 +419,7 @@ public class BlockedEvictionsTest extends GridCommonAbstractTest {
         IgniteEx g0 = startGrid(0, new DependencyResolver() {
             @Override public <T> T resolve(T instance) {
                 if (instance instanceof GridDhtPartitionTopologyImpl) {
-                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl) instance;
+                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl)instance;
 
                     top.partitionFactory(new GridDhtPartitionTopologyImpl.PartitionFactory() {
                         @Override public GridDhtLocalPartition create(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/MovingPartitionIsEvictedDuringClearingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/MovingPartitionIsEvictedDuringClearingTest.java
index 9a44e10..4f00d83 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/MovingPartitionIsEvictedDuringClearingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/MovingPartitionIsEvictedDuringClearingTest.java
@@ -118,7 +118,7 @@ public class MovingPartitionIsEvictedDuringClearingTest extends GridCommonAbstra
         IgniteEx g2 = startGrid(2, new DependencyResolver() {
             @Override public <T> T resolve(T instance) {
                 if (instance instanceof GridDhtPartitionTopologyImpl) {
-                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl) instance;
+                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl)instance;
 
                     top.partitionFactory(new GridDhtPartitionTopologyImpl.PartitionFactory() {
                         @Override public GridDhtLocalPartition create(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionEvictionOrderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionEvictionOrderTest.java
index 35fff50..c3ca4b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionEvictionOrderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionEvictionOrderTest.java
@@ -131,7 +131,7 @@ public class PartitionEvictionOrderTest extends GridCommonAbstractTest {
         TestDependencyResolver rslvr = new TestDependencyResolver(new DependencyResolver() {
             @Override public <T> T resolve(T instance) {
                 if (instance instanceof GridDhtPartitionTopologyImpl) {
-                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl) instance;
+                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl)instance;
 
                     top.partitionFactory((ctx, grp, id, recovery) -> new GridDhtLocalPartition(ctx, grp, id, recovery) {
                         @Override public long clearAll(EvictionContext evictionCtx) throws NodeStoppingException {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PreloadingRestartWhileClearingPartitionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PreloadingRestartWhileClearingPartitionTest.java
index ef20ef3..9b22ebb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PreloadingRestartWhileClearingPartitionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PreloadingRestartWhileClearingPartitionTest.java
@@ -118,7 +118,7 @@ public class PreloadingRestartWhileClearingPartitionTest extends GridCommonAbstr
         IgniteEx g2 = startGrid(2, new DependencyResolver() {
             @Override public <T> T resolve(T instance) {
                 if (instance instanceof GridDhtPartitionTopologyImpl) {
-                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl) instance;
+                    GridDhtPartitionTopologyImpl top = (GridDhtPartitionTopologyImpl)instance;
 
                     top.partitionFactory(new GridDhtPartitionTopologyImpl.PartitionFactory() {
                         @Override public GridDhtLocalPartition create(
@@ -143,7 +143,7 @@ public class PreloadingRestartWhileClearingPartitionTest extends GridCommonAbstr
         // Stop supplier for clearingPart.
         GridCacheContext<Object, Object> ctx = g2.cachex(DEFAULT_CACHE_NAME).context();
         GridDhtPartitionDemander.RebalanceFuture rebFut =
-            (GridDhtPartitionDemander.RebalanceFuture) ctx.preloader().rebalanceFuture();
+            (GridDhtPartitionDemander.RebalanceFuture)ctx.preloader().rebalanceFuture();
 
         GridDhtPreloaderAssignments assignments = U.field(rebFut, "assignments");
 
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 d37536d..d5390ef 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
@@ -497,8 +497,8 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
                 assertEquals(1, jcache.localMetrics().getEntryProcessorMisses());
                 assertEquals(2, jcache.localMetrics().getEntryProcessorHits());
 
-                assertEquals((float) 1 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorMissPercentage(), 0.001f);
-                assertEquals((float) 2 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorHitPercentage(), 0.001f);
+                assertEquals((float)1 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorMissPercentage(), 0.001f);
+                assertEquals((float)2 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorHitPercentage(), 0.001f);
             }
             else if (affinity(jcache).isBackup(g.cluster().localNode(), key)) {
                 assertEquals(1, jcache.localMetrics().getEntryProcessorPuts());
@@ -553,8 +553,8 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
                 assertEquals(1, jcache.localMetrics().getEntryProcessorMisses());
                 assertEquals(2, jcache.localMetrics().getEntryProcessorHits());
 
-                assertEquals((float) 1 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorMissPercentage(), 0.001f);
-                assertEquals((float) 2 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorHitPercentage(), 0.001f);
+                assertEquals((float)1 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorMissPercentage(), 0.001f);
+                assertEquals((float)2 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorHitPercentage(), 0.001f);
             }
             else if (affinity(jcache).isBackup(g.cluster().localNode(), key)) {
                 assertEquals(1, jcache.localMetrics().getEntryProcessorPuts());
@@ -614,8 +614,8 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
 
                 assertEquals(2, jcache.localMetrics().getEntryProcessorHits());
 
-                assertEquals((float) 1 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorMissPercentage(), 0.001f);
-                assertEquals((float) 2 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorHitPercentage(), 0.001f);
+                assertEquals((float)1 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorMissPercentage(), 0.001f);
+                assertEquals((float)2 / 3 * 100.0f, jcache.localMetrics().getEntryProcessorHitPercentage(), 0.001f);
             } else {
                 assertEquals(0, jcache.localMetrics().getEntryProcessorReadOnlyInvocations());
                 assertEquals(1, jcache.localMetrics().getEntryProcessorRemovals());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index d77670e..e109d45 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -171,8 +171,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
     @Override protected List<String> primaryKeysForCache(IgniteCache<String, Integer> cache, int cnt)
         throws IgniteCheckedException {
         if (cache instanceof GatewayProtectedCacheProxy &&
-            ((GatewayProtectedCacheProxy) cache).internalProxy().delegate().equals(
-                ((GatewayProtectedCacheProxy) jcache()).internalProxy().delegate()))
+            ((GatewayProtectedCacheProxy)cache).internalProxy().delegate().equals(
+                ((GatewayProtectedCacheProxy)jcache()).internalProxy().delegate()))
             return super.primaryKeysForCache(fullCache(), cnt);
 
         return super.primaryKeysForCache(cache, cnt);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
index e98cb9d..3fbb796 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
@@ -182,8 +182,8 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
      * @return the key
      */
     private static IntegerKey ensureKey(Object key) {
-        Object converted = key instanceof BinaryObject ? ((BinaryObject) key).deserialize() : key;
-        return converted instanceof IntegerKey ? (IntegerKey) converted : null;
+        Object converted = key instanceof BinaryObject ? ((BinaryObject)key).deserialize() : key;
+        return converted instanceof IntegerKey ? (IntegerKey)converted : null;
     }
 
     /**
@@ -512,7 +512,7 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
                 return false;
 
             if (IntegerKey.class.equals(o.getClass())) {
-                IntegerKey that = (IntegerKey) o;
+                IntegerKey that = (IntegerKey)o;
                 return this.val == that.val;
             }
 
@@ -693,7 +693,7 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
         private final ConcurrentMap<Integer, Set<IntegerKey>> loadingMap = new ConcurrentHashMap<>();
 
         /** */
-        private final IgnitePredicate<Event> pred = (IgnitePredicate<Event>) new IgnitePredicate<Event>() {
+        private final IgnitePredicate<Event> pred = (IgnitePredicate<Event>)new IgnitePredicate<Event>() {
             @Override public boolean apply(Event evt) {
                 // Handle:
                 // EVT_CACHE_OBJECT_PUT
@@ -701,7 +701,7 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
                 // EVT_CACHE_OBJECT_REMOVED
                 // EVT_CACHE_REBALANCE_OBJECT_UNLOADED
                 if (evt instanceof CacheEvent) {
-                    CacheEvent cacheEvt = (CacheEvent) evt;
+                    CacheEvent cacheEvt = (CacheEvent)evt;
                     int part = cacheEvt.partition();
 
                     // Oonly handle events for the test cache.
@@ -731,7 +731,7 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
                 // EVT_CACHE_REBALANCE_PART_UNLOADED
                 // EVT_CACHE_REBALANCE_PART_DATA_LOST
                 else if (evt instanceof CacheRebalancingEvent) {
-                    CacheRebalancingEvent rebalancingEvt = (CacheRebalancingEvent) evt;
+                    CacheRebalancingEvent rebalancingEvt = (CacheRebalancingEvent)evt;
 
                     int part = rebalancingEvt.partition();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
index 3915be6..58f1b82 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
@@ -116,7 +116,7 @@ public class GridCacheRebalancingPartitionCountersTest extends GridCommonAbstrac
 
         final int problemNode = 2;
 
-        IgniteEx node = (IgniteEx) ignite(problemNode);
+        IgniteEx node = (IgniteEx)ignite(problemNode);
         int[] primaryPartitions = node.affinity(CACHE_NAME).primaryPartitions(node.cluster().localNode());
 
         ignite.cluster().active(false);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java
index f99f0a2..aefc1c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java
@@ -119,7 +119,7 @@ public class GridCacheRebalancingWithAsyncClearingTest extends GridCommonAbstrac
     @Test
     @WithSystemProperty(key = IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE, value = "1")
     public void testPartitionClearingNotBlockExchange() throws Exception {
-        IgniteEx ig = (IgniteEx) startGrids(3);
+        IgniteEx ig = (IgniteEx)startGrids(3);
         ig.cluster().active(true);
 
         // High number of keys triggers long partition eviction.
@@ -255,7 +255,7 @@ public class GridCacheRebalancingWithAsyncClearingTest extends GridCommonAbstrac
 
         // Check no data loss.
         for (int k = 1; k <= keysCnt; k++) {
-            Integer val = (Integer) ignite.cache(CACHE_NAME).get(k);
+            Integer val = (Integer)ignite.cache(CACHE_NAME).get(k);
             Assert.assertNotNull("Value for " + k + " is null", val);
             Assert.assertEquals("Check failed for " + k + " = " + val, k, (int)val);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 069e868..e0f91fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -387,9 +387,9 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             IgniteCache<Integer, Object> cache2 = g2.cache(DEFAULT_CACHE_NAME);
             IgniteCache<Integer, Object> cache3 = g3.cache(DEFAULT_CACHE_NAME);
 
-            final Class<CacheEntryListener> cls1 = (Class<CacheEntryListener>) getExternalClassLoader().
+            final Class<CacheEntryListener> cls1 = (Class<CacheEntryListener>)getExternalClassLoader().
                 loadClass("org.apache.ignite.tests.p2p.CacheDeploymentCacheEntryListener");
-            final Class<CacheEntryEventSerializableFilter> cls2 = (Class<CacheEntryEventSerializableFilter>) getExternalClassLoader().
+            final Class<CacheEntryEventSerializableFilter> cls2 = (Class<CacheEntryEventSerializableFilter>)getExternalClassLoader().
                 loadClass("org.apache.ignite.tests.p2p.CacheDeploymentCacheEntryEventSerializableFilter");
 
             CacheEntryListenerConfiguration<Integer, Object> lsnrCfg = new MutableCacheEntryListenerConfiguration<>(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpireWhileRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpireWhileRebalanceTest.java
index 736e363..4f36456 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpireWhileRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpireWhileRebalanceTest.java
@@ -55,7 +55,7 @@ public class IgniteCacheExpireWhileRebalanceTest extends GridCommonAbstractTest
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        ((TcpDiscoverySpi) cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+        ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
 
         cfg.setFailureHandler(new StopNodeOrHaltFailureHandler());
 
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 dd4776a..a9cf713 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
@@ -330,7 +330,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
 
         checkTtl(key, 0);
 
-        assertEquals((Integer) 1, cache.get(key)); // Get.
+        assertEquals((Integer)1, cache.get(key)); // Get.
 
         checkTtl(key, 0);
 
@@ -503,7 +503,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
 
         checkTtl(key, 60_000L);
 
-        assertEquals((Integer) 1, cache.get(key));
+        assertEquals((Integer)1, cache.get(key));
 
         checkTtl(key, 62_000L, true);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
index 2fa84a5..3113004 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
@@ -175,7 +175,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA
 
             assertEquals(storeVal, storeMap.get(key));
 
-            assertEquals(storeVal + 2, (int) cache.get(key));
+            assertEquals(storeVal + 2, (int)cache.get(key));
         }
 
         Map<Integer, Integer> expData = new HashMap<>();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
index 353477d..6e908c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
@@ -171,7 +171,7 @@ public abstract class CacheMvccAbstractFeatureTest extends CacheMvccAbstractTest
             int idx;
 
             do {
-                idx = (int) (Math.random() * 100);
+                idx = (int)(Math.random() * 100);
             }
             while (!keys.add(idx));
         }
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 7a467cf..2b5a275 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
@@ -651,7 +651,7 @@ public abstract class CacheMvccAbstractTest extends GridCommonAbstractTest {
                                             assertNull("new=" + e + ", old=" + old, old);
                                         }
                                     } finally {
-                                        U.closeQuiet((AutoCloseable) it);
+                                        U.closeQuiet((AutoCloseable)it);
                                     }
 
                                     break;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClientTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClientTopologyTest.java
index c1b9cbc..4eefa2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClientTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClientTopologyTest.java
@@ -172,7 +172,7 @@ public class CacheMvccClientTopologyTest extends GridCommonAbstractTest {
             .setClusterStateOnStart(ClusterState.INACTIVE);
 
         // when
-        final IgniteEx crd = (IgniteEx) startGrid(getTestIgniteInstanceName(clientModeIdx), crdCfg);
+        final IgniteEx crd = (IgniteEx)startGrid(getTestIgniteInstanceName(clientModeIdx), crdCfg);
 
         checkTopology(1);
         crd.cluster().state(ClusterState.ACTIVE);
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 5d7a74c..fb5d5cd 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
@@ -199,9 +199,9 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest {
         assertEquals((Integer)1, cache.get(1));
 
         if (omitTxFinish || rollBack)
-            assertEquals((Integer) 1, cache.get(2)); // Commit\rollback marker were saved neither in WAL nor in checkpoint.
+            assertEquals((Integer)1, cache.get(2)); // Commit\rollback marker were saved neither in WAL nor in checkpoint.
         else
-            assertEquals((Integer) 2, cache.get(2));
+            assertEquals((Integer)2, cache.get(2));
 
         cache.put(2, 3);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
index e26bfe0..ba35d7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
@@ -214,7 +214,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
         boolean expectedExceptionIsThrown = false;
 
         try {
-            nodeC.cluster().setBaselineTopology(Arrays.asList((BaselineNode) nodeA.cluster().localNode(),
+            nodeC.cluster().setBaselineTopology(Arrays.asList((BaselineNode)nodeA.cluster().localNode(),
                 nodeB.cluster().localNode()));
         } catch (IgniteException e) {
             String errMsg = e.getMessage();
@@ -410,7 +410,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        SingleMessageInterceptorCommunicationSpi commSpi = (SingleMessageInterceptorCommunicationSpi) grid
+        SingleMessageInterceptorCommunicationSpi commSpi = (SingleMessageInterceptorCommunicationSpi)grid
             .configuration().getCommunicationSpi();
 
         commSpi.blockMsgsWithLatch(latch);
@@ -504,7 +504,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        SingleMessageInterceptorCommunicationSpi commSpi = (SingleMessageInterceptorCommunicationSpi) nodeB
+        SingleMessageInterceptorCommunicationSpi commSpi = (SingleMessageInterceptorCommunicationSpi)nodeB
             .configuration().getCommunicationSpi();
 
         commSpi.blockMsgsWithLatch(latch);
@@ -656,7 +656,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
         nodeA.cluster().baselineAutoAdjustEnabled(false);
         nodeC.cluster().active(true);
 
-        IgniteEx nodeD = (IgniteEx) startGridWithConsistentId("D");
+        IgniteEx nodeD = (IgniteEx)startGridWithConsistentId("D");
 
         nodeD.cluster().setBaselineTopology(baselineNodes(nodeA.cluster().forServers().nodes()));
 
@@ -790,7 +790,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
 
         assertTrue(clusterActive);
 
-        checkDataInCache((IgniteEx) ig);
+        checkDataInCache((IgniteEx)ig);
     }
 
     /**
@@ -1035,9 +1035,9 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
      * @param ig Ig.
      */
     private BaselineTopology getBaselineTopology(Ignite ig) {
-        return ((DiscoveryDataClusterState) U.field(
-            (Object) U.field(
-                (Object) U.field(ig, "ctx"),
+        return ((DiscoveryDataClusterState)U.field(
+            (Object)U.field(
+                (Object)U.field(ig, "ctx"),
                 "stateProc"),
             "globalState"))
             .baselineTopology();
@@ -1046,8 +1046,8 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
     /** */
     private BaselineTopologyHistory getBaselineTopologyHistory(Ignite ig) {
         return U.field(
-            (Object) U.field(
-                (Object) U.field(ig, "ctx"),
+            (Object)U.field(
+                (Object)U.field(ig, "ctx"),
                 "stateProc"),
             "bltHist");
     }
@@ -1057,7 +1057,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
         IgniteCache<Object, Object> cache = srv.cache(DEFAULT_CACHE_NAME);
 
         for (int i = 0; i < ENTRIES_COUNT; i++) {
-            TestValue testVal = (TestValue) cache.get(i);
+            TestValue testVal = (TestValue)cache.get(i);
 
             assertNotNull(testVal);
 
@@ -1096,7 +1096,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
             Message msg,
             IgniteInClosure<IgniteException> ackC
         ) throws IgniteSpiException {
-            if (((GridIoMessage) msg).message() instanceof GridDhtPartitionsSingleMessage) {
+            if (((GridIoMessage)msg).message() instanceof GridDhtPartitionsSingleMessage) {
                 try {
                     if (singleMsgSndLatch != null)
                         singleMsgSndLatch.await();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java
index b51b371..f7bce82 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java
@@ -87,7 +87,7 @@ public class IgniteLostPartitionsOnLeaveBaselineSelfTest extends GridCommonAbstr
 
         cfg.setDataStorageConfiguration(memCfg);
 
-        ((TcpDiscoverySpi) cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+        ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
 
         return cfg;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index 33aa10b..4645524 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -153,15 +153,15 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
 
         cache0 = ignite0.cache(CACHE_NAME).withKeepBinary();
 
-        BinaryObject bObj0 = (BinaryObject) cache0.get(0);
+        BinaryObject bObj0 = (BinaryObject)cache0.get(0);
 
-        assertEquals(10, (int) bObj0.field("intField"));
+        assertEquals(10, (int)bObj0.field("intField"));
 
         cache1 = ignite1.cache(CACHE_NAME).withKeepBinary();
 
-        BinaryObject bObj1 = (BinaryObject) cache1.get(1);
+        BinaryObject bObj1 = (BinaryObject)cache1.get(1);
 
-        assertEquals(20, (int) bObj1.field("intField"));
+        assertEquals(20, (int)bObj1.field("intField"));
         assertEquals("str", bObj1.field("strField"));
     }
 
@@ -204,13 +204,13 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
 
         cache0 = ignite0.cache(CACHE_NAME).withKeepBinary();
 
-        bObj0 = (BinaryObject) cache0.get(0);
-        bObj1 = (BinaryObject) cache0.get(1);
+        bObj0 = (BinaryObject)cache0.get(0);
+        bObj1 = (BinaryObject)cache0.get(1);
 
         assertEquals("DynamicType0", binaryTypeName(bObj0));
         assertEquals("DynamicType1", binaryTypeName(bObj1));
 
-        assertEquals(10, (int) bObj0.field(DYNAMIC_INT_FIELD_NAME));
+        assertEquals(10, (int)bObj0.field(DYNAMIC_INT_FIELD_NAME));
         assertEquals("str", bObj1.field(DYNAMIC_STR_FIELD_NAME));
     }
 
@@ -270,9 +270,9 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
 
         igniteB.active(true);
 
-        bObj1 = (BinaryObject) igniteB.cache(CACHE_NAME).withKeepBinary().get(1);
+        bObj1 = (BinaryObject)igniteB.cache(CACHE_NAME).withKeepBinary().get(1);
 
-        assertEquals(20, (int) bObj1.field(DYNAMIC_INT_FIELD_NAME));
+        assertEquals(20, (int)bObj1.field(DYNAMIC_INT_FIELD_NAME));
         assertEquals("str", bObj1.field(DYNAMIC_STR_FIELD_NAME));
     }
 
@@ -422,13 +422,13 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
         for (int i = 0; i < nodesCnt; i++) {
             IgniteCache cache = grid(i).cache(CACHE_NAME).withKeepBinary();
 
-            BinaryObject o1 = (BinaryObject) cache.get(0);
+            BinaryObject o1 = (BinaryObject)cache.get(0);
 
             TestValue1 t1 = o1.deserialize();
 
             assertEquals(0, t1.getValue());
 
-            BinaryObject o2 = (BinaryObject) cache.get(1);
+            BinaryObject o2 = (BinaryObject)cache.get(1);
 
             TestValue2 t2 = o2.deserialize();
 
@@ -707,7 +707,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
     /** */
     private BinaryObjectExaminer contentExaminer0 = new BinaryObjectExaminer() {
         @Override public void examine(IgniteCache cache) {
-            BinaryObject bo = (BinaryObject) cache.get(2);
+            BinaryObject bo = (BinaryObject)cache.get(2);
 
             int fieldVal = bo.field(DYNAMIC_INT_FIELD_NAME);
 
@@ -718,7 +718,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
     /** */
     private BinaryObjectExaminer contentExaminer1 = new BinaryObjectExaminer() {
         @Override public void examine(IgniteCache cache) {
-            BinaryObject bo = (BinaryObject) cache.get(3);
+            BinaryObject bo = (BinaryObject)cache.get(3);
 
             int fieldVal = bo.field(DYNAMIC_INT_FIELD_NAME);
 
@@ -730,7 +730,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
     /** */
     private BinaryObjectExaminer structureExaminer0 = new BinaryObjectExaminer() {
         @Override public void examine(IgniteCache cache) {
-            BinaryObject bo = (BinaryObject) cache.get(2);
+            BinaryObject bo = (BinaryObject)cache.get(2);
 
             BinaryType type = bo.type();
 
@@ -751,7 +751,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
     /** */
     private BinaryObjectExaminer structureExaminer1 = new BinaryObjectExaminer() {
         @Override public void examine(IgniteCache cache) {
-            BinaryObject bo = (BinaryObject) cache.get(2);
+            BinaryObject bo = (BinaryObject)cache.get(2);
 
             BinaryType type = bo.type();
 
@@ -771,7 +771,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
     /** */
     private BinaryObjectExaminer enumExaminer0 = new BinaryObjectExaminer() {
         @Override public void examine(IgniteCache cache) {
-            BinaryObject enumBo = (BinaryObject) cache.get(4);
+            BinaryObject enumBo = (BinaryObject)cache.get(4);
 
             assertEquals(EnumType.ENUM_VAL_0.ordinal(), enumBo.enumOrdinal());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
index 8832755..8658ac1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
@@ -129,7 +129,7 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstract
 
             final int groupsCnt = 2;
 
-            final IgniteEx node = (IgniteEx) startGridsMultiThreaded(gridsCnt);
+            final IgniteEx node = (IgniteEx)startGridsMultiThreaded(gridsCnt);
 
             final List<CacheConfiguration> cfgs = Arrays.asList(
                 cacheConfiguration("g1c1", TRANSACTIONAL, PARTITIONED, gridsCnt, "testGrp1"),
@@ -143,7 +143,7 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstract
 
             stopAllGrids();
 
-            IgniteEx node2 = (IgniteEx) startGridsMultiThreaded(gridsCnt);
+            IgniteEx node2 = (IgniteEx)startGridsMultiThreaded(gridsCnt);
 
             validateDepIds(groupsCnt); // Deployment ids must be the same on all nodes.
 
@@ -201,7 +201,7 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstract
         Map<Integer, IgniteUuid> depIds = new HashMap<>();
 
         for (Ignite ignite : G.allGrids()) {
-            final Map<Integer, CacheGroupDescriptor> descMap = ((IgniteEx) ignite).context().cache().cacheGroupDescriptors();
+            final Map<Integer, CacheGroupDescriptor> descMap = ((IgniteEx)ignite).context().cache().cacheGroupDescriptors();
 
             for (Map.Entry<Integer, CacheGroupDescriptor> entry : descMap.entrySet()) {
                 final IgniteUuid u = entry.getValue().deploymentId();
@@ -233,13 +233,13 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstract
                 crdNode = locNode;
         }
 
-        AffinityTopologyVersion topVer = ((IgniteKernal) grid(crdNode)).
+        AffinityTopologyVersion topVer = ((IgniteKernal)grid(crdNode)).
             context().cache().context().exchange().readyAffinityVersion();
 
         Map<String, List<List<ClusterNode>>> affMap = new HashMap<>();
 
         for (Ignite node : nodes) {
-            IgniteKernal node0 = (IgniteKernal) node;
+            IgniteKernal node0 = (IgniteKernal)node;
 
             for (IgniteInternalCache cache : node0.context().cache().caches()) {
                 List<List<ClusterNode>> aff = affMap.get(cache.name());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
index 7272ab3..54d930c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
@@ -144,7 +144,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
 
             GridCacheSharedContext sharedCtx = ig.context().cache().context();
 
-            FilePageStoreManager pageStore = (FilePageStoreManager) sharedCtx.pageStore();
+            FilePageStoreManager pageStore = (FilePageStoreManager)sharedCtx.pageStore();
 
             File[] tmpFile = pageStore.cacheWorkDir(true, ODD_GROUP_NAME).listFiles(new FilenameFilter() {
                 @Override public boolean accept(File dir, String name) {
@@ -193,7 +193,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
 
             GridCacheSharedContext sharedCtx = ig.context().cache().context();
 
-            FilePageStoreManager pageStore = (FilePageStoreManager) sharedCtx.pageStore();
+            FilePageStoreManager pageStore = (FilePageStoreManager)sharedCtx.pageStore();
 
             StoredCacheData corrData = cacheDescr.toStoredData(ig.context().cache().splitter());
 
@@ -217,7 +217,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
 
             GridCacheSharedContext sharedCtx = ig.context().cache().context();
 
-            FilePageStoreManager pageStore = (FilePageStoreManager) sharedCtx.pageStore();
+            FilePageStoreManager pageStore = (FilePageStoreManager)sharedCtx.pageStore();
 
             StoredCacheData data = cacheDescr.toStoredData(ig.context().cache().splitter());
 
@@ -243,7 +243,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
 
             GridCacheSharedContext sharedCtx = ig.context().cache().context();
 
-            FilePageStoreManager pageStore = (FilePageStoreManager) sharedCtx.pageStore();
+            FilePageStoreManager pageStore = (FilePageStoreManager)sharedCtx.pageStore();
 
             StoredCacheData data = cacheDescr.toStoredData(ig.context().cache().splitter());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index acf0197..9f898d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -668,7 +668,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
 
                 for (GridDhtLocalPartition part : ig0.cachex(CACHE).context().topology().currentLocalPartitions()) {
                     if (cntrs.containsKey(part.id()))
-                        assertEquals(String.valueOf(part.id()), (long) cntrs.get(part.id()), part.updateCounter());
+                        assertEquals(String.valueOf(part.id()), (long)cntrs.get(part.id()), part.updateCounter());
                     else
                         cntrs.put(part.id(), part.updateCounter());
                 }
@@ -772,7 +772,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
 
             if (o == null || getClass() != o.getClass()) return false;
 
-            TestValue testValue = (TestValue) o;
+            TestValue testValue = (TestValue)o;
 
             return order == testValue.order &&
                 v1 == testValue.v1 &&
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
index f711e37..36096c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
@@ -182,7 +182,7 @@ public class IgnitePdsCacheStartStopWithFreqCheckpointTest extends GridCommonAbs
      * @param node Node.
      */
     private void interruptCheckpointer(IgniteEx node) {
-        GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager) node.context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)node.context().cache().context().database();
 
         dbMgr.getCheckpointer().runner().interrupt();
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java
index c298caf..6357b43 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java
@@ -112,7 +112,7 @@ public class IgnitePdsConsistencyOnDelayedPartitionOwning extends GridCommonAbst
     /** */
     @Test
     public void checkConsistencyNodeLeft() throws Exception {
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(4);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(4);
         crd.cluster().active(true);
 
         for (int i = 0; i < PARTS; i++)
@@ -160,7 +160,7 @@ public class IgnitePdsConsistencyOnDelayedPartitionOwning extends GridCommonAbst
         CountDownLatch delayedOnwningLatch = new CountDownLatch(1);
 
         GridCacheDatabaseSharedManager dbMgr =
-            (GridCacheDatabaseSharedManager) grid(1).context().cache().context().database();
+            (GridCacheDatabaseSharedManager)grid(1).context().cache().context().database();
 
         dbMgr.addCheckpointListener(new CheckpointListener() {
             @Override public void onMarkCheckpointBegin(Context ctx) throws IgniteCheckedException {
@@ -191,7 +191,7 @@ public class IgnitePdsConsistencyOnDelayedPartitionOwning extends GridCommonAbst
         TestRecordingCommunicationSpi.spi(grid(1)).blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionDemandMessage) {
-                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage) msg;
+                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage)msg;
 
                     return msg0.topologyVersion().equals(new AffinityTopologyVersion(7, 0));
                 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
index 0619c05..f8dd4bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
@@ -137,7 +137,7 @@ public class IgnitePdsCorruptedIndexTest extends GridCommonAbstractTest {
         additionalArgs.add("-D" + "TEST_CHECKPOINT_ON_EVICTION=true");
         additionalArgs.add("-D" + "IGNITE_QUIET=false");
 
-        IgniteEx corruptedNode = (IgniteEx) startGrid(corruptedNodeName);
+        IgniteEx corruptedNode = (IgniteEx)startGrid(corruptedNodeName);
 
         additionalArgs.clear();
 
@@ -175,7 +175,7 @@ public class IgnitePdsCorruptedIndexTest extends GridCommonAbstractTest {
 
         startGrid(0);
 
-        corruptedNode = (IgniteEx) startGrid(corruptedNodeName);
+        corruptedNode = (IgniteEx)startGrid(corruptedNodeName);
 
         corruptedNode.cluster().active(true);
 
@@ -228,7 +228,7 @@ public class IgnitePdsCorruptedIndexTest extends GridCommonAbstractTest {
          */
         private IndexedObject(int iVal) {
             this.iVal = iVal;
-            this.lVal = (long) iVal * iVal;
+            this.lVal = (long)iVal * iVal;
         }
 
         /** {@inheritDoc} */
@@ -287,7 +287,7 @@ public class IgnitePdsCorruptedIndexTest extends GridCommonAbstractTest {
 
                 field.setAccessible(true);
 
-                checkpointedPart = (Integer) field.get(null);
+                checkpointedPart = (Integer)field.get(null);
             }
             catch (Exception e) {
                 e.printStackTrace();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java
index 3c47254..ea5d921 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java
@@ -259,7 +259,7 @@ public class IgnitePdsDefragmentationTest extends GridCommonAbstractTest {
             IntStream.range(0, grp.shared().affinity().affinity(grpId).partitions())
         ).mapToLong(p -> {
             try {
-                final FilePageStore store = (FilePageStore) ((PageStoreCollection) grp.shared().pageStore()).getStore(grpId, p);
+                final FilePageStore store = (FilePageStore)((PageStoreCollection)grp.shared().pageStore()).getStore(grpId, p);
 
                 return new File(store.getFileAbsolutePath()).length();
             } catch (IgniteCheckedException e) {
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 b2b2bde..5c30788 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
@@ -606,8 +606,8 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr
         for (int k = 0; k < 2500; k++)
             cache.put(k, k);
 
-        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager) ig0.context().cache().context().database();
-        GridCacheDatabaseSharedManager dbMrg1 = (GridCacheDatabaseSharedManager) ig1.context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager)ig0.context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMrg1 = (GridCacheDatabaseSharedManager)ig1.context().cache().context().database();
 
         dbMrg0.forceCheckpoint("cp").futureFor(CheckpointState.FINISHED).get();
         dbMrg1.forceCheckpoint("cp").futureFor(CheckpointState.FINISHED).get();
@@ -696,8 +696,8 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr
         for (int k = 0; k < 2500; k++)
             cache.put(k, k);
 
-        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager) ig0.context().cache().context().database();
-        GridCacheDatabaseSharedManager dbMrg1 = (GridCacheDatabaseSharedManager) ig1.context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMrg0 = (GridCacheDatabaseSharedManager)ig0.context().cache().context().database();
+        GridCacheDatabaseSharedManager dbMrg1 = (GridCacheDatabaseSharedManager)ig1.context().cache().context().database();
 
         dbMrg0.forceCheckpoint("cp").futureFor(CheckpointState.FINISHED).get();
         dbMrg1.forceCheckpoint("cp").futureFor(CheckpointState.FINISHED).get();
@@ -736,7 +736,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr
             private Ignite ig;
 
             @Override public void run() {
-                MaintenanceRegistry mntcRegistry = ((IgniteEx) ig).context().maintenanceRegistry();
+                MaintenanceRegistry mntcRegistry = ((IgniteEx)ig).context().maintenanceRegistry();
 
                 List<MaintenanceAction<?>> actions = mntcRegistry
                     .actionsForMaintenanceTask(CORRUPTED_DATA_FILES_MNTC_TASK_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
index cee869f..c02563d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
@@ -226,7 +226,7 @@ public class MemoryPolicyInitializationTest extends GridCommonAbstractTest {
      * @param plcName Policy name.
      */
     private void verifyCacheMemoryPolicy(IgniteCache cache, String plcName) {
-        GridCacheContext ctx = ((IgniteCacheProxy) cache).context();
+        GridCacheContext ctx = ((IgniteCacheProxy)cache).context();
 
         assertEquals(plcName, ctx.dataRegion().config().getName());
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PagesPossibleCorruptionDiagnosticTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PagesPossibleCorruptionDiagnosticTest.java
index 2925848..3c46dc9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PagesPossibleCorruptionDiagnosticTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PagesPossibleCorruptionDiagnosticTest.java
@@ -194,7 +194,7 @@ public class PagesPossibleCorruptionDiagnosticTest extends GridCommonAbstractTes
         IgniteCacheOffheapManager.CacheDataStore dataStore =
             ignite.context().cache().cacheGroup(grpId).offheap().cacheDataStores().iterator().next();
 
-        GridCacheOffheapManager.GridCacheDataStore store = (GridCacheOffheapManager.GridCacheDataStore) dataStore;
+        GridCacheOffheapManager.GridCacheDataStore store = (GridCacheOffheapManager.GridCacheDataStore)dataStore;
 
         AbstractFreeList freeList = store.getCacheStoreFreeList();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
index 5357dff..7ca4e9f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
@@ -937,7 +937,7 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract
      */
     private void awaitTopology(Throwable e) throws IgniteCheckedException {
         if (e instanceof TransactionRollbackException) {
-            TransactionRollbackException e0 = (TransactionRollbackException) e;
+            TransactionRollbackException e0 = (TransactionRollbackException)e;
 
             ClusterTopologyCheckedException e00 = X.cause(e0, ClusterTopologyCheckedException.class);
             IgniteInternalFuture f;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
index 51d2114..c115678 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
@@ -191,7 +191,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
      */
     @Test
     public void testRecoveryOnJoinToActiveCluster() throws Exception {
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
 
         crd.cluster().active(true);
 
@@ -223,7 +223,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
      */
     @Test
     public void testRecoveryOnJoinToInactiveCluster() throws Exception {
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
 
         crd.cluster().active(true);
 
@@ -286,7 +286,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
      * @param dynamicCaches Dynamic caches.
      */
     private void doTestWithDynamicCaches(List<CacheConfiguration> dynamicCaches) throws Exception {
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
 
         crd.cluster().active(true);
 
@@ -321,7 +321,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
      */
     @Test
     public void testRecoveryOnJoinToDifferentBlt() throws Exception {
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
 
         crd.cluster().baselineAutoAdjustEnabled(false);
         crd.cluster().active(true);
@@ -357,7 +357,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
      */
     @Test
     public void testRecoveryOnCrushDuringCheckpointOnNodeStart() throws Exception {
-        IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3, false);
+        IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3, false);
 
         crd.cluster().active(true);
 
@@ -469,14 +469,14 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
         for (final Ignite node : nodes) {
             TestRecordingCommunicationSpi spi = TestRecordingCommunicationSpi.spi(node);
 
-            Set<Integer> mvccCaches = ((IgniteEx) node).context().cache().cacheGroups().stream()
+            Set<Integer> mvccCaches = ((IgniteEx)node).context().cache().cacheGroups().stream()
                 .flatMap(group -> group.caches().stream())
                 .filter(cache -> cache.config().getAtomicityMode() == CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT)
                 .map(GridCacheContext::groupId)
                 .collect(Collectors.toSet());
 
             List<Integer> rebalancedGroups = spi.recordedMessages(true).stream()
-                .map(msg -> (GridDhtPartitionDemandMessage) msg)
+                .map(msg -> (GridDhtPartitionDemandMessage)msg)
                 .map(GridCacheGroupIdMessage::groupId)
                 .filter(grpId -> grpId != sysCacheGroupId)
                 //TODO: remove following filter when failover for MVCC will be fixed.
@@ -628,7 +628,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            CacheLoader loader = (CacheLoader) o;
+            CacheLoader loader = (CacheLoader)o;
 
             return Objects.equals(cacheName, loader.cacheName);
         }
@@ -666,7 +666,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            TestValue testValue = (TestValue) o;
+            TestValue testValue = (TestValue)o;
 
             return indexedField == testValue.indexedField &&
                 Arrays.equals(payload, testValue.payload);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
index f63acc1..5af58d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
@@ -187,11 +187,11 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
 
         cleanPersistenceDir(ig1Name);
 
-        int groupId = ((IgniteEx) ig0).cachex(CACHE3_NAME).context().groupId();
+        int groupId = ((IgniteEx)ig0).cachex(CACHE3_NAME).context().groupId();
 
         blockMessagePredicate = (node, msg) -> {
             if (msg instanceof GridDhtPartitionDemandMessage)
-                return ((GridDhtPartitionDemandMessage) msg).groupId() == groupId;
+                return ((GridDhtPartitionDemandMessage)msg).groupId() == groupId;
 
             return false;
         };
@@ -207,7 +207,7 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
         assertTrue("Unexpected moving partitions count: " + metrics.getLocalNodeMovingPartitionsCount(),
             metrics.getLocalNodeMovingPartitionsCount() == CACHE3_PARTS_NUM);
 
-        TestRecordingCommunicationSpi commSpi = (TestRecordingCommunicationSpi) ig1
+        TestRecordingCommunicationSpi commSpi = (TestRecordingCommunicationSpi)ig1
             .configuration().getCommunicationSpi();
 
         commSpi.stopBlock();
@@ -247,11 +247,11 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
 
         fillCache(ig0.dataStreamer(CACHE3_NAME), nonAffinityKeysSet, GENERATING_FUNC);
 
-        int groupId = ((IgniteEx) ig0).cachex(CACHE3_NAME).context().groupId();
+        int groupId = ((IgniteEx)ig0).cachex(CACHE3_NAME).context().groupId();
 
         blockMessagePredicate = (node, msg) -> {
             if (msg instanceof GridDhtPartitionDemandMessage)
-                return ((GridDhtPartitionDemandMessage) msg).groupId() == groupId;
+                return ((GridDhtPartitionDemandMessage)msg).groupId() == groupId;
 
             return false;
         };
@@ -260,7 +260,7 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
 
         CacheGroupMetricsImpl metrics = ig1.cachex(CACHE3_NAME).context().group().metrics();
 
-        TestRecordingCommunicationSpi commSpi = (TestRecordingCommunicationSpi) ig1
+        TestRecordingCommunicationSpi commSpi = (TestRecordingCommunicationSpi)ig1
             .configuration().getCommunicationSpi();
 
         startGrid(2);
@@ -306,7 +306,7 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
 
         try {
             IgniteConfiguration cfg1 = getConfiguration(getTestIgniteInstanceName(1));
-            TestRecordingCommunicationSpi spi1 = (TestRecordingCommunicationSpi) cfg1.getCommunicationSpi();
+            TestRecordingCommunicationSpi spi1 = (TestRecordingCommunicationSpi)cfg1.getCommunicationSpi();
             spi1.blockMessages(blockDemandMessageForGroup(CU.cacheId(CACHE3_NAME)));
 
             IgniteInternalFuture<IgniteEx> startFut = GridTestUtils.runAsync(new Callable<IgniteEx>() {
@@ -385,11 +385,11 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
 
         // Wait for rebalance (all partitions will be in MOVING state until cp is finished).
         IgniteConfiguration cfg1 = getConfiguration(getTestIgniteInstanceName(1));
-        TestRecordingCommunicationSpi spi1 = (TestRecordingCommunicationSpi) cfg1.getCommunicationSpi();
+        TestRecordingCommunicationSpi spi1 = (TestRecordingCommunicationSpi)cfg1.getCommunicationSpi();
         spi1.blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionDemandMessage) {
-                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage) msg;
+                    GridDhtPartitionDemandMessage msg0 = (GridDhtPartitionDemandMessage)msg;
 
                     return msg0.groupId() == CU.cacheId(CACHE3_NAME);
                 }
@@ -514,7 +514,7 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
         String cacheName = cache.getName();
 
         for (int i = 0; i < size; i++) {
-            String value = (String) cache.get(i);
+            String value = (String)cache.get(i);
 
             assertEquals(generatingFunc.apply(cacheName, i), value);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
index cd868df..32abc3d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
@@ -292,7 +292,7 @@ public class IgnitePdsTransactionsHangTest extends GridCommonAbstractTest {
         private static TestEntity newTestEntity(Random random) {
             TestEntity entity = new TestEntity();
 
-            entity.setLongVal((long) random.nextInt(1_000));
+            entity.setLongVal((long)random.nextInt(1_000));
             entity.setIntVal(random.nextInt(1_000));
             entity.setStrVal("test" + random.nextInt(1_000));
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
index 861d58c..a369733 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
@@ -180,7 +180,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
         grid.cluster().active(true);
 
         for (int i = 0; i < 1000; i++) {
-            byte payload = (byte) i;
+            byte payload = (byte)i;
             byte[] data = new byte[2048];
             Arrays.fill(data, payload);
 
@@ -210,11 +210,11 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
         recoveredGrid.cluster().active(true);
 
         for (int i = 0; i < 1000; i++) {
-            byte payload = (byte) i;
+            byte payload = (byte)i;
             byte[] data = new byte[2048];
             Arrays.fill(data, payload);
 
-            byte[] actualData = (byte[]) recoveredGrid.cache(CACHE_NAME).get(i);
+            byte[] actualData = (byte[])recoveredGrid.cache(CACHE_NAME).get(i);
             Assert.assertArrayEquals(data, actualData);
         }
     }
@@ -231,7 +231,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
         grid.cluster().active(true);
 
         for (int i = 0; i < 1000; i++) {
-            byte payload = (byte) i;
+            byte payload = (byte)i;
             byte[] data = new byte[2048];
             Arrays.fill(data, payload);
 
@@ -260,11 +260,11 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
         recoveredGrid.cluster().active(true);
 
         for (int i = 0; i < 1000; i++) {
-            byte payload = (byte) i;
+            byte payload = (byte)i;
             byte[] data = new byte[2048];
             Arrays.fill(data, payload);
 
-            byte[] actualData = (byte[]) recoveredGrid.cache(CACHE_NAME).get(i);
+            byte[] actualData = (byte[])recoveredGrid.cache(CACHE_NAME).get(i);
             Assert.assertArrayEquals(data, actualData);
         }
     }
@@ -290,7 +290,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
         // Fail somewhere on the second wal segment.
         ioFactory = new FilteringFileIOFactory(
             ".wal",
-            new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), (long) (1.5 * WAL_SEGMENT_SIZE))
+            new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), (long)(1.5 * WAL_SEGMENT_SIZE))
         );
 
         System.setProperty(IGNITE_WAL_MMAP, "false");
@@ -317,7 +317,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
         final int dataSize = 2048;
 
         for (int i = 0; i < keysCount; i++) {
-            byte payload = (byte) i;
+            byte payload = (byte)i;
             byte[] data = new byte[dataSize];
             Arrays.fill(data, payload);
 
@@ -345,11 +345,11 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
         grid.cluster().active(true);
 
         for (int i = 0; i < failedPosition; i++) {
-            byte payload = (byte) i;
+            byte payload = (byte)i;
             byte[] data = new byte[dataSize];
             Arrays.fill(data, payload);
 
-            byte[] actualData = (byte[]) grid.cache(CACHE_NAME).get(i);
+            byte[] actualData = (byte[])grid.cache(CACHE_NAME).get(i);
             Assert.assertArrayEquals(data, actualData);
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java
index 0351479..2d72c89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java
@@ -158,10 +158,10 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
         cfg.setCommunicationSpi(new WalRebalanceCheckingCommunicationSpi());
 
         if (blockMsgPred != null)
-            ((TestRecordingCommunicationSpi) cfg.getCommunicationSpi()).blockMessages(blockMsgPred);
+            ((TestRecordingCommunicationSpi)cfg.getCommunicationSpi()).blockMessages(blockMsgPred);
 
         if (recordMsgPred != null)
-            ((TestRecordingCommunicationSpi) cfg.getCommunicationSpi()).record(recordMsgPred);
+            ((TestRecordingCommunicationSpi)cfg.getCommunicationSpi()).record(recordMsgPred);
 
         cfg.setFailureHandler(new StopNodeFailureHandler());
         cfg.setConsistentId(gridName);
@@ -336,7 +336,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
 
         awaitPartitionMapExchange();
 
-        Set<Long> topVers = ((WalRebalanceCheckingCommunicationSpi) ignite.configuration().getCommunicationSpi())
+        Set<Long> topVers = ((WalRebalanceCheckingCommunicationSpi)ignite.configuration().getCommunicationSpi())
             .walRebalanceVersions(grpId);
 
         Assert.assertTrue(topVers.contains(ignite.cluster().topologyVersion()));
@@ -362,7 +362,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
 
         awaitPartitionMapExchange();
 
-        topVers = ((WalRebalanceCheckingCommunicationSpi) ignite.configuration().getCommunicationSpi())
+        topVers = ((WalRebalanceCheckingCommunicationSpi)ignite.configuration().getCommunicationSpi())
             .walRebalanceVersions(grpId);
 
         Assert.assertFalse(topVers.contains(ignite.cluster().topologyVersion()));
@@ -436,7 +436,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
 
         awaitPartitionMapExchange();
 
-        Set<Long> topVers = ((WalRebalanceCheckingCommunicationSpi) ignite.configuration().getCommunicationSpi())
+        Set<Long> topVers = ((WalRebalanceCheckingCommunicationSpi)ignite.configuration().getCommunicationSpi())
             .walRebalanceVersions(grpId);
 
         Assert.assertFalse(topVers.contains(ignite.cluster().topologyVersion()));
@@ -454,7 +454,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
 
         awaitPartitionMapExchange();
 
-        topVers = ((WalRebalanceCheckingCommunicationSpi) ignite.configuration().getCommunicationSpi())
+        topVers = ((WalRebalanceCheckingCommunicationSpi)ignite.configuration().getCommunicationSpi())
             .walRebalanceVersions(grpId);
 
         Assert.assertTrue(topVers.contains(ignite.cluster().topologyVersion()));
@@ -513,7 +513,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
         // Delay rebalance process for specified group.
         blockMsgPred = (node, msg) -> {
             if (msg instanceof GridDhtPartitionDemandMessage)
-                return ((GridDhtPartitionDemandMessage) msg).groupId() == grpId;
+                return ((GridDhtPartitionDemandMessage)msg).groupId() == grpId;
 
             return false;
         };
@@ -534,7 +534,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
         FailingIOFactory ioFactory = injectFailingIOFactory(supplierNode);
 
         // Resume rebalance process.
-        TestRecordingCommunicationSpi spi = (TestRecordingCommunicationSpi) demanderNode.configuration().getCommunicationSpi();
+        TestRecordingCommunicationSpi spi = (TestRecordingCommunicationSpi)demanderNode.configuration().getCommunicationSpi();
 
         spi.stopBlock();
 
@@ -1103,7 +1103,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
         CountDownLatch blockCheckpoint = new CountDownLatch(1);
         CountDownLatch unblockCheckpoint = new CountDownLatch(1);
 
-        ((GridCacheDatabaseSharedManager) demander
+        ((GridCacheDatabaseSharedManager)demander
             .context()
             .cache()
             .context()
@@ -1160,7 +1160,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
         // Wait for starting the second rebalance (new chain of rebalance futures should be created at this point).
         demanderSpi.waitForBlocked();
 
-        GridFutureAdapter checkpointFut = ((GridCacheDatabaseSharedManager) demander
+        GridFutureAdapter checkpointFut = ((GridCacheDatabaseSharedManager)demander
             .context()
             .cache()
             .context()
@@ -1283,7 +1283,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
         /** {@inheritDoc} */
         @Override public void sendMessage(ClusterNode node, Message msg, IgniteInClosure<IgniteException> ackC) throws IgniteSpiException {
             if (((GridIoMessage)msg).message() instanceof GridDhtPartitionDemandMessage) {
-                GridDhtPartitionDemandMessage demandMsg = (GridDhtPartitionDemandMessage) ((GridIoMessage)msg).message();
+                GridDhtPartitionDemandMessage demandMsg = (GridDhtPartitionDemandMessage)((GridIoMessage)msg).message();
 
                 IgniteDhtDemandedPartitionsMap map = demandMsg.partitions();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalArchiveSizeConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalArchiveSizeConfigurationTest.java
index 56c848b..f051337 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalArchiveSizeConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalArchiveSizeConfigurationTest.java
@@ -107,7 +107,7 @@ public class WalArchiveSizeConfigurationTest extends GridCommonAbstractTest {
     @Test
     public void testUnlimitedMaxArchiveSizeConfiguration() throws Exception {
         DataStorageConfiguration dataStorageConfiguration = new DataStorageConfiguration()
-            .setWalSegmentSize((int) U.MB)
+            .setWalSegmentSize((int)U.MB)
             .setMaxWalArchiveSize(DataStorageConfiguration.UNLIMITED_WAL_ARCHIVE)
             .setDefaultDataRegionConfiguration(
                 new DataRegionConfiguration().setPersistenceEnabled(true)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java
index e6dedc4..4ee015b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java
@@ -199,7 +199,7 @@ public abstract class IgniteAbstractWalIteratorInvalidCrcTest extends GridCommon
         if (shouldFail) {
             WALPointer[] lastReadPtrRef = new WALPointer[1];
 
-            IgniteException igniteException = (IgniteException) GridTestUtils.assertThrows(log, () -> {
+            IgniteException igniteException = (IgniteException)GridTestUtils.assertThrows(log, () -> {
                 try (WALIterator iter = getWalIterator(walMgr, ignoreArchiveDir)) {
                     for (IgniteBiTuple<WALPointer, WALRecord> tuple : iter) {
                         WALPointer ptr = tuple.get1();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanTest.java
index eb97728..56adca0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanTest.java
@@ -295,7 +295,7 @@ public class DefragmentationMXBeanTest extends GridCommonAbstractTest {
 
         fut.get();
 
-        ((GridCacheDatabaseSharedManager) grid(0).context().cache().context().database())
+        ((GridCacheDatabaseSharedManager)grid(0).context().cache().context().database())
             .defragmentationManager()
             .completionFuture()
             .get();
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 9ba6dd4..b4df492 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
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
 public class FullPageIdTableTest {
     /** Per test timeout */
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /** */
     private static final int CACHE_ID_RANGE = 1;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java
index bc54e41..1d80c89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java
@@ -72,7 +72,7 @@ import static org.mockito.Mockito.when;
 public class IgnitePageMemReplaceDelayedWriteUnitTest {
     /** Per test timeout */
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /** CPU count. */
     private static final int CPUS = 32;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java
index c67147a..6bc5713 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
 public class RobinHoodBackwardShiftHashMapTest {
     /** Per test timeout */
     @Rule
-    public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT);
+    public Timeout globalTimeout = new Timeout((int)GridTestUtils.DFLT_TEST_TIMEOUT);
 
     /**
      * @param tester map test code
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotSelfTest.java
index 366ec58..3a2e031 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotSelfTest.java
@@ -626,7 +626,7 @@ public class IgniteClusterSnapshotSelfTest extends AbstractSnapshotSelfTest {
 
         cfg2.getDataStorageConfiguration()
             .setFileIOFactory(new HaltJvmFileIOFactory(new RandomAccessFileIOFactory(),
-                (Predicate<File> & Serializable) file -> {
+                (Predicate<File> & Serializable)file -> {
                     // Trying to create FileIO over partition file.
                     return file.getAbsolutePath().contains(SNAPSHOT_NAME);
                 }));
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 c9d8dd0..e050353 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
@@ -183,10 +183,10 @@ public class TrackingPageIOTest {
                 Long foundNextChangedPage = io.findNextChangedPage(buf, pageId, backupId, backupId - 1, PAGE_SIZE);
 
                 if (io.trackingPageFor(pageId, PAGE_SIZE) == pageId)
-                    assertEquals((Long) pageId, foundNextChangedPage);
+                    assertEquals((Long)pageId, foundNextChangedPage);
 
                 else if (setIdx.contains(pageId))
-                    assertEquals((Long) pageId, foundNextChangedPage);
+                    assertEquals((Long)pageId, foundNextChangedPage);
 
                 else {
                     NavigableSet<Long> tailSet = setIdx.tailSet(pageId, false);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithNodeShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithNodeShutdownTest.java
index ab90b3f..cc36db7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithNodeShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithNodeShutdownTest.java
@@ -256,7 +256,7 @@ public class WalEnableDisableWithNodeShutdownTest extends GridCommonAbstractTest
 
                 /** */
                 @Override public void run() {
-                    MaintenanceRegistry mntcRegistry = ((IgniteEx) ignite).context().maintenanceRegistry();
+                    MaintenanceRegistry mntcRegistry = ((IgniteEx)ignite).context().maintenanceRegistry();
 
                     List<MaintenanceAction<?>> actions = mntcRegistry
                         .actionsForMaintenanceTask(CORRUPTED_DATA_FILES_MNTC_TASK_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithRestartsTest.java
index d84a05c..08f33e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithRestartsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/WalEnableDisableWithRestartsTest.java
@@ -114,7 +114,7 @@ public class WalEnableDisableWithRestartsTest extends GridCommonAbstractTest {
 
             Ignite ignite = nodes.removeFirst();
 
-            String consistentId = (String) ignite.cluster().localNode().consistentId();
+            String consistentId = (String)ignite.cluster().localNode().consistentId();
 
             ignite.close();
 
@@ -154,7 +154,7 @@ public class WalEnableDisableWithRestartsTest extends GridCommonAbstractTest {
 
                 /** */
                 @Override public void run() {
-                    MaintenanceRegistry mntcRegistry = ((IgniteEx) ignite).context().maintenanceRegistry();
+                    MaintenanceRegistry mntcRegistry = ((IgniteEx)ignite).context().maintenanceRegistry();
 
                     List<MaintenanceAction<?>> actions = mntcRegistry
                         .actionsForMaintenanceTask(CORRUPTED_DATA_FILES_MNTC_TASK_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
index 2bdf175..c389cd3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
@@ -119,7 +119,7 @@ public class IgniteCacheQueryCacheDestroySelfTest extends GridCommonAbstractTest
 
             try (QueryCursor cursor = example.query(scanQuery)) {
                 for (Object p : cursor) {
-                    String value = (String) ((Cache.Entry)p).getValue();
+                    String value = (String)((Cache.Entry)p).getValue();
 
                     assertNotNull(value);
                 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLongP2PTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLongP2PTest.java
index 2435be3..200a8d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLongP2PTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLongP2PTest.java
@@ -125,7 +125,7 @@ public class CacheContinuousQueryLongP2PTest extends CacheContinuousQueryOperati
         /** {@inheritDoc} */
         @Override public void sendMessage(ClusterNode node, Message msg, IgniteInClosure<IgniteException> ackC)
             throws IgniteSpiException {
-            if (isDeploymentResponse((GridIoMessage) msg)) {
+            if (isDeploymentResponse((GridIoMessage)msg)) {
                 log.info(">>> Delaying deployment message: " + msg);
 
                 try {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
index e546492..a177ec3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
@@ -818,7 +818,7 @@ public class CacheContinuousQueryOperationFromCallbackTest extends GridCommonAbs
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            QueryTestValue that = (QueryTestValue) o;
+            QueryTestValue that = (QueryTestValue)o;
 
             return val1.equals(that.val1) && val2.equals(that.val2);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
index b5ffe8f..5b05402 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
@@ -705,7 +705,7 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            QueryTestValue that = (QueryTestValue) o;
+            QueryTestValue that = (QueryTestValue)o;
 
             return val1.equals(that.val1) && val2.equals(that.val2);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index 0714a64..18bb025 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -1791,7 +1791,7 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
             if (o == null || getClass() != o.getClass())
                 return false;
 
-            QueryTestValue that = (QueryTestValue) o;
+            QueryTestValue that = (QueryTestValue)o;
 
             return val1.equals(that.val1) && val2.equals(that.val2);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
index 1016e45..b63d6be 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
@@ -498,7 +498,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe
         /** {@inheritDoc} */
         @Override public boolean equals(Object o) {
             return this == o || !(o == null || getClass() != o.getClass())
-                && key.equals(((KeyEventFilter) o).key);
+                && key.equals(((KeyEventFilter)o).key);
         }
 
         /** {@inheritDoc} */
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 f89f2de..2ad7ceb 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
@@ -156,7 +156,7 @@ public class IgnteCacheClientWriteBehindStoreNonCoalescingTest extends IgniteCac
             Object oldVal = storeMap.put(entry.getKey(), entry.getValue());
 
             if (oldVal != null) {
-                Integer oldInt = (Integer) oldVal;
+                Integer oldInt = (Integer)oldVal;
                 Integer newInt = (Integer)entry.getValue();
 
                 assertTrue(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractTransactionIntergrityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractTransactionIntergrityTest.java
index 99fc774..b5ee001 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractTransactionIntergrityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AbstractTransactionIntergrityTest.java
@@ -379,7 +379,7 @@ public class AbstractTransactionIntergrityTest extends GridCommonAbstractTest {
         @Override public boolean equals(Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
-            AccountState that = (AccountState) o;
+            AccountState that = (AccountState)o;
             return Objects.equals(txId, that.txId) &&
                 Objects.equals(coins, that.coins);
         }
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 eefbcc1..dbd45d5 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
@@ -1110,7 +1110,7 @@ public class TxPartitionCounterStateConsistencyTest extends TxPartitionCounterSt
         TestRecordingCommunicationSpi.spi(grid(1)).blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionsSingleMessage) {
-                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage) msg;
+                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage)msg;
 
                     return msg0.exchangeId() == null && msg0.partitions().get(CU.cacheId(DEFAULT_CACHE_NAME)).
                         topologyVersion().equals(new AffinityTopologyVersion(4, 0));
@@ -1133,14 +1133,14 @@ public class TxPartitionCounterStateConsistencyTest extends TxPartitionCounterSt
             crd.cache(DEFAULT_CACHE_NAME).put(p, p + 1);
 
         IgniteConfiguration cfg2 = getConfiguration(getTestIgniteInstanceName(2));
-        TestRecordingCommunicationSpi spi2 = (TestRecordingCommunicationSpi) cfg2.getCommunicationSpi();
+        TestRecordingCommunicationSpi spi2 = (TestRecordingCommunicationSpi)cfg2.getCommunicationSpi();
         spi2.blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
             @Override public boolean apply(ClusterNode clusterNode, Message msg) {
                 if (msg instanceof GridDhtPartitionDemandMessage)
                     return true; // Prevent any rebalancing to avoid switching partitions to owning.
 
                 if (msg instanceof GridDhtPartitionsSingleMessage) {
-                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage) msg;
+                    GridDhtPartitionsSingleMessage msg0 = (GridDhtPartitionsSingleMessage)msg;
 
                     return msg0.exchangeId() != null &&
                         msg0.exchangeId().topologyVersion().equals(new AffinityTopologyVersion(5, 0));
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 1f7dc4d..6b3b219 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
@@ -419,7 +419,7 @@ public class TxRecoveryWithConcurrentRollbackTest extends GridCommonAbstractTest
             AtomicReference<GridDhtTxLocal> dhtTxLocRef = new AtomicReference<>();
 
             assertTrue(waitForCondition(() -> {
-                dhtTxLocRef.set((GridDhtTxLocal) txs(node0).stream()
+                dhtTxLocRef.set((GridDhtTxLocal)txs(node0).stream()
                     .filter(t -> t.state() == TransactionState.PREPARING)
                     .findFirst()
                     .orElse(null)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java
index 038a16d..99bab0c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java
@@ -299,7 +299,7 @@ public class TxWithKeyContentionSelfTest extends GridCommonAbstractTest {
             commSpi0.stopBlock();
         }
 
-        IgniteTxManager txManager = ((IgniteEx) ig).context().cache().context().tm();
+        IgniteTxManager txManager = ((IgniteEx)ig).context().cache().context().tm();
 
         assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() {
             @Override public boolean apply() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterReadOnlyModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterReadOnlyModeSelfTest.java
index 97eb926..d390dc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterReadOnlyModeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterReadOnlyModeSelfTest.java
@@ -243,7 +243,7 @@ public class ClusterReadOnlyModeSelfTest extends GridCommonAbstractTest {
             tx.rollback();
         }
 
-        assertEquals(1, (int) cache.get(key));
+        assertEquals(1, (int)cache.get(key));
 
         t.join();
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
index da61b1b..575bfe0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
@@ -128,7 +128,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest {
             assertTrue(GRID_CNT >= grid(0).cluster().nodes().size());
 
             for (Ignite ignite : G.allGrids()) {
-                IgniteEx grid = (IgniteEx) ignite;
+                IgniteEx grid = (IgniteEx)ignite;
 
                 GridContinuousProcessor proc = grid.context().continuous();
 
@@ -1114,7 +1114,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest {
             for (int i = 0; i < GRID_CNT; i++) {
                 grid(0).events().localListen(new IgnitePredicate<Event>() {
                     @Override public boolean apply(Event evt) {
-                        if (nodeId.equals(((DiscoveryEvent) evt).eventNode().id()))
+                        if (nodeId.equals(((DiscoveryEvent)evt).eventNode().id()))
                             discoLatch.countDown();
 
                         return true;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index d268ce3..a5a5db2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -1352,11 +1352,11 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
         boolean DEBUG_PRINT = false;
 
-        int itemCnt = (int) Math.pow(MAX_PER_PAGE, 5) + rnd.nextInt(MAX_PER_PAGE * MAX_PER_PAGE);
+        int itemCnt = (int)Math.pow(MAX_PER_PAGE, 5) + rnd.nextInt(MAX_PER_PAGE * MAX_PER_PAGE);
 
         Long[] items = new Long[itemCnt];
         for (int i = 0; i < itemCnt; ++i)
-            items[i] = (long) i;
+            items[i] = (long)i;
 
         TestTree testTree = createTestTree(true);
         TreeMap<Long, Long> goldenMap = new TreeMap<>();
@@ -1535,8 +1535,8 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
         asyncRunFut = new GridCompoundFuture<>();
 
-        asyncRunFut.add((IgniteInternalFuture) putRmvFut);
-        asyncRunFut.add((IgniteInternalFuture) lockPrintingFut);
+        asyncRunFut.add((IgniteInternalFuture)putRmvFut);
+        asyncRunFut.add((IgniteInternalFuture)lockPrintingFut);
 
         asyncRunFut.markInitialized();
 
@@ -1713,9 +1713,9 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
         asyncRunFut = new GridCompoundFuture<>();
 
-        asyncRunFut.add((IgniteInternalFuture) putRmvFut);
-        asyncRunFut.add((IgniteInternalFuture) sizeFut);
-        asyncRunFut.add((IgniteInternalFuture) lockPrintingFut);
+        asyncRunFut.add((IgniteInternalFuture)putRmvFut);
+        asyncRunFut.add((IgniteInternalFuture)sizeFut);
+        asyncRunFut.add((IgniteInternalFuture)lockPrintingFut);
 
         asyncRunFut.markInitialized();
 
@@ -1850,8 +1850,8 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
         asyncRunFut = new GridCompoundFuture<>();
 
-        asyncRunFut.add((IgniteInternalFuture) putRmvFut);
-        asyncRunFut.add((IgniteInternalFuture) sizeFut);
+        asyncRunFut.add((IgniteInternalFuture)putRmvFut);
+        asyncRunFut.add((IgniteInternalFuture)sizeFut);
 
         asyncRunFut.markInitialized();
 
@@ -1967,10 +1967,10 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
         asyncRunFut = new GridCompoundFuture<>();
 
-        asyncRunFut.add((IgniteInternalFuture) sizeFut);
-        asyncRunFut.add((IgniteInternalFuture) rmvFut);
-        asyncRunFut.add((IgniteInternalFuture) putFut);
-        asyncRunFut.add((IgniteInternalFuture) treePrintFut);
+        asyncRunFut.add((IgniteInternalFuture)sizeFut);
+        asyncRunFut.add((IgniteInternalFuture)rmvFut);
+        asyncRunFut.add((IgniteInternalFuture)putFut);
+        asyncRunFut.add((IgniteInternalFuture)treePrintFut);
 
         asyncRunFut.markInitialized();
 
@@ -2111,11 +2111,11 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
 
         asyncRunFut = new GridCompoundFuture<>();
 
-        asyncRunFut.add((IgniteInternalFuture) sizeFut);
-        asyncRunFut.add((IgniteInternalFuture) rmvFut);
-        asyncRunFut.add((IgniteInternalFuture) findFut);
-        asyncRunFut.add((IgniteInternalFuture) putFut);
-        asyncRunFut.add((IgniteInternalFuture) lockPrintingFut);
+        asyncRunFut.add((IgniteInternalFuture)sizeFut);
+        asyncRunFut.add((IgniteInternalFuture)rmvFut);
+        asyncRunFut.add((IgniteInternalFuture)findFut);
+        asyncRunFut.add((IgniteInternalFuture)putFut);
+        asyncRunFut.add((IgniteInternalFuture)lockPrintingFut);
 
         asyncRunFut.markInitialized();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java
index edfbcdb..1c6f4fc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java
@@ -365,7 +365,7 @@ public abstract class IgniteDbAbstractTest extends GridCommonAbstractTest {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
-            final LargeDbValue that = (LargeDbValue) o;
+            final LargeDbValue that = (LargeDbValue)o;
 
             if (str1 != null ? !str1.equals(that.str1) : that.str1 != null) return false;
             if (str2 != null ? !str2.equals(that.str2) : that.str2 != null) return false;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
index d604640..50f0af7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
@@ -38,10 +38,10 @@ public class IgniteDbSingleNodeTinyPutGetTest extends IgniteDbSingleNodePutGetTe
         IgniteCache<Short, Byte> cache = ig.cache("tiny");
 
         for (short i = 0; i < 1000; i++)
-            cache.put(i, (byte) i);
+            cache.put(i, (byte)i);
 
         for (short i = 0; i < 1000; i++)
-            assertEquals((byte) i, cache.get(i).byteValue());
+            assertEquals((byte)i, cache.get(i).byteValue());
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java
index 1992c82..f23194a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java
@@ -129,7 +129,7 @@ public class SwapPathConstructionSelfTest extends GridCommonAbstractTest {
 
         Object memProvider0 = U.field(memProvider, "memProvider");
 
-        return ((File) U.field(memProvider0, "allocationPath")).getAbsolutePath();
+        return ((File)U.field(memProvider0, "allocationPath")).getAbsolutePath();
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java
index f9f08b9..28ce0de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java
@@ -334,10 +334,10 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
 
         if (e != null) {
             if (e instanceof Error)
-                throw (Error) e;
+                throw (Error)e;
 
             if (e instanceof RuntimeException)
-                throw (RuntimeException) e;
+                throw (RuntimeException)e;
 
             throw new RuntimeException(e);
         }
@@ -409,10 +409,10 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
 
         if (e != null) {
             if (e instanceof Error)
-                throw (Error) e;
+                throw (Error)e;
 
             if (e instanceof RuntimeException)
-                throw (RuntimeException) e;
+                throw (RuntimeException)e;
 
             throw new RuntimeException(e);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index 86daec2..fade4f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -205,7 +205,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
             jcache().put(key, curVal);
 
             // Validate behavior for initialized cache (has current value).
-            assertTrue((Boolean) hnd.handleAsync(req).get().getResponse());
+            assertTrue((Boolean)hnd.handleAsync(req).get().getResponse());
         }
         finally {
             res = (T)jcache().getAndRemove(key);
@@ -238,7 +238,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
 
             assertTrue(jcache().size() == 10);
 
-            assertTrue((Boolean) hnd.handleAsync(req).get().getResponse());
+            assertTrue((Boolean)hnd.handleAsync(req).get().getResponse());
         }
         finally {
             assertTrue(jcache().size() == 0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
index 879e8c3..72b5729 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
@@ -153,7 +153,7 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest {
         assertEquals(GridRestResponse.STATUS_SUCCESS, resp.result().getSuccessStatus());
         assertNotNull(resp.result().getResponse());
 
-        CacheQueryResult res = (CacheQueryResult) resp.result().getResponse();
+        CacheQueryResult res = (CacheQueryResult)resp.result().getResponse();
 
         assertTrue(res.getLast());
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java
index 2dcae3d..6758b2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java
@@ -90,7 +90,7 @@ public abstract class CommonSecurityCheckTest extends AbstractSecurityTest {
 
         cfg.setPluginProviders(getPluginProvider(name));
 
-        SslContextFactory sslFactory = (SslContextFactory) GridTestUtils.sslFactory();
+        SslContextFactory sslFactory = (SslContextFactory)GridTestUtils.sslFactory();
 
         cfg.setSslContextFactory(sslFactory);
         cfg.setConnectorConfiguration(new ConnectorConfiguration()
@@ -154,7 +154,7 @@ public abstract class CommonSecurityCheckTest extends AbstractSecurityTest {
      * @return SSL context factory for clients.
      */
     @NotNull protected SslContextFactory getClientSslContextFactory() {
-        SslContextFactory sslFactory = (SslContextFactory) GridTestUtils.sslFactory();
+        SslContextFactory sslFactory = (SslContextFactory)GridTestUtils.sslFactory();
 
         sslFactory.setKeyStoreFilePath(U.resolveIgnitePath(GridTestProperties.getProperty("ssl.keystore.client.path"))
             .getAbsolutePath());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/closure/DistributedClosureRemoteSecurityContextCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/closure/DistributedClosureRemoteSecurityContextCheckTest.java
index f6b288b..818317c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/closure/DistributedClosureRemoteSecurityContextCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/closure/DistributedClosureRemoteSecurityContextCheckTest.java
@@ -76,8 +76,8 @@ public class DistributedClosureRemoteSecurityContextCheckTest extends AbstractRe
      */
     private Stream<IgniteRunnable> operations() {
         return Stream.of(
-            () -> compute(localIgnite(), nodesToCheckIds()).broadcast((IgniteRunnable) operationCheck()),
-            () -> compute(localIgnite(), nodesToCheckIds()).broadcastAsync((IgniteRunnable) operationCheck()).get(),
+            () -> compute(localIgnite(), nodesToCheckIds()).broadcast((IgniteRunnable)operationCheck()),
+            () -> compute(localIgnite(), nodesToCheckIds()).broadcastAsync((IgniteRunnable)operationCheck()).get(),
             () -> {
                 for (UUID id : nodesToCheckIds())
                     compute(id).call(operationCheck());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestAdditionalSecurityProcessor.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestAdditionalSecurityProcessor.java
index 3b46600..ec8652e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestAdditionalSecurityProcessor.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestAdditionalSecurityProcessor.java
@@ -74,13 +74,13 @@ public class TestAdditionalSecurityProcessor extends TestSecurityProcessor {
     /** {@inheritDoc} */
     @Override public SecurityContext authenticate(AuthenticationContext authCtx) throws IgniteCheckedException {
         if (checkSslCerts) {
-            String str = (String) authCtx.nodeAttributes().get(ADDITIONAL_SECURITY_CLIENT_VERSION_ATTR);
+            String str = (String)authCtx.nodeAttributes().get(ADDITIONAL_SECURITY_CLIENT_VERSION_ATTR);
 
             if (str == null)
                 throw new IgniteAccessControlException("Client version is not found.");
 
             if (ADDITIONAL_SECURITY_CLIENT_VERSION.equals(str)) {
-                String login = (String) authCtx.credentials().getLogin();
+                String login = (String)authCtx.credentials().getLogin();
 
                 if (login == null || !login.contains(CLIENT)) {
                     throw new IgniteAccessControlException("User isn't allowed to use client [login=" +
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestSecurityProcessor.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestSecurityProcessor.java
index 2cdf349..06cdbf2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestSecurityProcessor.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/impl/TestSecurityProcessor.java
@@ -115,7 +115,7 @@ public class TestSecurityProcessor extends GridProcessorAdapter implements GridS
 
         if (perms == null) {
             perms = new SecurityBasicPermissionSet();
-            ((SecurityBasicPermissionSet) perms).setDefaultAllowAll(true);
+            ((SecurityBasicPermissionSet)perms).setDefaultAllowAll(true);
         }
 
         SecurityContext res = new TestSecurityContext(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyTopologyInitializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyTopologyInitializationTest.java
index 7e1f026..de95e80 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyTopologyInitializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyTopologyInitializationTest.java
@@ -72,7 +72,7 @@ public class GridServiceProxyTopologyInitializationTest extends GridCommonAbstra
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         if (getTestIgniteInstanceName(NODES_CNT - 1).equals(igniteInstanceName)) {
-            ((TestTcpDiscoverySpi) cfg.getDiscoverySpi()).discoveryHook(new DiscoveryHook() {
+            ((TestTcpDiscoverySpi)cfg.getDiscoverySpi()).discoveryHook(new DiscoveryHook() {
                 @Override public void beforeDiscovery(DiscoveryCustomMessage customMsg) {
                     if (customMsg instanceof ServiceClusterDeploymentResultBatch) {
                         fullMsgReceivedLatch.countDown();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/sql/SqlParserCreateIndexSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/sql/SqlParserCreateIndexSelfTest.java
index bed4f1d..b095e54 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/sql/SqlParserCreateIndexSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/sql/SqlParserCreateIndexSelfTest.java
@@ -282,7 +282,7 @@ public class SqlParserCreateIndexSelfTest extends SqlParserAbstractSelfTest {
             SqlIndexColumn col = colIter.next();
 
             String expColName = (String)expColDefs[i++];
-            Boolean expDesc = (Boolean) expColDefs[i++];
+            Boolean expDesc = (Boolean)expColDefs[i++];
 
             assertEquals(expColName, col.name());
             assertEquals(expDesc, (Boolean)col.descending());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
index 6bbd3b6..e3aed3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
@@ -92,16 +92,16 @@ public class BitSetIntSetTest extends GridCommonAbstractTest {
         intSet.add(3);
         Iterator<Integer> iter = intSet.iterator();
 
-        assertEquals(1, (int) iter.next());
+        assertEquals(1, (int)iter.next());
 
         iter.hasNext();
         iter.hasNext();
         iter.hasNext();
-        assertEquals(2, (int) iter.next());
+        assertEquals(2, (int)iter.next());
 
         iter.hasNext();
         iter.hasNext();
-        assertEquals(3, (int) iter.next());
+        assertEquals(3, (int)iter.next());
     }
 
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/IntHashMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/IntHashMapTest.java
index 432fcb3..0991774 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/IntHashMapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/IntHashMapTest.java
@@ -151,7 +151,7 @@ public class IntHashMapTest extends AbstractBaseIntMapTest {
 
         assertThat(actualKeys, arrayContainingInAnyOrder(expectedKeys));
 
-        expected.forEach((key, expectedVal) -> assertThat(actual.get(key), is((Object) expectedVal)));
+        expected.forEach((key, expectedVal) -> assertThat(actual.get(key), is((Object)expectedVal)));
     }
 
     /**
@@ -181,6 +181,6 @@ public class IntHashMapTest extends AbstractBaseIntMapTest {
      * @param initSize Initial size.
      */
     private static int realCapacityForInitialSize(int initSize) {
-        return ((Object[]) U.field(new IntHashMap<String>(initSize), "entries")).length;
+        return ((Object[])U.field(new IntHashMap<String>(initSize), "entries")).length;
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
index 7053e4a..42da2a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java
@@ -106,7 +106,7 @@ public class IpcSharedMemoryCrashDetectionSelfTest extends GridCommonAbstractTes
 
         try {
             // Run client endpoint.
-            client = (IpcSharedMemoryClientEndpoint) IpcEndpointFactory.connectEndpoint(
+            client = (IpcSharedMemoryClientEndpoint)IpcEndpointFactory.connectEndpoint(
                 "shmem:" + IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, log);
 
             OutputStream os = client.outputStream();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestClient.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestClient.java
index 44165d0..3dabd96 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestClient.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestClient.java
@@ -48,7 +48,7 @@ public class SharedMemoryTestClient {
         OutputStream os = null;
 
         try {
-            IpcSharedMemoryClientEndpoint client = (IpcSharedMemoryClientEndpoint) IpcEndpointFactory.connectEndpoint(
+            IpcSharedMemoryClientEndpoint client = (IpcSharedMemoryClientEndpoint)IpcEndpointFactory.connectEndpoint(
                     "shmem:" + IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, new JavaLogger());
 
             os = client.outputStream();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
index 4aebb35..ebabb46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
@@ -136,7 +136,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
                     byte[] msg = new byte[MSG_SIZE];
 
                     for (int i = 0; i < msg.length; i++)
-                        msg[i] = (byte) (i ^ (i * i - 1)); // Some data
+                        msg[i] = (byte)(i ^ (i * i - 1)); // Some data
 
                     for (int i = 0; i < RECONNECT_MSG_CNT; i++)
                         validateSendMessage(srvr.port(), msg);
@@ -293,7 +293,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
                         byte[] msg = new byte[MSG_SIZE];
 
                         for (int i = 0; i < msg.length; i++)
-                            msg[i] = (byte) (i ^ (i * i - 1)); // Some data
+                            msg[i] = (byte)(i ^ (i * i - 1)); // Some data
 
                         try (Socket s = createSocket()) {
                             s.connect(new InetSocketAddress(U.getLocalHost(), srvr.port()), 1000);
@@ -1127,7 +1127,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
 
             int rangeMax = (int)((i + 1) * guessedMaxDuration / durationRange.length);
 
-            float percents = (float) durationRange[i] * 100 / overall.count();
+            float percents = (float)durationRange[i] * 100 / overall.count();
 
             info(">>> [" + rangeMin + '-' + rangeMax + "] ms: " + String.format("%.2f", percents) + "% (" +
                 durationRange[i] + " messages)");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
index 5bc0a8e..d32f9f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
@@ -292,7 +292,7 @@ public class GridToStringBuilderSelfTest extends GridCommonAbstractTest {
      * @throws Exception if failed.
... 4223 lines suppressed ...