simplify try with resource

Signed-off-by: Vincent Potucek <[email protected]>

Author: Vincent Potucek

integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java

@@ -158,7 +158,8 @@ void testRollbackRulesOnMethodPreventRollback() throws Exception {
 		try {
 			rb.echoException(new ServletException());
 		}
-		catch (ServletException ignored) {
+		catch (ServletException ex) {
+
 		}
 		assertThat(txMan.commits).as("Transaction counts match").isEqualTo(1);
 	}
@@ -271,7 +272,9 @@ public void before(Method method, Object[] args, Object target) throws Throwable
 					TransactionInterceptor.currentTransactionStatus();
 					throw new RuntimeException("Shouldn't have a transaction");
 				}
-				catch (NoTransactionException ignored) { } // this is Ok
+				catch (NoTransactionException ex) {
+					// this is Ok
+				}
 			}
 			super.before(method, args, target);
 		}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -453,9 +453,10 @@ private ShadowMatch getTargetShadowMatch(Method method, Class<?> targetClass) {
 							ClassUtils.toClassArray(ifcs), targetClass.getClassLoader());
 					targetMethod = ClassUtils.getMostSpecificMethod(targetMethod, compositeInterface);
 				}
-				catch (IllegalArgumentException ignored) { }
-				// Implemented interfaces probably expose conflicting method signatures...
-				// Proceed with original target method.
+				catch (IllegalArgumentException ex) {
+					// Implemented interfaces probably expose conflicting method signatures...
+					// Proceed with original target method.
+				}
 			}
 		}
 		return getShadowMatch(targetMethod, method);
@@ -477,7 +478,7 @@ private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
 					try {
 						shadowMatch = pointcutExpression.matchesMethodExecution(methodToMatch);
 					}
-					catch (ReflectionWorldException ignored) {
+					catch (ReflectionWorldException ex) {
 						// Failed to introspect target method, probably because it has been loaded
 						// in a special ClassLoader. Let's try the declaring ClassLoader instead...
 						try {
@@ -500,7 +501,7 @@ private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
 						try {
 							shadowMatch = pointcutExpression.matchesMethodExecution(methodToMatch);
 						}
-						catch (ReflectionWorldException ignored) {
+						catch (ReflectionWorldException ex) {
 							// Could neither introspect the target class nor the proxy class ->
 							// let's try the original method's declaring class before we give up...
 							try {

spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java

@@ -233,7 +233,8 @@ void serializableTargetAndAdvice() throws Throwable {
 		try {
 			p2.echo(new IOException());
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+
 		}
 		assertThat(cta.getCalls()).isEqualTo(2);
 	}

spring-core/src/main/java/org/springframework/util/FileCopyUtils.java

@@ -229,7 +229,8 @@ private static void close(Closeable closeable) {
 		try {
 			closeable.close();
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpResponse.java

@@ -100,7 +100,8 @@ public void close() {
 		try {
 			getBody().close();
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java

@@ -89,7 +89,8 @@ public void close() {
 				this.httpResponse.close();
 			}
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// Ignore exception on close...
 		}
 	}
 

spring-web/src/main/java/org/springframework/http/client/ReactorClientHttpResponse.java

@@ -108,7 +108,8 @@ public void close() {
 			StreamUtils.drain(body);
 			body.close();
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java

@@ -153,7 +153,9 @@ protected void writeContent(Resource resource, HttpOutputMessage outputMessage)
 			in.transferTo(body);
 			body.flush();
 		}
-		catch (Throwable ignored) { } // ignore, see SPR-12999, SPR-13620
+		catch (Throwable ignored) {
+			// see SPR-12999, SPR-13620
+		}
 	}
 
 }

spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java

@@ -183,7 +183,9 @@ protected void writeResourceRegion(ResourceRegion region, HttpOutputMessage outp
 			try {
 				in.close();
 			}
-			catch (IOException ignored) { }
+			catch (IOException ex) {
+				// ignore
+			}
 		}
 	}
 

spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java

@@ -152,7 +152,8 @@ private static byte[] getResponseBody(ClientHttpResponse response) {
 		try {
 			return FileCopyUtils.copyToByteArray(response.getBody());
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 		return new byte[0];
 	}

spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java

@@ -93,7 +93,7 @@ void requestContextListenerWithDifferentThread() {
 		try {
 			thread.join();
 		}
-		catch (InterruptedException ignored) {
+		catch (InterruptedException ex) {
 		}
 		// Still bound to original thread, but at least completed.
 		assertThat(RequestContextHolder.getRequestAttributes()).isNotNull();

spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/MockClientHttpResponse.java

@@ -100,7 +100,8 @@ public void close() {
 		try {
 			getBody().close();
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java

@@ -76,7 +76,8 @@ 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 ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java

@@ -191,7 +191,8 @@ void closeStreamIfNecessary(InputStream body) {
 		try {
 			body.close();
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java

@@ -77,7 +77,8 @@ 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 ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java

@@ -611,7 +611,8 @@ static class ResponseStatusTestExceptionResolver {
 
 		@ExceptionHandler(SocketTimeoutException.class)
 		@ResponseStatus(code = HttpStatus.GATEWAY_TIMEOUT, reason = "gateway.timeout")
-		public void handleException(SocketTimeoutException ignored) {
+		public void handleException(SocketTimeoutException ex) {
+
 		}
 	}
 

spring-websocket/src/main/java/org/springframework/web/socket/handler/BinaryWebSocketHandler.java

@@ -41,7 +41,8 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
 		try {
 			session.close(CloseStatus.NOT_ACCEPTABLE.withReason("Text messages not supported"));
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-websocket/src/main/java/org/springframework/web/socket/handler/TextWebSocketHandler.java

@@ -41,7 +41,8 @@ protected void handleBinaryMessage(WebSocketSession session, BinaryMessage messa
 		try {
 			session.close(CloseStatus.NOT_ACCEPTABLE.withReason("Binary messages not supported"));
 		}
-		catch (IOException ignored) {
+		catch (IOException ex) {
+			// ignore
 		}
 	}
 

spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java

@@ -401,8 +401,8 @@ private void sendErrorMessage(WebSocketSession session, Throwable error) {
 		byte[] bytes = this.stompEncoder.encode(headerAccessor.getMessageHeaders(), EMPTY_PAYLOAD);
 		// We cannot use try-with-resources here for the WebSocketSession, since we have
 		// custom handling of the close() method in a finally-block.
-		try (WebSocketSession _session = session){
-			_session.sendMessage(new TextMessage(bytes));
+		try {
+			session.sendMessage(new TextMessage(bytes));
 		}
 		catch (Throwable ex) {
 			// Could be part of normal workflow (for example, browser tab closed)