This is an automated email from the ASF dual-hosted git repository. mmuzaf pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new 9084b83 IGNITE-14462 Add support EmptyCatchBlock for checkstyle (#9000) 9084b83 is described below commit 9084b83833e6b9adf5844d3a32698cf181304b5c Author: Maxim Muzafarov <mmu...@apache.org> AuthorDate: Tue Apr 13 15:42:02 2021 +0300 IGNITE-14462 Add support EmptyCatchBlock for checkstyle (#9000) --- checkstyle/checkstyle.xml | 5 +++++ .../processors/cache/GatewayProtectedCacheProxy.java | 2 +- .../processors/cache/GridCacheEvictionManager.java | 2 +- .../dht/colocated/GridDhtColocatedLockFuture.java | 2 +- .../cache/persistence/file/FileVersionCheckingFactory.java | 2 +- .../processors/cache/transactions/IgniteTxHandler.java | 2 +- .../datastructures/AtomicDataStructureProxy.java | 2 +- .../ignite/internal/processors/security/SecurityUtils.java | 2 +- .../org/apache/ignite/internal/sql/SqlParserUtils.java | 2 +- .../java/org/apache/ignite/internal/util/GridCleaner.java | 2 +- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/nio/GridNioSessionImpl.java | 2 +- .../apache/ignite/internal/util/worker/CycleThread.java | 2 +- .../spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java | 2 +- .../core/src/test/java/org/apache/ignite/GridTestJob.java | 2 +- .../CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java | 12 ++++++------ .../cache/ClientFastReplyCoordinatorFailureTest.java | 2 +- .../cache/IgniteAbstractDynamicCacheStartFailTest.java | 6 +++--- .../cache/SetTxTimeoutOnPartitionMapExchangeTest.java | 2 +- .../datastructures/GridCacheQueueClientDisconnectTest.java | 2 +- .../persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java | 3 +-- .../persistence/db/wal/crc/IgniteDataIntegrityTests.java | 4 ++-- .../cache/persistence/pagemem/PageMemoryImplTest.java | 2 +- .../cache/persistence/tree/io/TrackingPageIOTest.java | 2 +- .../processors/cache/transactions/TxOnCachesStopTest.java | 2 +- .../processors/cache/transactions/TxRollbackAsyncTest.java | 14 +++++++------- .../cache/transactions/TxRollbackOnTopologyChangeTest.java | 2 +- .../security/compute/ComputePermissionCheckTest.java | 2 +- ...idTcpCommunicationSpiSkipWaitHandshakeOnClientTest.java | 2 +- .../tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java | 8 ++++---- .../tcp/TcpClientDiscoveryUnresolvedHostTest.java | 2 +- .../yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java | 2 +- .../yardstick/jdbc/NativeSqlInsertDeleteBenchmark.java | 2 +- 33 files changed, 54 insertions(+), 50 deletions(-) diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 117b54b..3e674bd 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -36,6 +36,11 @@ <!-- Coding Checks. See: https://checkstyle.sourceforge.io/config_coding.html --> <module name="SimplifyBooleanExpression"/> + <!-- Config Blocks. See: https://checkstyle.sourceforge.io/config_blocks.html --> + <module name="EmptyCatchBlock"> + <property name="exceptionVariableName" value="ignore|expected"/> + </module> + <!-- Import Checks. See: http://checkstyle.sourceforge.net/config_imports.html --> <module name="RedundantImport"/> <module name="UnusedImports"/> 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 4c361d9..af34c12 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 @@ -1606,7 +1606,7 @@ public class GatewayProtectedCacheProxy<K, V> extends AsyncSupportAdapter<Ignite return gate(); } - } catch (IgniteCheckedException ice) { + } catch (IgniteCheckedException ignore) { // Opportunity didn't work out. } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index 0a58e2a..b3f3650 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -326,7 +326,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements try { plc.onEntryAccessed(true, e.wrapEviction()); } - catch (RuntimeException re) { + catch (RuntimeException ignore) { // It seems that this exception can be ignored due to the fact that // the original exception already exists and will be reported to the logger. } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 7ba91d7..ef8bd87 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -598,7 +598,7 @@ public final class GridDhtColocatedLockFuture extends GridCacheCompoundIdentityF try { wait(); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { // Ignore interrupts. } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java index 25ef715..5208ad2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java @@ -129,7 +129,7 @@ public class FileVersionCheckingFactory { try { latestVer = Integer.parseInt(System.getProperty(LATEST_VERSION_OVERRIDE_PROPERTY)); - } catch (NumberFormatException e) { + } catch (NumberFormatException ignore) { // No override. } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index cb1c33a..cc5370b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -1471,7 +1471,7 @@ public class IgniteTxHandler { tx.rollbackRemoteTx(); } } - catch (IgniteTxHeuristicCheckedException e) { + catch (IgniteTxHeuristicCheckedException ignore) { // Already uncommitted. } catch (Throwable e) { 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 59baec0..346a553 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 @@ -157,7 +157,7 @@ public abstract class AtomicDataStructureProxy<V extends AtomicDataStructureValu try { checkRemoved(); } - catch (Exception e) { + catch (Exception ignore) { // The original exception should be returned. } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java index 229cd27..10970a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java @@ -271,7 +271,7 @@ public class SecurityUtils { GridInternalWrapper.class.getMethod(mtd.getName(), mtd.getParameterTypes()) != null) return mtd.invoke(original, args); } - catch (NoSuchMethodException e) { + catch (NoSuchMethodException ignore) { // Ignore. } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParserUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParserUtils.java index 894aebb..38b8196 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParserUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParserUtils.java @@ -114,7 +114,7 @@ public class SqlParserUtils { // Fall through. } - catch (NumberFormatException e) { + catch (NumberFormatException ignore) { // Fall through. } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCleaner.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCleaner.java index be042fb..785cc55 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCleaner.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCleaner.java @@ -76,7 +76,7 @@ public class GridCleaner { try { return Class.forName(clsName, true, clsLdr); } - catch (ClassNotFoundException e) { + catch (ClassNotFoundException ignore) { // ignored; } } 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 401b3ec..d72dc8f 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 @@ -9638,7 +9638,7 @@ public abstract class IgniteUtils { " <property name=\"workDirectory\" value=\"location\"/> in IgniteConfiguration <bean>.\n"); } } - catch (Exception e) { + catch (Exception ignore) { // Ignore. } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java index d1574b6..64e250a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java @@ -282,7 +282,7 @@ public class GridNioSessionImpl implements GridNioSession { try { return meta.sslEngine().getSession().getPeerCertificates(); } - catch (SSLPeerUnverifiedException e) { + catch (SSLPeerUnverifiedException ignore) { // Nothing to do. } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/CycleThread.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/CycleThread.java index 9621c9a..5b0462e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/CycleThread.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/CycleThread.java @@ -49,7 +49,7 @@ public abstract class CycleThread extends Thread { iteration(); } } catch (InterruptedException e) { - // No op + // No-op } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java index 3ede4a3..46cdd9d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java @@ -408,7 +408,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin null : null; } - catch (FileNotFoundException e) { + catch (FileNotFoundException ignore) { // Ignore. } catch (IgniteCheckedException e) { diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java b/modules/core/src/test/java/org/apache/ignite/GridTestJob.java index a30dc27..92a0ebe 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java +++ b/modules/core/src/test/java/org/apache/ignite/GridTestJob.java @@ -58,7 +58,7 @@ public class GridTestJob extends ComputeJobAdapter { if (latch != null) { try { latch.await(); - } catch (InterruptedException e) { + } catch (InterruptedException ignore) { // Nothing to do } } diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java index 5455fd7..ae0ed56 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java @@ -469,7 +469,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA t1Count.decrementAndGet(); } - } catch (CacheException e) { + } catch (CacheException ignore) { //ignore } } @@ -491,7 +491,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA t2Count.decrementAndGet(); } - } catch (CacheException e) { + } catch (CacheException ignore) { //ignore } } @@ -544,7 +544,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA t1Count.decrementAndGet(); } - } catch (CacheException e) { + } catch (CacheException ignore) { //ignore } } @@ -566,7 +566,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA t2Count.decrementAndGet(); } - } catch (CacheException e) { + } catch (CacheException ignore) { //ignore } } @@ -612,7 +612,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA t1Count.decrementAndGet(); } - } catch (CacheException e) { + } catch (CacheException ignore) { //ignore } } @@ -634,7 +634,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA t2Count.decrementAndGet(); } - } catch (CacheException e) { + } catch (CacheException ignore) { //ignore } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientFastReplyCoordinatorFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientFastReplyCoordinatorFailureTest.java index 17b93fe..2e19018 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientFastReplyCoordinatorFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientFastReplyCoordinatorFailureTest.java @@ -227,7 +227,7 @@ public class ClientFastReplyCoordinatorFailureTest extends GridCommonAbstractTes try { PART_SINGLE_REQ_MSG_LATCH.await(); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { // no-op } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java index 3623a2a..618373b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java @@ -148,7 +148,7 @@ public abstract class IgniteAbstractDynamicCacheStartFailTest extends GridCacheA fail("Expected exception was not thrown."); } - catch (CacheException e) { + catch (CacheException ignore) { } stopGrid(clientName); @@ -173,7 +173,7 @@ public abstract class IgniteAbstractDynamicCacheStartFailTest extends GridCacheA fail("Expected exception was not thrown."); } - catch (CacheException e) { + catch (CacheException ignore) { } stopGrid(clientName); @@ -446,7 +446,7 @@ public abstract class IgniteAbstractDynamicCacheStartFailTest extends GridCacheA fail("Expected exception was not thrown"); } - catch (CacheException e) { + catch (CacheException ignore) { } } } 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 664c4e22..d0d1001 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 @@ -245,7 +245,7 @@ public class SetTxTimeoutOnPartitionMapExchangeTest extends GridCommonAbstractTe try { startGrid(idx); } - catch (Exception e) { + catch (Exception ignore) { // no-op. } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java index d8131fb..66b2820 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java @@ -89,7 +89,7 @@ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { catch (IgniteClientDisconnectedException icd) { latch.countDown(); } - catch (Exception e) { + catch (Exception ignore) { } } }); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java index 8503ab4..866cf22 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java @@ -39,7 +39,6 @@ import org.junit.Test; * */ public class IgnitePdsNoSpaceLeftOnDeviceTest extends GridCommonAbstractTest { - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -102,7 +101,7 @@ public class IgnitePdsNoSpaceLeftOnDeviceTest extends GridCommonAbstractTest { tx.commit(); } - catch (Exception e) { + catch (Exception ignore) { } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java index 4326d14..8e9296e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteDataIntegrityTests.java @@ -106,7 +106,7 @@ public class IgniteDataIntegrityTests { checkIntegrity(); fail(); - } catch (IgniteDataIntegrityViolationException ex) { + } catch (IgniteDataIntegrityViolationException ignore) { //success } } @@ -122,7 +122,7 @@ public class IgniteDataIntegrityTests { checkIntegrity(); fail(); - } catch (EOFException ex) { + } catch (EOFException ignore) { //success } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java index 1632e73..d271fce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java @@ -508,7 +508,7 @@ public class PageMemoryImplTest extends GridCommonAbstractTest { } }).get(5_000); } - catch (IgniteFutureTimeoutCheckedException ex) { + catch (IgniteFutureTimeoutCheckedException ignore) { // Expected. } finally { 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 16450aa..c9d8dd0 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 @@ -340,7 +340,7 @@ public class TrackingPageIOTest { fail(); } - catch (TrackingPageIsCorruptedException e) { + catch (TrackingPageIsCorruptedException ignore) { //ignore } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java index a5fbebb..4d49814 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java @@ -495,7 +495,7 @@ public class TxOnCachesStopTest extends GridCommonAbstractTest { if (!X.hasCause(e, TransactionRollbackException.class)) throw e; } - catch (IgniteException | IllegalStateException e) { + catch (IgniteException | IllegalStateException ignore) { // Failed to perform cache operation (cache is stopped). } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java index ad3e7e4..fe0806a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java @@ -249,7 +249,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { fail(); } - catch (Exception e) { + catch (Exception ignore) { // Expected. } @@ -258,7 +258,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { fail(); } - catch (Exception e) { + catch (Exception ignore) { // Expected. } @@ -267,7 +267,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { fail(); } - catch (Exception e) { + catch (Exception ignore) { // Expected. } @@ -281,7 +281,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { fail(); } - catch (Exception e) { + catch (Exception ignore) { // Expected. } @@ -290,7 +290,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { fail(); } - catch (Exception e) { + catch (Exception ignore) { // Expected. } @@ -299,7 +299,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { fail(); } - catch (Exception e) { + catch (Exception ignore) { // Expected. } @@ -387,7 +387,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { assertNull(o); // If rolled back by close, previous get will return null. } - catch (Exception e) { + catch (Exception ignore) { // If rolled back by rollback, previous get will throw an exception. } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTopologyChangeTest.java index 48e9de6..c43a2a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTopologyChangeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTopologyChangeTest.java @@ -162,7 +162,7 @@ public class TxRollbackOnTopologyChangeTest extends GridCommonAbstractTest { fail("Deadlock expected"); } - catch (Throwable t) { + catch (Throwable ignore) { // Expected. } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/ComputePermissionCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/ComputePermissionCheckTest.java index df83295..c2a7b1e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/ComputePermissionCheckTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/compute/ComputePermissionCheckTest.java @@ -107,7 +107,7 @@ public class ComputePermissionCheckTest extends AbstractSecurityTest { if (!isLocked) throw new IgniteException("tryLock should succeed or interrupted"); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { // This is expected. } finally { diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiSkipWaitHandshakeOnClientTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiSkipWaitHandshakeOnClientTest.java index 3199da1..b74a8a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiSkipWaitHandshakeOnClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiSkipWaitHandshakeOnClientTest.java @@ -113,7 +113,7 @@ public class GridTcpCommunicationSpiSkipWaitHandshakeOnClientTest extends GridCo try { startGrid(0); } - catch (Exception e) { + catch (Exception ignore) { // Noop } }).start(); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java index 4fc6b33..a42071d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java @@ -485,7 +485,7 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov Thread.sleep(writeToSocketDelay); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { // Nothing to do. } } @@ -508,7 +508,7 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov Thread.sleep(writeToSocketDelay); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { // Nothing to do. } } @@ -532,7 +532,7 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov Thread.sleep(writeToSocketDelay); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { // Nothing to do. } } @@ -566,7 +566,7 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov try { Thread.sleep(2000); } - catch (InterruptedException ignored) { + catch (InterruptedException ignore) { // No-op. } diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java index 29a2d1c..3f8ad60 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java @@ -61,7 +61,7 @@ public class TcpClientDiscoveryUnresolvedHostTest extends GridCommonAbstractTest public void test() throws Exception { try { startClientGrid(0); - } catch (IgniteCheckedException e) { + } catch (IgniteCheckedException ignore) { //Ignore. } diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java index c1106d7..3e32c0b 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java @@ -43,7 +43,7 @@ public class NativeJavaApiPutRemoveBenchmark extends AbstractNativeBenchmark { try { tabCache.put(insertKey, insertVal); tabCache.remove(insertKey); - } catch (IgniteException ign){ + } catch (IgniteException ignore){ // Collision occurred, ignoring. } diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeSqlInsertDeleteBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeSqlInsertDeleteBenchmark.java index 9b26703..a14d68a 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeSqlInsertDeleteBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeSqlInsertDeleteBenchmark.java @@ -52,7 +52,7 @@ public class NativeSqlInsertDeleteBenchmark extends AbstractNativeBenchmark { FieldsQueryCursor<List<?>> delCur = qryProc.querySqlFields(delete, false)) { // No-op, there is no result } - catch (Exception ign) { + catch (Exception ignore) { // collision occurred, ignoring }