diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java index a10d182a783..a430c355335 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java @@ -163,7 +163,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, @Override public String toString() { - return "execution(" + getSignature().toString() + ")"; + return "execution(" + getSignature() + ")"; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java index 480352cfe95..da38d052a5d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java @@ -249,7 +249,7 @@ public abstract class YamlProcessor { } else { // It has to be a map key in this case - result.put("[" + key.toString() + "]", value); + result.put("[" + key + "]", value); } }); return result; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java index 7fc5603b9d6..c2d2aca8497 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java @@ -63,7 +63,7 @@ class TypeHelper { if (type instanceof DeclaredType declaredType) { Element enclosingElement = declaredType.asElement().getEnclosingElement(); if (enclosingElement instanceof TypeElement) { - return getQualifiedName(enclosingElement) + "$" + declaredType.asElement().getSimpleName().toString(); + return getQualifiedName(enclosingElement) + "$" + declaredType.asElement().getSimpleName(); } else { return getQualifiedName(declaredType.asElement()); diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java b/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java index b048c08f204..0078c045ddf 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java @@ -198,13 +198,13 @@ public class SpringCacheAnnotationParser implements CacheAnnotationParser, Seria private void validateCacheOperation(AnnotatedElement ae, CacheOperation operation) { if (StringUtils.hasText(operation.getKey()) && StringUtils.hasText(operation.getKeyGenerator())) { throw new IllegalStateException("Invalid cache annotation configuration on '" + - ae.toString() + "'. Both 'key' and 'keyGenerator' attributes have been set. " + + ae + "'. Both 'key' and 'keyGenerator' attributes have been set. " + "These attributes are mutually exclusive: either set the SpEL expression used to" + "compute the key at runtime or set the name of the KeyGenerator bean to use."); } if (StringUtils.hasText(operation.getCacheManager()) && StringUtils.hasText(operation.getCacheResolver())) { throw new IllegalStateException("Invalid cache annotation configuration on '" + - ae.toString() + "'. Both 'cacheManager' and 'cacheResolver' attributes have been set. " + + ae + "'. Both 'cacheManager' and 'cacheResolver' attributes have been set. " + "These attributes are mutually exclusive: the cache manager is used to configure a" + "default cache resolver if none is set. If a cache resolver is set, the cache manager" + "won't be used."); diff --git a/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java index 52017d54300..f4c3c3175bb 100644 --- a/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java +++ b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java @@ -222,7 +222,7 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser { if (StringUtils.hasText(builder.getKey()) && StringUtils.hasText(builder.getKeyGenerator())) { throw new IllegalStateException("Invalid cache advice configuration on '" + - element.toString() + "'. Both 'key' and 'keyGenerator' attributes have been set. " + + element + "'. Both 'key' and 'keyGenerator' attributes have been set. " + "These attributes are mutually exclusive: either set the SpEL expression used to" + "compute the key at runtime or set the name of the KeyGenerator bean to use."); } diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java index 1f749bd6d65..044c9b75159 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java @@ -191,7 +191,7 @@ public class InstrumentationLoadTimeWeaver implements LoadTimeWeaver { @Override public String toString() { - return "FilteringClassFileTransformer for: " + this.targetTransformer.toString(); + return "FilteringClassFileTransformer for: " + this.targetTransformer; } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java index 45188f96911..32867ccea52 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java @@ -289,7 +289,7 @@ class AutowiredConfigurationTests { @Bean public TestBean testBean(Color color, List colors) { - return new TestBean(color.toString() + "-" + colors.get(0).toString()); + return new TestBean(color + "-" + colors.get(0)); } } @@ -303,7 +303,7 @@ class AutowiredConfigurationTests { return new TestBean(""); } else { - return new TestBean(color.get() + "-" + colors.get().get(0).toString()); + return new TestBean(color.get() + "-" + colors.get().get(0)); } } } diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/MethodInterceptorGenerator.java b/spring-core/src/main/java/org/springframework/cglib/proxy/MethodInterceptorGenerator.java index 9a8b008a030..fee103305fc 100644 --- a/spring-core/src/main/java/org/springframework/cglib/proxy/MethodInterceptorGenerator.java +++ b/spring-core/src/main/java/org/springframework/cglib/proxy/MethodInterceptorGenerator.java @@ -145,7 +145,7 @@ implements CallbackGenerator private static void superHelper(CodeEmitter e, MethodInfo method, Context context) { if (TypeUtils.isAbstract(method.getModifiers())) { - e.throw_exception(ABSTRACT_METHOD_ERROR, method.toString() + " is abstract" ); + e.throw_exception(ABSTRACT_METHOD_ERROR, method + " is abstract" ); } else { e.load_this(); context.emitLoadArgsAndInvoke(e, method); diff --git a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodsTests.java b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodsTests.java index 1cc2b617ba0..2240abbedf7 100644 --- a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodsTests.java +++ b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodsTests.java @@ -59,7 +59,7 @@ class GeneratedMethodsTests { @Test void createWithExistingGeneratorUsesGenerator() { - Function generator = name -> "__" + name.toString(); + Function generator = name -> "__" + name; GeneratedMethods methods = new GeneratedMethods(TEST_CLASS_NAME, generator); assertThat(methods.add("test", methodSpecCustomizer).getName()).hasToString("__test"); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java index e716f202921..e3c86434f35 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java @@ -315,7 +315,7 @@ class VariableAndFunctionTests extends AbstractExpressionTests { // Since ArrayHolder is an "instanceof Object" and Object is the varargs component type, // we expect the ArrayHolder not to be converted to an array but rather to be passed // "as is" as a single argument to the varargs method. - evaluate("#varargsObjectFunction(#arrayHolder)", "[" + arrayHolder.toString() + "]"); + evaluate("#varargsObjectFunction(#arrayHolder)", "[" + arrayHolder + "]"); } @Test @@ -328,7 +328,7 @@ class VariableAndFunctionTests extends AbstractExpressionTests { // Since ArrayHolder is an "instanceof Object" and Object is the varargs component type, // we expect the ArrayHolder not to be converted to an array but rather to be passed // "as is" as a single argument to the varargs method. - evaluate("#varargsObjectFunctionHandle(#arrayHolder)", "[" + arrayHolder.toString() + "]"); + evaluate("#varargsObjectFunctionHandle(#arrayHolder)", "[" + arrayHolder + "]"); } private void evaluate(String expression, Object expectedValue) { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java index 97839a678c6..cfba217b419 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java @@ -468,7 +468,7 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor { } byte[] bytes = (byte[]) payload; MimeType mimeType = getContentType(); - String contentType = (mimeType != null ? " " + mimeType.toString() : ""); + String contentType = (mimeType != null ? " " + mimeType : ""); if (bytes.length == 0 || mimeType == null || !isReadableContentType()) { return contentType; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java index 049dd16b0c5..c36277d50f9 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java @@ -480,7 +480,7 @@ public class MessageHeaderAccessor { * @return the message */ public String getShortLogMessage(Object payload) { - return "headers=" + this.headers.toString() + getShortPayloadLogMessage(payload); + return "headers=" + this.headers + getShortPayloadLogMessage(payload); } /** @@ -489,7 +489,7 @@ public class MessageHeaderAccessor { * @return the message */ public String getDetailedLogMessage(@Nullable Object payload) { - return "headers=" + this.headers.toString() + getDetailedPayloadLogMessage(payload); + return "headers=" + this.headers + getDetailedPayloadLogMessage(payload); } protected String getShortPayloadLogMessage(Object payload) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java index 80893f83039..2f9ffa00f03 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java @@ -143,7 +143,7 @@ public class OpenEntityManagerInViewInterceptor extends EntityManagerFactoryAcce * @see #PARTICIPATE_SUFFIX */ protected String getParticipateAttributeName() { - return obtainEntityManagerFactory().toString() + PARTICIPATE_SUFFIX; + return obtainEntityManagerFactory() + PARTICIPATE_SUFFIX; } diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java index 374c769e484..9f4a408a828 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java @@ -160,7 +160,7 @@ public final class BindMarkersFactoryResolver { if (builder.isEmpty()) { return ""; } - return "_" + builder.toString(); + return "_" + builder; } } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java index 21d5442a599..91ed67503b6 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java @@ -73,7 +73,7 @@ public class UnsupportedMediaTypeException extends NestedRuntimeException { private static String initReason(@Nullable MediaType contentType, @Nullable ResolvableType bodyType) { return "Content type '" + (contentType != null ? contentType : "") + "' not supported" + - (bodyType != null ? " for bodyType=" + bodyType.toString() : ""); + (bodyType != null ? " for bodyType=" + bodyType : ""); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java index 3355ed81fe0..24c3f48ab16 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java @@ -1146,7 +1146,7 @@ public abstract class RequestPredicates { @Override public String toString() { - return "!" + this.delegate.toString(); + return "!" + this.delegate; } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java index 9d36639253a..c170193edb2 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java @@ -286,7 +286,7 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT Flux transferTo(@RequestPart("fileParts") Flux parts) { return parts.concatMap(filePart -> createTempFile(filePart.filename()) .flatMap(tempFile -> filePart.transferTo(tempFile) - .then(Mono.just(tempFile.toString() + "\n")))); + .then(Mono.just(tempFile + "\n")))); } private Mono createTempFile(String suffix) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java index dee083e47bc..836e36dade7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java @@ -228,7 +228,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport } String mediaTypeInfo = (logger.isDebugEnabled() && requestedMediaTypes != null ? - " given " + requestedMediaTypes.toString() : ""); + " given " + requestedMediaTypes : ""); if (this.useNotAcceptableStatusCode) { if (logger.isDebugEnabled()) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 70166f3e50a..87a30373f37 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -3043,7 +3043,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl @RequestMapping("/myPath.do") public void myHandle(GenericBean gb, HttpServletResponse response) throws Exception { - response.getWriter().write(gb.getTestBeanSet().toString() + "-" + + response.getWriter().write(gb.getTestBeanSet() + "-" + gb.getTestBeanSet().iterator().next().getClass().getName()); } }