fix ignored exceptions

Vincent Potucek · Vincent Potucek · commit 333af51453a8 · 2025-06-13T12:27:42.000+02:00
Signed-off-by: Vincent Potucek &lt;vpotucek@me.com&gt;
diff --git a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
@@ -158,8 +158,7 @@ void testRollbackRulesOnMethodPreventRollback() throws Exception {
 		try {
 			rb.echoException(new ServletException());
 		}
-		catch (ServletException ex) {
-
+		catch (ServletException ignored) {
 		}
 		assertThat(txMan.commits).as("Transaction counts match").isEqualTo(1);
 	}
@@ -272,9 +271,7 @@ public void before(Method method, Object[] args, Object target) throws Throwable
 					TransactionInterceptor.currentTransactionStatus();
 					throw new RuntimeException("Shouldn't have a transaction");
 				}
-				catch (NoTransactionException ex) {
-					// this is Ok
-				}
+				catch (NoTransactionException ignored) { } // this is Ok
 			}
 			super.before(method, args, target);
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
@@ -453,10 +453,9 @@ private ShadowMatch getTargetShadowMatch(Method method, Class<?> targetClass) {
 							ClassUtils.toClassArray(ifcs), targetClass.getClassLoader());
 					targetMethod = ClassUtils.getMostSpecificMethod(targetMethod, compositeInterface);
 				}
-				catch (IllegalArgumentException ex) {
-					// Implemented interfaces probably expose conflicting method signatures...
-					// Proceed with original target method.
-				}
+				catch (IllegalArgumentException ignored) { }
+				// Implemented interfaces probably expose conflicting method signatures...
+				// Proceed with original target method.
 			}
 		}
 		return getShadowMatch(targetMethod, method);
@@ -478,7 +477,7 @@ private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
 					try {
 						shadowMatch = pointcutExpression.matchesMethodExecution(methodToMatch);
 					}
-					catch (ReflectionWorldException ex) {
+					catch (ReflectionWorldException ignored) {
 						// Failed to introspect target method, probably because it has been loaded
 						// in a special ClassLoader. Let's try the declaring ClassLoader instead...
 						try {
@@ -501,7 +500,7 @@ private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
 						try {
 							shadowMatch = pointcutExpression.matchesMethodExecution(methodToMatch);
 						}
-						catch (ReflectionWorldException ex) {
+						catch (ReflectionWorldException ignored) {
 							// Could neither introspect the target class nor the proxy class ->
 							// let's try the original method's declaring class before we give up...
 							try {
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -233,8 +233,7 @@ void serializableTargetAndAdvice() throws Throwable {
 		try {
 			p2.echo(new IOException());
 		}
-		catch (IOException ex) {
-
+		catch (IOException ignored) {
 		}
 		assertThat(cta.getCalls()).isEqualTo(2);
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
@@ -229,8 +229,7 @@ private static void close(Closeable closeable) {
 		try {
 			closeable.close();
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpResponse.java b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpResponse.java
@@ -100,8 +100,7 @@ public void close() {
 		try {
 			getBody().close();
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
@@ -89,8 +89,7 @@ public void close() {
 				this.httpResponse.close();
 			}
 		}
-		catch (IOException ex) {
-			// Ignore exception on close...
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/ReactorClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/ReactorClientHttpResponse.java
@@ -108,8 +108,7 @@ public void close() {
 			StreamUtils.drain(body);
 			body.close();
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
@@ -158,21 +158,15 @@ protected void writeContent(Resource resource, HttpOutputMessage outputMessage)
 				in.transferTo(out);
 				out.flush();
 			}
-			catch (NullPointerException ex) {
-				// ignore, see SPR-13620
-			}
+			catch (NullPointerException ignored) { } // ignore, see SPR-13620
 			finally {
 				try {
 					in.close();
 				}
-				catch (Throwable ex) {
-					// ignore, see SPR-12999
-				}
+				catch (Throwable ignored) { } // ignore, see SPR-12999
 			}
 		}
-		catch (FileNotFoundException ex) {
-			// ignore, see SPR-12999
-		}
+		catch (FileNotFoundException ignored) { } // ignore, see SPR-12999
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
@@ -183,9 +183,7 @@ protected void writeResourceRegion(ResourceRegion region, HttpOutputMessage outp
 			try {
 				in.close();
 			}
-			catch (IOException ex) {
-				// ignore
-			}
+			catch (IOException ignored) { }
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -152,8 +152,7 @@ private static byte[] getResponseBody(ClientHttpResponse response) {
 		try {
 			return FileCopyUtils.copyToByteArray(response.getBody());
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 		return new byte[0];
 	}
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
@@ -93,7 +93,7 @@ void requestContextListenerWithDifferentThread() {
 		try {
 			thread.join();
 		}
-		catch (InterruptedException ex) {
+		catch (InterruptedException ignored) {
 		}
 		// Still bound to original thread, but at least completed.
 		assertThat(RequestContextHolder.getRequestAttributes()).isNotNull();
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/MockClientHttpResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/MockClientHttpResponse.java
@@ -100,8 +100,7 @@ public void close() {
 		try {
 			getBody().close();
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
@@ -76,8 +76,7 @@ else if (location instanceof UrlResource) {
 			Assert.isTrue(path.endsWith(FOLDER_SEPARATOR) || path.endsWith(WINDOWS_FOLDER_SEPARATOR),
 					"Resource location does not end with slash: " + path);
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
@@ -191,8 +191,7 @@ void closeStreamIfNecessary(InputStream body) {
 		try {
 			body.close();
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
@@ -77,8 +77,7 @@ else if (location instanceof UrlResource) {
 			Assert.isTrue(path.endsWith(FOLDER_SEPARATOR) || path.endsWith(WINDOWS_FOLDER_SEPARATOR),
 					"Resource location does not end with slash: " + path);
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
@@ -611,8 +611,7 @@ static class ResponseStatusTestExceptionResolver {
 
 		@ExceptionHandler(SocketTimeoutException.class)
 		@ResponseStatus(code = HttpStatus.GATEWAY_TIMEOUT, reason = "gateway.timeout")
-		public void handleException(SocketTimeoutException ex) {
-
+		public void handleException(SocketTimeoutException ignored) {
 		}
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/BinaryWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/BinaryWebSocketHandler.java
@@ -41,8 +41,7 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
 		try {
 			session.close(CloseStatus.NOT_ACCEPTABLE.withReason("Text messages not supported"));
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/TextWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/TextWebSocketHandler.java
@@ -41,8 +41,7 @@ protected void handleBinaryMessage(WebSocketSession session, BinaryMessage messa
 		try {
 			session.close(CloseStatus.NOT_ACCEPTABLE.withReason("Binary messages not supported"));
 		}
-		catch (IOException ex) {
-			// ignore
+		catch (IOException ignored) {
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,7 @@ void testRollbackRulesOnMethodPreventRollback() throws Exception {`
`158`	`158`	`try {`
`159`	`159`	`rb.echoException(new ServletException());`
`160`	`160`	`}`
`161`		`- catch (ServletException ex) {`
`162`		`-`
	`161`	`+ catch (ServletException ignored) {`
`163`	`162`	`}`
`164`	`163`	`assertThat(txMan.commits).as("Transaction counts match").isEqualTo(1);`
`165`	`164`	`}`
`@@ -272,9 +271,7 @@ public void before(Method method, Object[] args, Object target) throws Throwable`
`272`	`271`	`TransactionInterceptor.currentTransactionStatus();`
`273`	`272`	`throw new RuntimeException("Shouldn't have a transaction");`
`274`	`273`	`}`
`275`		`- catch (NoTransactionException ex) {`
`276`		`- // this is Ok`
`277`		`- }`
	`274`	`+ catch (NoTransactionException ignored) { } // this is Ok`
`278`	`275`	`}`
`279`	`276`	`super.before(method, args, target);`
`280`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,8 +233,7 @@ void serializableTargetAndAdvice() throws Throwable {`
`233`	`233`	`try {`
`234`	`234`	`p2.echo(new IOException());`
`235`	`235`	`}`
`236`		`- catch (IOException ex) {`
`237`		`-`
	`236`	`+ catch (IOException ignored) {`
`238`	`237`	`}`
`239`	`238`	`assertThat(cta.getCalls()).isEqualTo(2);`
`240`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,7 @@ private static void close(Closeable closeable) {`
`229`	`229`	`try {`
`230`	`230`	`closeable.close();`
`231`	`231`	`}`
`232`		`- catch (IOException ex) {`
`233`		`- // ignore`
	`232`	`+ catch (IOException ignored) {`
`234`	`233`	`}`
`235`	`234`	`}`
`236`	`235`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,7 @@ public void close() {`
`100`	`100`	`try {`
`101`	`101`	`getBody().close();`
`102`	`102`	`}`
`103`		`- catch (IOException ex) {`
`104`		`- // ignore`
	`103`	`+ catch (IOException ignored) {`
`105`	`104`	`}`
`106`	`105`	`}`
`107`	`106`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,7 @@ public void close() {`
`89`	`89`	`this.httpResponse.close();`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`- catch (IOException ex) {`
`93`		`- // Ignore exception on close...`
	`92`	`+ catch (IOException ignored) {`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,7 @@ public void close() {`
`108`	`108`	`StreamUtils.drain(body);`
`109`	`109`	`body.close();`
`110`	`110`	`}`
`111`		`- catch (IOException ex) {`
`112`		`- // ignore`
	`111`	`+ catch (IOException ignored) {`
`113`	`112`	`}`
`114`	`113`	`}`
`115`	`114`
Original file line number	Diff line number	Diff line change
`@@ -158,21 +158,15 @@ protected void writeContent(Resource resource, HttpOutputMessage outputMessage)`
`158`	`158`	`in.transferTo(out);`
`159`	`159`	`out.flush();`
`160`	`160`	`}`
`161`		`- catch (NullPointerException ex) {`
`162`		`- // ignore, see SPR-13620`
`163`		`- }`
	`161`	`+ catch (NullPointerException ignored) { } // ignore, see SPR-13620`
`164`	`162`	`finally {`
`165`	`163`	`try {`
`166`	`164`	`in.close();`
`167`	`165`	`}`
`168`		`- catch (Throwable ex) {`
`169`		`- // ignore, see SPR-12999`
`170`		`- }`
	`166`	`+ catch (Throwable ignored) { } // ignore, see SPR-12999`
`171`	`167`	`}`
`172`	`168`	`}`
`173`		`- catch (FileNotFoundException ex) {`
`174`		`- // ignore, see SPR-12999`
`175`		`- }`
	`169`	`+ catch (FileNotFoundException ignored) { } // ignore, see SPR-12999`
`176`	`170`	`}`
`177`	`171`
`178`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,9 +183,7 @@ protected void writeResourceRegion(ResourceRegion region, HttpOutputMessage outp`
`183`	`183`	`try {`
`184`	`184`	`in.close();`
`185`	`185`	`}`
`186`		`- catch (IOException ex) {`
`187`		`- // ignore`
`188`		`- }`
	`186`	`+ catch (IOException ignored) { }`
`189`	`187`	`}`
`190`	`188`	`}`
`191`	`189`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,7 @@ private static byte[] getResponseBody(ClientHttpResponse response) {`
`152`	`152`	`try {`
`153`	`153`	`return FileCopyUtils.copyToByteArray(response.getBody());`
`154`	`154`	`}`
`155`		`- catch (IOException ex) {`
`156`		`- // ignore`
	`155`	`+ catch (IOException ignored) {`
`157`	`156`	`}`
`158`	`157`	`return new byte[0];`
`159`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void requestContextListenerWithDifferentThread() {`
`93`	`93`	`try {`
`94`	`94`	`thread.join();`
`95`	`95`	`}`
`96`		`- catch (InterruptedException ex) {`
	`96`	`+ catch (InterruptedException ignored) {`
`97`	`97`	`}`
`98`	`98`	`// Still bound to original thread, but at least completed.`
`99`	`99`	`assertThat(RequestContextHolder.getRequestAttributes()).isNotNull();`