From ffa0b768503c391124c27757039d3690389719a0 Mon Sep 17 00:00:00 2001 From: jbj338033 Date: Mon, 22 Sep 2025 20:01:17 +0900 Subject: [PATCH] Leverage Java 17+ features for improved readability and performance - Replace multi-line string concatenation with text blocks in HandlerMethod - Use String.formatted() instead of string concatenation in exception messages - Modernize string formatting using Java 17+ features These improvements enhance code readability and leverage modern Java capabilities while maintaining full backwards compatibility. All tests pass successfully. Signed-off-by: jbj338033 --- .../graphql/data/method/HandlerMethod.java | 9 +++++---- .../method/HandlerMethodArgumentResolverComposite.java | 2 +- .../server/support/GraphQlWebSocketMessageType.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethod.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethod.java index d626ec730..9e7d9141c 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethod.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethod.java @@ -365,10 +365,11 @@ protected String formatInvokeError(String text, @Nullable Object[] args) { }) .collect(Collectors.joining(",\n", " ", " ")); - return text + "\n" + - "Class [" + getBeanType().getName() + "]\n" + - "Method [" + getBridgedMethod().toGenericString() + "] " + - "with argument values:\n" + formattedArgs; + return """ + %s + Class [%s] + Method [%s] with argument values: + %s""".formatted(text, getBeanType().getName(), getBridgedMethod().toGenericString(), formattedArgs); } diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethodArgumentResolverComposite.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethodArgumentResolverComposite.java index 46580b36e..76e1d33e2 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethodArgumentResolverComposite.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/HandlerMethodArgumentResolverComposite.java @@ -77,7 +77,7 @@ public boolean supportsParameter(MethodParameter parameter) { public @Nullable Object resolveArgument(MethodParameter parameter, DataFetchingEnvironment environment) throws Exception { HandlerMethodArgumentResolver resolver = getArgumentResolver(parameter); if (resolver == null) { - throw new IllegalArgumentException("Unsupported parameter [" + parameter + "]."); + throw new IllegalArgumentException("Unsupported parameter [%s].".formatted(parameter)); } return resolver.resolveArgument(parameter, environment); } diff --git a/spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlWebSocketMessageType.java b/spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlWebSocketMessageType.java index 53e196adb..1f3d61ae7 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlWebSocketMessageType.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlWebSocketMessageType.java @@ -111,7 +111,7 @@ public static GraphQlWebSocketMessageType fromValue(String value) { return type; } } - throw new IllegalArgumentException("No matching constant for [" + value + "]"); + throw new IllegalArgumentException("No matching constant for [%s]".formatted(value)); }