NIFI-14178 Applied PMD EmptyCatchBlock and corrected violations (#9665)

Signed-off-by: David Handermann <[email protected]>
apache · Jan 24, 2025 · 583c4ec · 583c4ec
1 parent 584323b
commit 583c4ec
Show file tree

Hide file tree

Showing 116 changed files with 298 additions and 312 deletions.
diff --git a/...t/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandlerTest.java b/...t/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandlerTest.java
@@ -99,7 +99,7 @@ public void cleanUpAfterEach() {
             for (Path operationId : directoryStream) {
                 FileUtils.deleteDirectory(operationId.toFile());
             }
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
     }
 

diff --git a/...otstrap/src/main/java/org/apache/nifi/minifi/bootstrap/status/PeriodicStatusReporter.java b/...otstrap/src/main/java/org/apache/nifi/minifi/bootstrap/status/PeriodicStatusReporter.java
@@ -57,7 +57,7 @@ public void stop() {
         try {
             scheduledExecutorService.shutdown();
             scheduledExecutorService.awaitTermination(termination_wait, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException ignore) {
+        } catch (InterruptedException ignored) {
             // Shutting down anyway
         }
     }

diff --git a/...ns/minifi-commons-utils/src/main/java/org/apache/nifi/minifi/commons/utils/RetryUtil.java b/...ns/minifi-commons-utils/src/main/java/org/apache/nifi/minifi/commons/utils/RetryUtil.java
@@ -40,7 +40,7 @@ public static  <T> Optional<T> retry(Supplier<T> input, Predicate<T> predicate,
             retries++;
             try {
                 Thread.sleep(pauseDurationMillis);
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {
             }
         }
     }

diff --git a/...-core/src/test/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandlerTest.java b/...-core/src/test/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandlerTest.java
@@ -149,7 +149,7 @@ static class BootstrapCommunicatorStub implements BootstrapCommunicator, Runnabl
         public void run() {
             try {
                 sleep(waitBeforeAcknowledgeMs);
-            } catch (InterruptedException ignore) {
+            } catch (InterruptedException ignored) {
             }
             handler.accept(callbackResult, null);
         }

diff --git a/.../java/org/apache/nifi/minifi/c2/command/syncresource/DefaultSyncResourceStrategyTest.java b/.../java/org/apache/nifi/minifi/c2/command/syncresource/DefaultSyncResourceStrategyTest.java
@@ -90,7 +90,7 @@ public static void cleanUpAfterAll() {
             for (Path tmpFile : directoryStream) {
                Files.deleteIfExists(tmpFile);
             }
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -113,7 +113,7 @@ public void testAddingNewItems() {
         c2Items.forEach(resourceItem -> {
             try {
                 when(mockResourceRepository.addResourceItem(eq(resourceItem), any())).thenReturn(Optional.of(resourceItem));
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
         });
 
@@ -123,7 +123,7 @@ public void testAddingNewItems() {
         assertEquals(FULLY_APPLIED, resultState);
         try {
             verify(mockResourceRepository, never()).deleteResourceItem(any());
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -141,7 +141,7 @@ public void testAddingNewItemWhenBinaryPresent() {
         assertEquals(FULLY_APPLIED, resultState);
         try {
             verify(mockResourceRepository, never()).deleteResourceItem(any());
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -156,7 +156,7 @@ public void testAddingNewItemsSuccessWithValidResourcePath(String validResourceP
         c2Items.forEach(resourceItem -> {
             try {
                 when(mockResourceRepository.addResourceItem(eq(resourceItem), any())).thenReturn(Optional.of(resourceItem));
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
         });
 
@@ -166,7 +166,7 @@ public void testAddingNewItemsSuccessWithValidResourcePath(String validResourceP
         assertEquals(FULLY_APPLIED, resultState);
         try {
             verify(mockResourceRepository, never()).deleteResourceItem(any());
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -188,7 +188,7 @@ public void testAddingNewItemFailureWhenTypeIsAssetAndPathIsInvalid(String inval
             verify(mockResourceRepository, never()).addResourceItem(any());
             verify(mockResourceRepository, never()).addResourceItem(any(), any());
             verify(mockResourceRepository, never()).saveResourcesGlobalHash(C2_GLOBAL_HASH);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -206,7 +206,7 @@ public void testAddingNewItemFailureDueToIssueWithUrlEnrichment() {
         try {
             verify(mockResourceRepository, never()).deleteResourceItem(any());
             verify(mockResourceRepository, never()).saveResourcesGlobalHash(C2_GLOBAL_HASH);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -224,7 +224,7 @@ public void testAddingNewItemFailureDueToIssueInDownloadFunction() {
         try {
             verify(mockResourceRepository, never()).deleteResourceItem(any());
             verify(mockResourceRepository, never()).saveResourcesGlobalHash(C2_GLOBAL_HASH);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -245,7 +245,7 @@ public void testAddingNewItemFailureDueToIssueInPersistFunction() {
             try {
                 verify(mockResourceRepository, never()).deleteResourceItem(any());
                 verify(mockResourceRepository, never()).saveResourcesGlobalHash(C2_GLOBAL_HASH);
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
         }
     }
@@ -257,7 +257,7 @@ public void testAddingNewItemFailureDueToIssueWhenUpdatingRepository() {
         when(mockResourceRepository.findAllResourceItems()).thenReturn(List.of());
         try {
             when(mockResourceRepository.addResourceItem(resourceItem)).thenThrow(Exception.class);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
 
         OperationState resultState =
@@ -267,7 +267,7 @@ public void testAddingNewItemFailureDueToIssueWhenUpdatingRepository() {
         try {
             verify(mockResourceRepository, never()).deleteResourceItem(any());
             verify(mockResourceRepository, never()).saveResourcesGlobalHash(C2_GLOBAL_HASH);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -284,7 +284,7 @@ public void testDeletingAllItems() {
         agentItems.forEach(agentItem -> {
             try {
                 when(mockResourceRepository.deleteResourceItem(agentItem)).thenReturn(Optional.of(agentItem));
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
         });
 
@@ -294,7 +294,7 @@ public void testDeletingAllItems() {
         assertEquals(FULLY_APPLIED, resultState);
         try {
             verify(mockResourceRepository, never()).addResourceItem(any());
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -308,7 +308,7 @@ public void testDeleteFailureDueToIssueWithUpdatingRepository() {
         agentItems.forEach(agentItem -> {
             try {
                 when(mockResourceRepository.deleteResourceItem(agentItem)).thenThrow(Exception.class);
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
         });
 
@@ -319,7 +319,7 @@ public void testDeleteFailureDueToIssueWithUpdatingRepository() {
         try {
             verify(mockResourceRepository, never()).addResourceItem(any());
             verify(mockResourceRepository, never()).saveResourcesGlobalHash(C2_GLOBAL_HASH);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -330,7 +330,7 @@ public void testAddFileSuccessfulButUpdateGlobalHashFails() {
         try {
             when(mockResourceRepository.addResourceItem(eq(c2Item), any())).thenReturn(Optional.of(c2Item));
             when(mockResourceRepository.saveResourcesGlobalHash(C2_GLOBAL_HASH)).thenThrow(Exception.class);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
 
         OperationState resultState =
@@ -339,7 +339,7 @@ public void testAddFileSuccessfulButUpdateGlobalHashFails() {
         assertEquals(PARTIALLY_APPLIED, resultState);
         try {
             verify(mockResourceRepository, never()).deleteResourceItem(any());
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 

diff --git a/...work/minifi-runtime/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapListener.java b/...work/minifi-runtime/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapListener.java
@@ -203,7 +203,7 @@ public void stop() {
 
             try {
                 serverSocket.close();
-            } catch (IOException ioe) {
+            } catch (IOException ignored) {
                 // nothing to really do here. we could log this, but it would just become
                 // confusing in the logs, as we're shutting down and there's no real benefit
             }

diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
@@ -658,7 +658,7 @@ public Integer getPort() {
         Integer port = null;
         try {
             port = Integer.parseInt(getProperty(WEB_HTTP_PORT));
-        } catch (NumberFormatException nfe) {
+        } catch (NumberFormatException ignored) {
         }
         return port;
     }
@@ -667,7 +667,7 @@ public Integer getSslPort() {
         Integer sslPort = null;
         try {
             sslPort = Integer.parseInt(getProperty(WEB_HTTPS_PORT));
-        } catch (NumberFormatException nfe) {
+        } catch (NumberFormatException ignored) {
         }
         return sslPort;
     }
@@ -1858,10 +1858,7 @@ private static void readFromPropertiesFile(String propertiesFilePath, Properties
                 if (null != inStream) {
                     try {
                         inStream.close();
-                    } catch (final Exception ex) {
-                        /**
-                         * do nothing *
-                         */
+                    } catch (final Exception ignored) {
                     }
                 }
             }

diff --git a/...ite-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java b/...ite-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java
@@ -245,7 +245,7 @@ public EndpointConnection getEndpointConnection(final TransferDirection directio
                             peerSelector.penalize(peer, penalizationMillis);
                             try {
                                 peer.close();
-                            } catch (final IOException ioe) {
+                            } catch (final IOException ignored) {
                             }
 
                             continue;
@@ -296,7 +296,7 @@ public EndpointConnection getEndpointConnection(final TransferDirection directio
                 if (commsSession != null) {
                     try {
                         commsSession.close();
-                    } catch (final IOException ioe) {
+                    } catch (final IOException ignored) {
                     }
                 }
 
@@ -342,7 +342,7 @@ private void cleanup(final SocketClientProtocol protocol, final Peer peer) {
             } catch (final TransmissionDisabledException e) {
                 // User disabled transmission.... do nothing.
                 logger.debug("{} Transmission Disabled by User", this);
-            } catch (IOException e1) {
+            } catch (IOException ignored) {
             }
         }
 
@@ -352,7 +352,7 @@ private void cleanup(final SocketClientProtocol protocol, final Peer peer) {
             } catch (final TransmissionDisabledException e) {
                 // User disabled transmission.... do nothing.
                 logger.debug("{} Transmission Disabled by User", this);
-            } catch (IOException e1) {
+            } catch (IOException ignored) {
             }
         }
     }

diff --git a/...ommons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java b/...ommons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
@@ -53,7 +53,7 @@ public void close() {
             // 2 seconds, it is because the Runnable thread is blocking on a write; in this case,
             // we will just ignore it and return
             executorService.awaitTermination(2, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
+        } catch (InterruptedException ignored) {
         }
     }
 
@@ -246,7 +246,7 @@ public void run() {
                         final Response response = new Response(e);
                         responseQueue.put(response);
                     }
-                } catch (InterruptedException e) {
+                } catch (InterruptedException ignored) {
                 }
             }
         }

diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
@@ -55,8 +55,7 @@ public static void closeQuietly(final Closeable closeable) {
         if (null != closeable) {
             try {
                 closeable.close();
-            } catch (final IOException io) {
-                /*IGNORE*/
+            } catch (final IOException ignored) {
             }
         }
     }
@@ -70,8 +69,7 @@ public static void releaseQuietly(final FileLock lock) {
         if (null != lock) {
             try {
                 lock.release();
-            } catch (final IOException io) {
-                /*IGNORE*/
+            } catch (final IOException ignored) {
             }
         }
     }
@@ -508,8 +506,7 @@ public static void renameFile(final File source, final File destination, final i
     public static void sleepQuietly(final long millis) {
         try {
             Thread.sleep(millis);
-        } catch (final InterruptedException ex) {
-            /* do nothing */
+        } catch (final InterruptedException ignored) {
         }
     }
 

diff --git a/...s/nifi-write-ahead-log/src/test/java/org/apache/nifi/wali/TestLengthDelimitedJournal.java b/...s/nifi-write-ahead-log/src/test/java/org/apache/nifi/wali/TestLengthDelimitedJournal.java
@@ -461,7 +461,7 @@ public ByteArrayOutputStream getByteArrayOutputStream() {
                 if (count.getAndIncrement() == 1) {
                     try {
                         Thread.sleep(1000L);
-                    } catch (final InterruptedException ie) {
+                    } catch (final InterruptedException ignored) {
                     }
                 }
 
@@ -505,7 +505,7 @@ protected void poison(final Throwable t) {
                 if (count.getAndIncrement() == 0) { // it is only important that we sleep the first time. If we sleep every time, it just slows the test down.
                     try {
                         Thread.sleep(3000L);
-                    } catch (InterruptedException ignore) {
+                    } catch (InterruptedException ignored) {
                     }
                 }
 
@@ -524,15 +524,15 @@ protected void poison(final Throwable t) {
             final Thread t1 = new Thread(() -> {
                 try {
                     journal.update(Collections.singleton(firstRecord), key -> null);
-                } catch (final IOException ignore) {
+                } catch (final IOException ignored) {
                 }
             });
 
 
             final Thread t2 = new Thread(() -> {
                 try {
                     journal.update(Collections.singleton(secondRecord), key -> firstRecord);
-                } catch (final IOException ignore) {
+                } catch (final IOException ignored) {
                 }
             });
 

diff --git a/...fi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ExtractAvroMetadata.java b/...fi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ExtractAvroMetadata.java
@@ -192,7 +192,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
                             while (reader.nextBlock() != null) {
                                 recordCount += reader.getBlockCount();
                             }
-                        } catch (NoSuchElementException e) {
+                        } catch (NoSuchElementException ignored) {
                             // happens at end of file
                         }
                         avroMetadata.put(ITEM_COUNT_ATTR, String.valueOf(recordCount));

diff --git a/...dle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestSplitAvro.java b/...dle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestSplitAvro.java
@@ -287,7 +287,7 @@ private void checkBareRecordsSplitSize(final List<MockFlowFile> flowFiles, final
                         count++;
                         record = reader.read(record, decoder);
                     }
-                } catch (EOFException eof) {
+                } catch (EOFException ignored) {
                     // expected
                 }
                 assertEquals(expectedRecordsPerSplit, count);

diff --git a/...ndle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java b/...ndle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
@@ -785,7 +785,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
                             int available = 0;
                             try {
                                 available = in.available();
-                            } catch (IOException e) {
+                            } catch (IOException ignored) {
                                 // in case of the last part, the stream is already closed
                             }
                             getLogger().info("Success uploading part flowfile={} part={} available={} etag={} uploadId={}",

diff --git a/...utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcClobReadable.java b/...utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcClobReadable.java
@@ -110,7 +110,7 @@ private void validateClob(String someClob) throws SQLException, ClassNotFoundExc
 
         try {
             st.executeUpdate(dropTable);
-        } catch (final Exception e) {
+        } catch (final Exception ignored) {
             // table may not exist, this is not serious problem.
         }