[#noissue] Fix EmptyCatchBlock

hungbv1 · May 2, 2022 · 77ca760 · 77ca760
1 parent cb8efd3
commit 77ca760
Show file tree

Hide file tree

Showing 76 changed files with 125 additions and 120 deletions.
diff --git a/...p-core/src/main/java/com/navercorp/pinpoint/bootstrap/classloader/LauncherBootLoader.java b/...p-core/src/main/java/com/navercorp/pinpoint/bootstrap/classloader/LauncherBootLoader.java
@@ -60,7 +60,7 @@ private static Method findBootstrapClassOrNullMethod() {
             Method findBootstrapClass0 = ClassLoader.class.getDeclaredMethod("findBootstrapClass0", String.class);
             findBootstrapClass0.setAccessible(true);
             return findBootstrapClass0;
-        } catch (NoSuchMethodException ignore) {
+        } catch (NoSuchMethodException ignored) {
             // skip
         }
         throw new IllegalStateException("ClassLoader.findBootstrapClassOrNull api not found", rootException);

diff --git a/...-core/src/main/java/com/navercorp/pinpoint/bootstrap/classloader/ParallelClassLoader.java b/...-core/src/main/java/com/navercorp/pinpoint/bootstrap/classloader/ParallelClassLoader.java
@@ -102,7 +102,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
                         } else {
                             clazz = this.bootLoader.findBootstrapClassOrNull(this, name);
                         }
-                    } catch (ClassNotFoundException ignore) {
+                    } catch (ClassNotFoundException ignored) {
                     }
                     if (clazz == null) {
                         // if not found, try to load a class by this ClassLoader

diff --git a/...raps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtils.java b/...raps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtils.java
@@ -96,7 +96,7 @@ public static List<String> getHostIpList() {
         Enumeration<NetworkInterface> interfaces = null;
         try {
             interfaces = NetworkInterface.getNetworkInterfaces();
-        } catch (SocketException ignore) {
+        } catch (SocketException ignored) {
             // skip
         }
 
@@ -154,7 +154,7 @@ private static boolean isSkipNetworkInterface(NetworkInterface networkInterface)
                 return true;
             }
             return false;
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
             // skip
         }
         return true;

diff --git a/...a/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java b/...a/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java
@@ -16,7 +16,7 @@ public void indexSize_0() {
         try {
             new DefaultInterceptorRegistryAdaptor(-1);
             Assert.fail();
-        } catch (IllegalArgumentException ignore) {
+        } catch (IllegalArgumentException ignored) {
         }
 
     }
@@ -28,7 +28,7 @@ public void indexSize_1() {
             StaticAroundInterceptor mock = mock(StaticAroundInterceptor.class);
             interceptorRegistry.addInterceptor(mock);
             Assert.fail();
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
     }
 
@@ -39,7 +39,7 @@ public void indexSize_2() {
         try {
             interceptorRegistry.addInterceptor(mock(StaticAroundInterceptor.class));
             Assert.fail();
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
     }
 

diff --git a/.../test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java b/.../test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java
@@ -265,7 +265,7 @@ public void run() {
 //                    referenceTest.changeId(0, i);
                     try {
                         Thread.sleep(10);
-                    } catch (InterruptedException ignore) {
+                    } catch (InterruptedException ignored) {
                     }
                     i++;
                 }

diff --git a/...a9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9ClassLoader.java b/...a9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9ClassLoader.java
@@ -109,7 +109,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
                         } else {
                             clazz = bootLoader.findBootstrapClassOrNull(this, name);
                         }
-                    } catch (ClassNotFoundException ignore) {
+                    } catch (ClassNotFoundException ignored) {
                     }
                     if (clazz == null) {
                         // if not found, try to load a class by this ClassLoader

diff --git a/...trap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java b/...trap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java
@@ -156,7 +156,7 @@ private void close(Closeable closeable) {
         }
         try {
             closeable.close();
-        } catch (IOException ignore) {
+        } catch (IOException ignored) {
             // skip
         }
     }

diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/monitor/CollectorMetric.java b/collector/src/main/java/com/navercorp/pinpoint/collector/monitor/CollectorMetric.java
@@ -160,7 +160,7 @@ private void shutdown() {
             if (reporter instanceof Closeable) {
                 try {
                     ((Closeable) reporter).close();
-                } catch (IOException e) {
+                } catch (IOException ignored) {
                     // ignore
                 }
             }

diff --git a/.../test/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperJobWorkerTest.java b/.../test/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperJobWorkerTest.java
@@ -136,12 +136,12 @@ public void test3() throws Exception {
             CreateNodeMessage createNodeMessage = new CreateNodeMessage(PATH, new byte[0]);
             try {
                 zookeeperClient.createOrSetNode(createNodeMessage);
-            } catch (Exception ignore) {
+            } catch (Exception ignored) {
             }
 
             try {
                 zookeeperClient.createOrSetNode(createNodeMessage);
-            } catch (Exception ignore) {
+            } catch (Exception ignored) {
             }
 
             waitZookeeperServerData(0, zookeeperClient);

diff --git a/...ctor/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/SpanServerTestMain.java b/...ctor/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/SpanServerTestMain.java
@@ -136,7 +136,7 @@ public void dispatchSendMessage(ServerRequest<GeneratedMessageV3> serverRequest)
 //            System.out.println("## Incoming " + IncomingCounter.addAndGet(1));
             try {
                 TimeUnit.SECONDS.sleep(1);
-            } catch (InterruptedException ignore) {
+            } catch (InterruptedException ignored) {
             }
 
             final GeneratedMessageV3 data = serverRequest.getData();

diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java
@@ -73,14 +73,14 @@ public void testPadBytes_Error() {
         try {
             buffer1_1.putPadBytes(new byte[11], 10);
             Assert.fail("error");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
         Buffer buffer1_2 = new AutomaticBuffer(32);
         try {
             buffer1_2.putPadBytes(new byte[20], 10);
             Assert.fail("error");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
         Buffer buffer2 = new AutomaticBuffer(32);
@@ -122,14 +122,14 @@ public void testPadString_Error() {
         try {
             buffer1_1.putPadString(StringUtils.repeat("a", 11), 10);
             Assert.fail("error");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
         Buffer buffer1_2 = new AutomaticBuffer(32);
         try {
             buffer1_2.putPadString(StringUtils.repeat("a", 20), 10);
             Assert.fail("error");
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
 
         Buffer buffer2 = new AutomaticBuffer(32);
@@ -156,7 +156,7 @@ public void testPut2PrefixedBytes() {
             byte[] bytes4 = new byte[Short.MAX_VALUE+1];
             checkPut2PrefixedBytes(bytes4);
             Assert.fail("too large bytes");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
     }
 

diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/FixedBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/FixedBufferTest.java
@@ -109,14 +109,14 @@ public void testPadBytes_Error() {
         try {
             buffer1_1.putPadBytes(new byte[11], 10);
             Assert.fail("error");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
         Buffer buffer1_2 = new FixedBuffer(32);
         try {
             buffer1_2.putPadBytes(new byte[20], 10);
             Assert.fail("error");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
         Buffer buffer2 = new FixedBuffer(32);
@@ -181,14 +181,14 @@ public void testPadString_Error() {
         Buffer buffer1_1 = new FixedBuffer(32);
         try {
             buffer1_1.putPadString(StringUtils.repeat("a", 11), 10);
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
         Buffer buffer1_2 = new FixedBuffer(32);
         try {
             buffer1_2.putPadString(StringUtils.repeat("a", 20), 10);
             Assert.fail("error");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
         Buffer buffer2 = new FixedBuffer(32);
@@ -211,7 +211,7 @@ public void testPut2PrefixedBytes() {
             byte[] bytes2 = new byte[Short.MAX_VALUE + 1];
             checkPut2PrefixedBytes(BytesUtils.toString(bytes2), endExpected, Short.MAX_VALUE * 2);
             Assert.fail("too large bytes");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
 
     }
@@ -474,7 +474,7 @@ public void readVInt_errorCase() {
         try {
             buffer.readVInt();
             Assert.fail("invalid VInt");
-        } catch (IllegalArgumentException ignore) {
+        } catch (IllegalArgumentException ignored) {
         }
 
         Assert.assertEquals(0, buffer.getOffset());
@@ -487,7 +487,7 @@ public void readVLong_errorCase() {
         try {
             buffer.readVLong();
             Assert.fail("invalid VLong");
-        } catch (IllegalArgumentException ignore) {
+        } catch (IllegalArgumentException ignored) {
         }
 
         Assert.assertEquals(0, buffer.getOffset());

diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java
@@ -36,12 +36,12 @@ public void testFixedBuffer() {
         try {
             new OffsetFixedBuffer(new byte[10], 11, 0);
             Assert.fail();
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
         try {
             new OffsetFixedBuffer(new byte[10], -1, 0);
             Assert.fail();
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
     }
 

diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/util/BytesUtilsTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/util/BytesUtilsTest.java
@@ -235,13 +235,13 @@ public void testWriteLong_fail() {
         try {
             BytesUtils.writeLong(1234, such_long, -1);
             fail("negative offset did not catched");
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
 
         try {
             BytesUtils.writeLong(2222, such_long, 9);
             fail("index out of range exception did not catched");
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
 
         BytesUtils.writeLong(-1l, such_long, 2);
@@ -511,19 +511,19 @@ public void testCheckBound_fail() {
         try {
             BytesUtils.checkBounds(buffer, buffer.length, buffer.length);
             Assert.fail("bound check fail");
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
 
         try {
             BytesUtils.checkBounds(buffer, 2, buffer.length);
             Assert.fail("bound check fail");
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
 
         try {
             BytesUtils.checkBounds(buffer, -1, buffer.length);
             Assert.fail("bound check fail");
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
 
         try {

diff --git a/...-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/batch/BufferedMutatorWriter.java b/...-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/batch/BufferedMutatorWriter.java
@@ -206,7 +206,7 @@ private void closeMutator() {
         for (BufferedMutator mutator : this.mutatorMap.values()) {
             try {
                 mutator.close();
-            } catch (IOException ignore) {
+            } catch (IOException ignored) {
                 //
             }
         }

diff --git a/...n/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClient.java b/...n/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClient.java
@@ -94,7 +94,7 @@ public void createPath(String value) throws PinpointZookeeperException {
         if (stat == null) {
             try {
                 curator.create().creatingParentsIfNeeded().withMode(CreateMode.PERSISTENT).forPath(path);
-            } catch (KeeperException.NodeExistsException nodeExists) {
+            } catch (KeeperException.NodeExistsException ignored) {
                 // skip
             } catch (Exception e) {
                 ZookeeperExceptionResolver.resolveAndThrow(e);
@@ -218,7 +218,7 @@ public void delete(String path) throws PinpointZookeeperException {
             CuratorFramework curator = connectionManager.getCuratorFramework();
 
             curator.delete().forPath(path);
-        } catch (KeeperException.NoNodeException noNode) {
+        } catch (KeeperException.NoNodeException ignored) {
             // skip
         } catch (Exception e) {
             ZookeeperExceptionResolver.resolveAndThrow(e);

diff --git a/...va/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java b/...va/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java
@@ -146,7 +146,7 @@ public void createOrSetNodeTest() throws Exception {
             try {
                 curatorZookeeperClient.createOrSetNode(new CreateNodeMessage(testNodePath, message.getBytes()));
                 Assert.fail();
-            } catch (Exception ignore) {
+            } catch (Exception ignored) {
             }
 
             boolean existNode = isExistNode(zooKeeper, path);

diff --git a/...ons-server/src/main/java/com/navercorp/pinpoint/common/server/trace/DefaultApiParser.java b/...ons-server/src/main/java/com/navercorp/pinpoint/common/server/trace/DefaultApiParser.java
@@ -29,7 +29,7 @@ public Api parse(ApiMetaDataBo apiMetadata) {
             String apiInfo = apiDescription.getApiDescription();
 
             return new Api(method, className, apiInfo, MethodTypeEnum.DEFAULT);
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
             // ignore
         }
 

diff --git a/...rc/main/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageDeserializer.java b/...rc/main/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageDeserializer.java
@@ -58,7 +58,7 @@ public Object deserialize(AgentEventType agentEventType, byte[] eventBody) throw
                 try {
                     Message<TBase<?, ?>> deserialize = SerializationUtils.deserialize(eventBody, deserializerFactory);
                     return deserialize.getData();
-                } catch (TException e) {
+                } catch (TException ignored) {
                     // ignore
                 }
             }

diff --git a/...avercorp/pinpoint/common/server/bo/serializer/agent/ApplicationNameRowKeyEncoderTest.java b/...avercorp/pinpoint/common/server/bo/serializer/agent/ApplicationNameRowKeyEncoderTest.java
@@ -54,7 +54,7 @@ public void testGetTraceIndexRowKey3() {
         try {
             check(applicationName, time);
             Assert.fail("error");
-        } catch (IndexOutOfBoundsException ignore) {
+        } catch (IndexOutOfBoundsException ignored) {
         }
     }
 

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/ByteSizeUnit.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/ByteSizeUnit.java
@@ -94,7 +94,7 @@ public long getMaxSize() {
     public static long getByteSize(String value, long defaultValue) {
         try {
             return getByteSize(value);
-        } catch (Exception ignore) {
+        } catch (Exception ignored) {
         }
         return defaultValue;
     }

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/ClassLoaderUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/ClassLoaderUtils.java
@@ -77,7 +77,7 @@ public static ClassLoader getDefaultClassLoader(ClassLoaderCallable defaultClass
             if (contextClassLoader != null) {
                 return contextClassLoader;
             }
-        } catch (Throwable ignore) {
+        } catch (Throwable ignored) {
             // skip
         }
         // Timing for security exceptions is different when the ClassLoader is received as an argument

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/ClassUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/ClassUtils.java
@@ -43,7 +43,7 @@ public static boolean isLoaded(String name, ClassLoader classLoader) {
         try {
             classLoaderToUse.loadClass(name);
             return true;
-        } catch (ClassNotFoundException ignore) {
+        } catch (ClassNotFoundException ignored) {
             return false;
         }
     }

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/ContentLength.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/ContentLength.java
@@ -138,7 +138,7 @@ public long getLength(Object context) {
             if (context instanceof InputStream) {
                 try {
                     return ((InputStream) context).available();
-                } catch (IOException ignore) {
+                } catch (IOException ignored) {
                     // io error
                     return NOT_EXIST;
                 }

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/IOUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/IOUtils.java
@@ -121,7 +121,7 @@ public static void closeQuietly(Closeable closeable) {
         if (closeable != null) {
             try {
                 closeable.close();
-            } catch (IOException ignore) {
+            } catch (IOException ignored) {
                 // skip
             }
         }
@@ -137,7 +137,7 @@ public static void closeQuietly(Socket socket) {
         if (socket != null) {
             try {
                 socket.close();
-            } catch (IOException ignore) {
+            } catch (IOException ignored) {
                 // skip
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,7 @@ private void close(Closeable closeable) { @@
             }
             try {
                 closeable.close();
-            } catch (IOException ignore) {
+            } catch (IOException ignored) {
                 // skip
             }
         }
@@ Expand Down @@