IGNITE-4612 Minor code cleanup
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/529a5455 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/529a5455 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/529a5455 Branch: refs/heads/ignite-comm-balance-master Commit: 529a54555444abdf2477f7c0c56227c30911baa8 Parents: e613c00 Author: Alexander Menshikov <[email protected]> Authored: Wed Feb 1 15:31:42 2017 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Feb 1 15:31:44 2017 +0300 ---------------------------------------------------------------------- .../stream/camel/IgniteCamelStreamerTest.java | 4 +- .../cassandra/persistence/PojoKeyField.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 8 +- ...BinaryMarshallerInsertStatementSelfTest.java | 2 - ...cBinaryMarshallerMergeStatementSelfTest.java | 2 - .../internal/jdbc2/JdbcMetadataSelfTest.java | 2 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 3 +- .../ignite/codegen/MessageCodeGenerator.java | 2 +- .../org/apache/ignite/cache/QueryEntity.java | 1 - .../store/jdbc/CacheAbstractJdbcStore.java | 3 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +- .../ignite/internal/MarshallerContextImpl.java | 4 +- .../internal/binary/BinaryEnumObjectImpl.java | 4 +- .../internal/binary/BinaryMarshaller.java | 1 - .../impl/GridRouterCommandLineStartup.java | 4 +- .../cluster/ClusterNodeLocalMapImpl.java | 1 - .../internal/jdbc2/JdbcSqlFieldsQuery.java | 1 - .../ignite/internal/jdbc2/JdbcStatement.java | 2 - .../discovery/GridDiscoveryManager.java | 2 +- .../internal/mxbean/IgniteStandardMXBean.java | 12 +- .../cache/CacheEvictableEntryImpl.java | 4 +- .../processors/cache/CacheMetricsImpl.java | 10 +- .../processors/cache/GridCacheAtomicFuture.java | 3 +- .../cache/GridCacheDeploymentManager.java | 4 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 13 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../processors/cache/GridCacheTtlManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 2 - .../processors/cache/QueryCursorImpl.java | 6 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../GridDistributedCacheAdapter.java | 3 +- .../distributed/GridDistributedCacheEntry.java | 3 - .../GridDistributedLockResponse.java | 1 - .../dht/GridClientPartitionTopology.java | 1 - .../dht/GridDhtAssignmentFetchFuture.java | 3 +- .../distributed/dht/GridDhtCacheAdapter.java | 6 +- .../distributed/dht/GridDhtGetSingleFuture.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 7 +- .../dht/GridDhtPartitionTopology.java | 1 - .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 8 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 - .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 13 +- .../distributed/dht/GridDhtUnlockRequest.java | 3 +- .../GridDhtAtomicAbstractUpdateFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 8 +- .../atomic/GridNearAtomicFullUpdateRequest.java | 1 - .../dht/preloader/GridDhtForceKeysFuture.java | 8 +- .../dht/preloader/GridDhtPartitionDemander.java | 8 +- .../dht/preloader/GridDhtPartitionMap2.java | 3 +- .../GridDhtPartitionsExchangeFuture.java | 13 +- .../distributed/near/GridNearGetFuture.java | 7 +- ...arOptimisticSerializableTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 11 +- .../near/GridNearTxFinishFuture.java | 13 +- .../processors/cache/query/CacheQuery.java | 1 - .../cache/query/GridCacheSqlQuery.java | 2 - .../continuous/CacheContinuousQueryHandler.java | 2 +- .../cache/transactions/IgniteTxEntry.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 3 +- .../cache/transactions/IgniteTxStateImpl.java | 1 - .../cache/transactions/TxEntryValueHolder.java | 6 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../processors/clock/GridClockServer.java | 4 +- .../datastreamer/DataStreamProcessor.java | 3 +- .../datastreamer/DataStreamerImpl.java | 4 +- .../processors/hadoop/HadoopClasspathUtils.java | 4 +- .../internal/processors/igfs/IgfsProcessor.java | 3 +- .../igfs/client/IgfsClientSizeCallable.java | 1 - .../platform/PlatformAbstractBootstrap.java | 3 +- .../platform/PlatformConfigurationEx.java | 3 +- .../platform/cache/PlatformCache.java | 12 +- .../platform/utils/PlatformUtils.java | 2 +- .../processors/query/GridQueryProcessor.java | 2 +- .../resource/GridResourceProcessor.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 2 - .../string/GridRedisSetCommandHandler.java | 2 +- .../processors/task/GridTaskWorker.java | 2 +- .../internal/util/GridStripedSpinBusyLock.java | 2 +- .../ignite/internal/util/HostAndPortRange.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 3 +- .../ignite/internal/util/StripedExecutor.java | 2 +- .../visor/node/VisorIgfsConfiguration.java | 1 - .../ignite/marshaller/jdk/JdkMarshaller.java | 1 - .../optimized/OptimizedClassDescriptor.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../tcp/TcpCommunicationSpiMBean.java | 1 - .../ignite/spi/discovery/tcp/ClientImpl.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 7 +- .../tcp/internal/TcpDiscoveryStatistics.java | 8 +- .../CacheJdbcPojoStoreAbstractSelfTest.java | 2 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 3 - .../internal/ClusterGroupHostsSelfTest.java | 6 +- .../ComputeJobCancelWithServiceSelfTest.java | 2 +- .../internal/GridContinuousTaskSelfTest.java | 4 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../IgniteClientReconnectApiExceptionTest.java | 6 +- ...niteClientReconnectFailoverAbstractTest.java | 4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 3 +- .../GridDiscoveryManagerAttributesSelfTest.java | 4 +- .../BinaryObjectOffHeapUnswapTemporaryTest.java | 1 - .../cache/CacheAffinityCallSelfTest.java | 4 +- .../cache/CacheGetEntryAbstractTest.java | 2 +- .../CacheSerializableTransactionsTest.java | 6 +- .../CacheStartupInDeploymentModesTest.java | 7 +- .../cache/CacheStopAndDestroySelfTest.java | 6 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 48 ++--- .../processors/cache/GridCacheMvccSelfTest.java | 208 +++++++++---------- .../processors/cache/GridCacheStopSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 3 +- .../cache/GridCacheUtilsSelfTest.java | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 8 +- .../IgniteCacheConfigVariationsFullApiTest.java | 2 - .../cache/IgniteCacheStoreCollectionTest.java | 1 - ...gniteTopologyValidatorAbstractCacheTest.java | 6 +- .../processors/cache/IgniteTxAbstractTest.java | 3 +- .../cache/IgniteTxConfigCacheSelfTest.java | 2 +- .../IgniteTxExceptionAbstractSelfTest.java | 3 +- .../IgniteTxMultiThreadedAbstractTest.java | 4 +- .../CacheKeepBinaryWithInterceptorTest.java | 1 - ...yAtomicEntryProcessorDeploymentSelfTest.java | 4 +- ...IgniteCacheAbstractExecutionContextTest.java | 2 - ...eAbstractDataStructuresFailoverSelfTest.java | 16 +- .../IgniteLockAbstractSelfTest.java | 24 +-- .../CacheGetFutureHangsSelfTest.java | 6 +- .../CacheLateAffinityAssignmentTest.java | 2 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 4 +- ...niteCacheClientNodeChangingTopologyTest.java | 12 +- ...teSynchronizationModesMultithreadedTest.java | 8 +- .../IgniteCacheCrossCacheTxFailoverTest.java | 6 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +- ...gniteCachePutRetryTransactionalSelfTest.java | 4 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 3 +- .../GridCacheReplicatedPreloadSelfTest.java | 1 - .../IgniteCacheExpiryPolicyAbstractTest.java | 4 +- ...ContinuousQueryFailoverAbstractSelfTest.java | 6 +- ...dCacheContinuousQueryNodesFilteringTest.java | 2 +- ...IgniteCacheContinuousQueryReconnectTest.java | 12 +- .../TxDeadlockDetectionNoHangsTest.java | 2 +- .../transactions/TxDeadlockDetectionTest.java | 2 +- ...ComputeJobExecutionErrorToLogManualTest.java | 4 +- .../datastreamer/DataStreamerImplSelfTest.java | 8 +- .../datastreamer/DataStreamerTimeoutTest.java | 6 +- .../processors/igfs/IgfsAbstractSelfTest.java | 32 +-- .../processors/igfs/IgfsFileInfoSelfTest.java | 4 +- .../igfs/IgfsMetaManagerSelfTest.java | 3 +- .../igfs/IgfsModeResolverSelfTest.java | 10 +- .../igfs/benchmark/IgfsBenchmark.java | 4 +- .../cache/GridCacheCommandHandlerSelfTest.java | 1 - ...rviceDeploymentExceptionPropagationTest.java | 2 +- .../GridServiceProcessorStopSelfTest.java | 2 +- .../service/IgniteServiceReassignmentTest.java | 2 +- .../internal/util/IgniteUtilsSelfTest.java | 5 +- .../unsafe/GridOffheapSnapTreeSelfTest.java | 7 +- .../lang/GridMetadataAwareAdapterSelfTest.java | 4 +- .../p2p/GridP2PSameClassLoaderSelfTest.java | 14 +- .../platform/PlatformEventsWriteEventTask.java | 9 - .../local/GridLocalDeploymentSpiSelfTest.java | 6 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 8 +- .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 14 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 3 +- .../testframework/GridSpiTestContext.java | 5 +- .../ignite/testframework/IgniteTestSuite.java | 2 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 2 - ...essagingConfigVariationFullApiTestSuite.java | 4 +- .../ignite/util/mbeans/GridMBeanSelfTest.java | 10 +- .../CacheNoValueClassOnServerTestClient.java | 3 +- .../CacheConfigurationP2PTestClient.java | 3 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 4 +- .../hadoop/igfs/HadoopIgfsEndpoint.java | 4 +- .../HadoopBasicFileSystemFactoryDelegate.java | 2 +- .../hadoop/impl/igfs/HadoopIgfsInProc.java | 40 ++-- .../hadoop/impl/v2/HadoopV2Context.java | 3 +- .../taskexecutor/HadoopExecutorService.java | 6 +- .../child/HadoopChildProcessRunner.java | 10 +- .../hadoop/impl/HadoopErrorSimulator.java | 12 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 3 +- .../IgniteHadoopFileSystemClientSelfTest.java | 6 +- .../query/h2/GridH2ResultSetIterator.java | 3 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../query/h2/opt/GridH2IndexBase.java | 4 +- .../processors/query/h2/sql/DmlAstUtils.java | 2 +- .../query/h2/twostep/msg/GridH2Geometry.java | 2 +- .../cache/BinarySerializationQuerySelfTest.java | 2 - .../CacheRandomOperationsMultithreadedTest.java | 4 +- .../ClientReconnectAfterClusterRestartTest.java | 4 +- .../GridCacheQueryIndexDisabledSelfTest.java | 20 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 3 +- ...eLockPartitionOnAffinityRunAbstractTest.java | 1 - ...PartitionOnAffinityRunAtomicCacheOpTest.java | 11 +- ...niteCacheLockPartitionOnAffinityRunTest.java | 51 ++--- ...titionOnAffinityRunWithCollisionSpiTest.java | 10 +- .../cache/IgniteCacheMergeSqlQuerySelfTest.java | 1 - .../cache/IgniteCacheOffheapEvictQueryTest.java | 4 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteCacheUpdateSqlQuerySelfTest.java | 2 +- ...niteCacheDistributedQueryCancelSelfTest.java | 4 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 4 +- .../query/IgniteSqlSchemaIndexingTest.java | 15 +- .../query/IgniteSqlSplitterSelfTest.java | 4 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 4 - .../apache/ignite/stream/jms11/JmsStreamer.java | 4 +- .../ignite/stream/kafka/KafkaStreamer.java | 6 +- .../ignite/stream/kafka/TestKafkaBroker.java | 2 +- .../connect/IgniteSourceConnectorTest.java | 2 +- .../stream/mqtt/IgniteMqttStreamerTest.java | 4 +- .../BundleDelegatingClassLoader.java | 4 +- .../classloaders/ContainerSweepClassLoader.java | 4 +- .../spark/JavaStandaloneIgniteRDDSelfTest.java | 3 +- .../util/spring/IgniteSpringHelperImpl.java | 8 +- .../ignite/internal/GridFactorySelfTest.java | 2 +- .../internal/IgniteDynamicCacheConfigTest.java | 4 +- .../GridSpringTransactionManagerSelfTest.java | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 2 +- .../twitter/IgniteTwitterStreamerTest.java | 4 +- .../GridUriDeploymentFileProcessorSelfTest.java | 3 +- .../ignite/cache/websession/WebSessionV2.java | 2 +- .../internal/websession/WebSessionSelfTest.java | 6 +- .../apache/ignite/yarn/ApplicationMaster.java | 4 +- .../org/apache/ignite/yarn/IgniteProvider.java | 4 +- .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 2 +- 233 files changed, 604 insertions(+), 777 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java b/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java index f921a59..6940ea2 100644 --- a/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java +++ b/modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java @@ -115,7 +115,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { try { streamer.stop(); } - catch (Exception e) { + catch (Exception ignored) { // ignore if already stopped } @@ -275,7 +275,7 @@ public class IgniteCamelStreamerTest extends GridCommonAbstractTest { streamer.start(); fail("Streamer started; should have failed."); } - catch (IgniteException e) { + catch (IgniteException ignored) { assertTrue(streamer.getCamelContext().getStatus() == ServiceStatus.Stopped); assertTrue(streamer.getCamelContext().getEndpointRegistry().size() == 0); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java index 6f42db2..ec37411 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java @@ -55,7 +55,7 @@ public class PojoKeyField extends PojoField { try { sortOrder = SortOrder.valueOf(el.getAttribute(SORT_ATTR).trim().toUpperCase()); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ignored) { throw new IllegalArgumentException("Incorrect sort order '" + el.getAttribute(SORT_ATTR) + "' specified"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 80e7baa..893732d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -269,12 +269,6 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract final GridClientNode second = iter.next(); - final GridClientPredicate<GridClientNode> noneFilter = new GridClientPredicate<GridClientNode>() { - @Override public boolean apply(GridClientNode node) { - return false; - } - }; - final GridClientPredicate<GridClientNode> targetFilter = new GridClientPredicate<GridClientNode>() { @Override public boolean apply(GridClientNode node) { return node.nodeId().equals(second.nodeId()); @@ -527,4 +521,4 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract assertEquals("Invalid tx flags: " + t, FULL_SYNC, t.syncMode()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java index 667e9f0..18410a8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java @@ -18,8 +18,6 @@ package org.apache.ignite.internal.jdbc2; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; /** * JDBC test of INSERT statement w/binary marshaller - no nodes know about classes. http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java index 93451e7..c467b82 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java @@ -18,8 +18,6 @@ package org.apache.ignite.internal.jdbc2; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; /** * JDBC test of MERGE statement w/binary marshaller - no nodes know about classes. http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java index 7184b8d..d750376 100755 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java @@ -298,7 +298,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { tbls.getObject(i + 1); } } - catch (Exception e) { + catch (Exception ignored) { fail(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index 72d93c9..d8226be 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -301,7 +301,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { tbls.getObject(i + 1); } } - catch (Exception e) { + catch (Exception ignored) { fail(); } } @@ -361,4 +361,4 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { this.name = name; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java index 048643b..c41b754 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java @@ -18,7 +18,6 @@ package org.apache.ignite.jdbc.suite; import junit.framework.TestSuite; -import org.apache.ignite.internal.jdbc2.JdbcDistributedJoinsQueryTest; import org.apache.ignite.jdbc.JdbcComplexQuerySelfTest; import org.apache.ignite.jdbc.JdbcConnectionSelfTest; import org.apache.ignite.jdbc.JdbcEmptyCacheSelfTest; @@ -70,4 +69,4 @@ public class IgniteJdbcDriverTestSuite extends TestSuite { return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index 65ebd8d..5a26187 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@ -924,4 +924,4 @@ public class MessageCodeGenerator { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java index c8abdfa..510c29e 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java @@ -20,7 +20,6 @@ package org.apache.ignite.cache; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java index e7ce526..7af238b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java @@ -81,7 +81,6 @@ import static org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory.DFLT_ import static org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory.DFLT_PARALLEL_LOAD_CACHE_MINIMUM_THRESHOLD; import static org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory.DFLT_WRITE_ATTEMPTS; import static org.apache.ignite.cache.store.jdbc.JdbcTypesTransformer.NUMERIC_TYPES; -import static org.apache.ignite.cache.store.jdbc.JdbcTypesTransformer.NUMERIC_TYPES; /** * Implementation of {@link CacheStore} backed by JDBC. @@ -1401,7 +1400,7 @@ public abstract class CacheAbstractJdbcStore<K, V> implements CacheStore<K, V>, } else if (field.getJavaFieldType().isEnum() && fieldVal instanceof Enum) { Enum val = (Enum)fieldVal; - + fieldVal = NUMERIC_TYPES.contains(field.getDatabaseFieldType()) ? val.ordinal() : val.name(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java index 6a46619..89988f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java @@ -130,7 +130,7 @@ public class CacheJdbcBlobStoreFactory<K, V> implements Factory<CacheJdbcBlobSto store.setDataSource(data); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { throw new IgniteException("Failed to load bean in application context [beanName=" + dataSrcBean + ", igniteConfig=" + appCtx + ']'); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java ---------------------------------------------------------------------- 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 f3e368d..9ca24fd 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 @@ -167,7 +167,7 @@ public class MarshallerContextImpl extends MarshallerContextAdapter { return true; } - catch (CachePartialUpdateCheckedException | GridCacheTryPutFailedException e) { + catch (CachePartialUpdateCheckedException | GridCacheTryPutFailedException ignored) { if (++failedCnt > 10) { if (log.isQuiet()) U.quiet(false, "Failed to register marshalled class for more than 10 times in a row " + @@ -214,7 +214,7 @@ public class MarshallerContextImpl extends MarshallerContextAdapter { clsName = reader.readLine(); } } - catch (IOException e) { + catch (IOException ignored) { throw new IgniteCheckedException("Class definition was not found " + "at marshaller cache and local file. " + "[id=" + id + ", file=" + file.getAbsolutePath() + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index 9fd6bc1..3318988 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -205,7 +205,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac return new SB().a(val).toString(); } - catch (Exception e) { + catch (Exception ignored) { // No-op. } @@ -215,7 +215,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac try { type = rawType(); } - catch (Exception e) { + catch (Exception ignored) { type = null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java index bd95103..dfc726e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java @@ -25,7 +25,6 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.marshaller.AbstractNodeNameAwareMarshaller; -import org.apache.ignite.marshaller.MarshallerContext; import org.jetbrains.annotations.Nullable; import sun.misc.Unsafe; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java index ac1ca62..6889e73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java @@ -137,7 +137,7 @@ public class GridRouterCommandLineStartup { try { t = U.addLog4jNoOpLogger(); } - catch (Exception e) { + catch (Exception ignored) { isLog4jUsed = false; } } @@ -168,4 +168,4 @@ public class GridRouterCommandLineStartup { } }); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java index 3147b12..26a9013 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java @@ -26,7 +26,6 @@ import java.io.ObjectStreamException; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCluster; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcSqlFieldsQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcSqlFieldsQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcSqlFieldsQuery.java index 1b27296..19dedf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcSqlFieldsQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcSqlFieldsQuery.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.jdbc2; import org.apache.ignite.cache.query.SqlFieldsQuery; -import org.jetbrains.annotations.Nullable; /** * {@link SqlFieldsQuery} with JDBC flavor - it has additional flag indicating whether JDBC driver expects http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java index 5621058..d7e387f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.jdbc2; -import java.sql.BatchUpdateException; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -35,7 +34,6 @@ import java.util.UUID; import org.apache.ignite.Ignite; import org.apache.ignite.internal.processors.query.IgniteSQLException; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.U; import static java.sql.ResultSet.CONCUR_READ_ONLY; import static java.sql.ResultSet.FETCH_FORWARD; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- 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 9aa4db1..71d8ad9 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 @@ -1443,7 +1443,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { try { return getSpi().pingNode(nodeId); } - catch (IgniteException e) { + catch (IgniteException ignored) { return false; } finally { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java index e4ae161..1aad4b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java @@ -105,7 +105,7 @@ public class IgniteStandardMXBean extends StandardMBean { } } } - catch (SecurityException e) { + catch (SecurityException ignored) { // No-op. Default value will be returned. } @@ -153,7 +153,7 @@ public class IgniteStandardMXBean extends StandardMBean { assert str.charAt(str.length() - 1) == '.' : str; } } - catch (SecurityException | ClassNotFoundException e) { + catch (SecurityException | ClassNotFoundException ignored) { // No-op. Default value will be returned. } @@ -183,7 +183,7 @@ public class IgniteStandardMXBean extends StandardMBean { assert str.charAt(str.length() - 1) == '.' : str; } } - catch (SecurityException | ClassNotFoundException e) { + catch (SecurityException | ClassNotFoundException ignored) { // No-op. Default value will be returned. } @@ -209,7 +209,7 @@ public class IgniteStandardMXBean extends StandardMBean { assert str.trim().length() > 0; } } - catch (SecurityException | ClassNotFoundException e) { + catch (SecurityException | ClassNotFoundException ignored) { // No-op. Default value will be returned. } @@ -265,7 +265,7 @@ public class IgniteStandardMXBean extends StandardMBean { if (res != null) return res; } - catch (NoSuchMethodException e) { + catch (NoSuchMethodException ignored) { // No-op. Default value will be returned. } @@ -281,4 +281,4 @@ public class IgniteStandardMXBean extends StandardMBean { return res; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java index 770daa1..b0a2150 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java @@ -91,7 +91,7 @@ public class CacheEvictableEntryImpl<K, V> implements EvictableEntry<K, V> { return val != null ? val.<V>value(cached.context().cacheObjectContext(), false) : null; } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignored) { return null; } catch (IgniteCheckedException e) { @@ -121,7 +121,7 @@ public class CacheEvictableEntryImpl<K, V> implements EvictableEntry<K, V> { return valBytes == null ? keyBytes.length : keyBytes.length + valBytes.length; } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignored) { return 0; } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java index a60c22b..753cca1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java @@ -224,7 +224,7 @@ public class CacheMetricsImpl implements CacheMetrics { try { return cctx.swap().offheapEntriesCount(true, false, cctx.affinity().affinityTopologyVersion()); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { return 0; } } @@ -234,7 +234,7 @@ public class CacheMetricsImpl implements CacheMetrics { try { return cctx.swap().offheapEntriesCount(false, true, cctx.affinity().affinityTopologyVersion()); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { return 0; } } @@ -281,7 +281,7 @@ public class CacheMetricsImpl implements CacheMetrics { try { return cctx.cache().swapKeys(); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { return 0; } } @@ -291,7 +291,7 @@ public class CacheMetricsImpl implements CacheMetrics { try { return cctx.cache().swapSize(); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { return 0; } } @@ -905,4 +905,4 @@ public class CacheMetricsImpl implements CacheMetrics { @Override public String toString() { return S.toString(CacheMetricsImpl.class, this); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java index c96d00f..3e11d50 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.cache; -import java.util.Collection; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; @@ -38,4 +37,4 @@ public interface GridCacheAtomicFuture<R> extends GridCacheFuture<R> { * @return Future or {@code null} if no need to wait. */ public IgniteInternalFuture<Void> completeFuture(AffinityTopologyVersion topVer); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index ad4892b..5c0e407 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -343,8 +343,8 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap catch (GridCacheEntryRemovedException ignore) { return false; } - catch (BinaryInvalidTypeException ignore) { - log.error("An attempt to undeploy cache with binary objects.", ignore); + catch (BinaryInvalidTypeException ex) { + log.error("An attempt to undeploy cache with binary objects.", ex); return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- 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 f6dfe95..e44f4a8 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 @@ -1841,7 +1841,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana catch (IgniteInterruptedCheckedException e) { throw e; } - catch (IgniteClientDisconnectedCheckedException e) { + catch (IgniteClientDisconnectedCheckedException ignored) { return; } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- 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 9487589..84126e4 100755 --- 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 @@ -210,12 +210,11 @@ public class GridCacheProcessor extends GridProcessorAdapter { } /** - * @param internalCache Internal cache flag. * @param cfg Initializes cache configuration with proper defaults. * @param cacheObjCtx Cache object context. * @throws IgniteCheckedException If configuration is not valid. */ - private void initialize(boolean internalCache, CacheConfiguration cfg, CacheObjectContext cacheObjCtx) + private void initialize(CacheConfiguration cfg, CacheObjectContext cacheObjCtx) throws IgniteCheckedException { if (cfg.getCacheMode() == null) cfg.setCacheMode(DFLT_CACHE_MODE); @@ -623,7 +622,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(cfg); // Initialize defaults. - initialize(internalCaches.contains(maskNull(cfg.getName())), cfg, cacheObjCtx); + initialize(cfg, cacheObjCtx); cfgs[i] = cfg; // Replace original configuration value. @@ -755,7 +754,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (rmtCfg != null) { CacheConfiguration locCfg = desc.cacheConfiguration(); - checkCache(locCfg, rmtCfg, n, desc); + checkCache(locCfg, rmtCfg, n); // Check plugin cache configurations. CachePluginManager pluginMgr = desc.pluginManager(); @@ -2836,11 +2835,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @param locCfg Local configuration. * @param rmtCfg Remote configuration. * @param rmtNode Remote node. - * @param desc Cache descriptor. * @throws IgniteCheckedException If check failed. */ - private void checkCache(CacheConfiguration locCfg, CacheConfiguration rmtCfg, ClusterNode rmtNode, - DynamicCacheDescriptor desc) throws IgniteCheckedException { + private void checkCache(CacheConfiguration locCfg, CacheConfiguration rmtCfg, ClusterNode rmtNode) throws IgniteCheckedException { ClusterNode locNode = ctx.discovery().localNode(); UUID rmt = rmtNode.id(); @@ -3697,7 +3694,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(cfg); - initialize(false, cfg, cacheObjCtx); + initialize(cfg, cacheObjCtx); req.startCacheConfiguration(cfg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index 2509b88..159b3b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -187,7 +187,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { } } } - catch (GridDhtInvalidPartitionException e) { + catch (GridDhtInvalidPartitionException ignored) { // Skip entry. } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java index 0f855fe..6b61c91 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java @@ -141,7 +141,7 @@ public class GridCacheTtlManager extends GridCacheManagerAdapter { break; } - catch (GridCacheEntryRemovedException e0) { + catch (GridCacheEntryRemovedException ignored) { entry = entry.context().cache().entryEx(entry.key()); touch = true; @@ -322,4 +322,4 @@ public class GridCacheTtlManager extends GridCacheManagerAdapter { return e; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 969c41a..72a9a64 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -74,12 +74,10 @@ import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.P1; -import org.apache.ignite.internal.util.typedef.P2; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgnitePredicate; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java index 852c432..24789fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.sql.ResultSet; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; @@ -199,4 +195,4 @@ public class QueryCursorImpl<T> implements QueryCursorEx<T> { /** Result ready. */RESULT_READY, /** Closed. */CLOSED, } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- 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 1d60c42..c11f71f 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 @@ -398,7 +398,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm try { res = BinaryUtils.mergeMetadata(oldMeta0, newMeta); } - catch (BinaryObjectException e) { + catch (BinaryObjectException ignored) { res = oldMeta0; } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- 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 d89a468..7e4deff 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 @@ -43,7 +43,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheSwapEntry; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter; -import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx; @@ -448,4 +447,4 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter return true; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java index 3d55f31..f518934 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java @@ -38,9 +38,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED; -import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED; - /** * Entry for distributed (replicated/partitioned) cache. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 61a2388..ceba71d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import java.io.Externalizable; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java index 816132d..7c1f760 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java @@ -37,7 +37,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.Gri import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture; -import org.apache.ignite.internal.util.F0; import org.apache.ignite.internal.util.GridAtomicLong; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.F; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java index ab8e863..d1e3780 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.LinkedList; import java.util.Queue; import java.util.UUID; -import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; @@ -220,4 +219,4 @@ public class GridDhtAssignmentFetchFuture extends GridFutureAdapter<GridDhtAffin @Override public String toString() { return S.toString(GridDhtAssignmentFetchFuture.class, this); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index c9f7c5c..c278812 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -821,7 +821,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap req.addDeploymentInfo()); } } - catch (NodeStoppingException e) { + catch (NodeStoppingException ignored) { return; } catch (IgniteCheckedException e) { @@ -887,7 +887,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap res.entries(entries); } - catch (NodeStoppingException e) { + catch (NodeStoppingException ignored) { return; } catch (IgniteCheckedException e) { @@ -1214,7 +1214,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap return !aff1.equals(aff2); } - catch (IllegalStateException e) { + catch (IllegalStateException ignored) { return true; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java index 9394937..5e915a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java @@ -445,7 +445,7 @@ public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCa try { onDone(toEntryInfo(fut.get())); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { assert false; // Should never happen. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index 3ce1dd8..d45a86a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -787,7 +787,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>, return lastEntry; } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignored) { if (log.isDebugEnabled()) log.debug("Got removed entry: " + lastEntry); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- 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 125b4f8..a0270b0 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 @@ -486,7 +486,7 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean> MiniFuture f = (MiniFuture)fut; if (f.node().id().equals(nodeId)) { - f.onResult(new ClusterTopologyCheckedException("Remote node left grid (will ignore): " + nodeId)); + f.onResult(); found = true; } @@ -947,7 +947,7 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean> catch (IgniteCheckedException e) { // Fail the whole thing. if (e instanceof ClusterTopologyCheckedException) - fut.onResult((ClusterTopologyCheckedException)e); + fut.onResult(); else { if (msgLog.isDebugEnabled()) { msgLog.debug("DHT lock fut, failed to send request [txId=" + nearLockVer + @@ -1196,9 +1196,8 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean> } /** - * @param e Node failure. */ - void onResult(ClusterTopologyCheckedException e) { + void onResult() { if (msgLog.isDebugEnabled()) { msgLog.debug("DHT lock fut, mini future node left [txId=" + nearLockVer + ", dhtTxId=" + lockVer + http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java index 14ce1f9..bdd84b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.UUID; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 1b4dcc9..7965482 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -210,7 +210,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { break; } - catch (IgniteFutureTimeoutCheckedException e) { + catch (IgniteFutureTimeoutCheckedException ignored) { if (dumpCnt++ < GridDhtPartitionsExchangeFuture.DUMP_PENDING_OBJECTS_THRESHOLD) { U.warn(log, "Failed to wait for partition eviction [" + "topVer=" + topVer + http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- 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 a9e3bc4..dea4072 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 @@ -390,7 +390,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach try { keyFut.get(); } - catch (NodeStoppingException e) { + catch (NodeStoppingException ignored) { return; } catch (IgniteCheckedException e) { @@ -408,7 +408,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach try { fut.get(); } - catch (NodeStoppingException e) { + catch (NodeStoppingException ignored) { return; } catch (IgniteCheckedException e) { @@ -439,11 +439,11 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach try { ctx.io().send(nodeId, res, ctx.ioPolicy()); } - catch (ClusterTopologyCheckedException e0) { + catch (ClusterTopologyCheckedException ignored) { if (log.isDebugEnabled()) log.debug("Failed to send lock reply to remote node because it left grid: " + nodeId); } - catch (IgniteCheckedException e0) { + catch (IgniteCheckedException ignored) { U.error(log, "Failed to send lock reply to node: " + nodeId, e); } } @@ -1142,7 +1142,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach try { ctx.io().send(nearNode, res, ctx.ioPolicy()); } - catch (ClusterTopologyCheckedException e) { + catch (ClusterTopologyCheckedException ignored) { if (log.isDebugEnabled()) log.debug("Failed to send client lock remap response, client node failed " + "[node=" + nearNode + ", req=" + req + ']'); @@ -1654,7 +1654,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach if (keyBytes != null) for (KeyCacheObject key : keyBytes) - req.addNearKey(key, ctx.shared()); + req.addNearKey(key); req.completedVersions(committed, rolledback); @@ -1683,7 +1683,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach try { for (KeyCacheObject key : keyBytes) - req.addNearKey(key, ctx.shared()); + req.addNearKey(key); req.completedVersions(committed, rolledback); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index 147cbea..60e07b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -135,7 +135,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur MiniFuture f = (MiniFuture)fut; if (f.node().id().equals(nodeId)) { - f.onNodeLeft(new ClusterTopologyCheckedException("Remote node left grid: " + nodeId), true); + f.onNodeLeft(); return true; } @@ -634,14 +634,12 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur * @param e Node failure. */ void onNodeLeft(ClusterTopologyCheckedException e) { - onNodeLeft(e, false); + onNodeLeft(); } /** - * @param e Node failure. - * @param discoThread {@code True} if executed from discovery thread. */ - void onNodeLeft(ClusterTopologyCheckedException e, boolean discoThread) { + void onNodeLeft() { if (msgLog.isDebugEnabled()) { msgLog.debug("DHT finish fut, mini future node left [txId=" + tx.nearXidVersion() + ", dhtTxId=" + tx.xidVersion() + http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java index 4e39e9b..7199ede 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java @@ -57,7 +57,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled; import static org.apache.ignite.transactions.TransactionState.PREPARED; import static org.apache.ignite.transactions.TransactionState.PREPARING; -import static org.apache.ignite.transactions.TransactionState.UNKNOWN; /** * Replicated user transaction. http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 1823cce..67e1993 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -42,7 +42,6 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; -import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException; import org.apache.ignite.internal.util.F0; import org.apache.ignite.internal.util.GridLeanMap; import org.apache.ignite.internal.util.GridLeanSet; @@ -595,7 +594,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { break; } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignored) { if (log.isDebugEnabled()) log.debug("Get removed entry: " + key); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- 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 ca2b494..eadb69e 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 @@ -322,7 +322,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter MiniFuture f = (MiniFuture)fut; if (f.node().id().equals(nodeId)) { - f.onNodeLeft(new ClusterTopologyCheckedException("Remote node left grid: " + nodeId)); + f.onNodeLeft(); return true; } @@ -1313,8 +1313,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter ", node=" + n.id() + ']'); } } - catch (ClusterTopologyCheckedException e) { - fut.onNodeLeft(e); + catch (ClusterTopologyCheckedException ignored) { + fut.onNodeLeft(); } catch (IgniteCheckedException e) { if (!cctx.kernalContext().isStopping()) { @@ -1396,8 +1396,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter ", node=" + nearMapping.node().id() + ']'); } } - catch (ClusterTopologyCheckedException e) { - fut.onNodeLeft(e); + catch (ClusterTopologyCheckedException ignored) { + fut.onNodeLeft(); } catch (IgniteCheckedException e) { if (!cctx.kernalContext().isStopping()) { @@ -1629,9 +1629,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter } /** - * @param e Node failure. */ - void onNodeLeft(ClusterTopologyCheckedException e) { + void onNodeLeft() { if (msgLog.isDebugEnabled()) { msgLog.debug("DHT prepare fut, mini future node left [txId=" + tx.nearXidVersion() + ", dhtTxId=" + tx.xidVersion() + http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 1d067da..3737295 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -69,10 +69,9 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { * Adds a Near key. * * @param key Key. - * @param ctx Context. * @throws IgniteCheckedException If failed. */ - public void addNearKey(KeyCacheObject key, GridCacheSharedContext ctx) + public void addNearKey(KeyCacheObject key) throws IgniteCheckedException { if (nearKeys == null) nearKeys = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java index 361fbe2..1b175d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java @@ -370,7 +370,7 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte registerResponse(req.nodeId()); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { U.error(msgLog, "Failed to send request [futId=" + futVer + ", writeVer=" + writeVer + ", node=" + req.nodeId() + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- 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 acfe141..fdc0578 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 @@ -549,7 +549,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { throws IgniteCheckedException { return getAllAsyncInternal(keys, !ctx.config().isReadFromBackup(), - true, null, ctx.kernalContext().job().currentTaskName(), deserializeBinary, @@ -573,7 +572,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { ) { return getAllAsyncInternal(keys, forcePrimary, - skipTx, subjId, taskName, deserializeBinary, @@ -586,7 +584,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** * @param keys Keys. * @param forcePrimary Force primary flag. - * @param skipTx Skip tx flag. * @param subjId Subject ID. * @param taskName Task name. * @param deserializeBinary Deserialize binary flag. @@ -599,7 +596,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { private IgniteInternalFuture<Map<K, V>> getAllAsyncInternal( @Nullable final Collection<? extends K> keys, final boolean forcePrimary, - boolean skipTx, @Nullable UUID subjId, final String taskName, final boolean deserializeBinary, @@ -1709,7 +1705,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (forceFut != null) forceFut.get(); } - catch (NodeStoppingException e) { + catch (NodeStoppingException ignored) { return; } catch (IgniteCheckedException e) { @@ -1726,7 +1722,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { try { fut.get(); } - catch (NodeStoppingException e) { + catch (NodeStoppingException ignored) { return; } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java index 87d9225..08c2474 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java @@ -41,7 +41,6 @@ import org.apache.ignite.internal.processors.cache.distributed.IgniteExternaliza import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.GridLongList; import org.apache.ignite.internal.util.tostring.GridToStringInclude; -import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U;
