From 9ceb9efb2c5f87d12e2f58c1b2c61138adc29d2f Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 1 Apr 2026 21:25:11 +0200 Subject: [PATCH] Polishing --- .../context/annotation/AnnotationBeanNameGenerator.java | 5 +---- .../converter/json/AbstractJsonHttpMessageConverter.java | 4 ++-- .../http/converter/json/GsonHttpMessageConverter.java | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java index 60445aa4590..669d7f2c09a 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java @@ -106,7 +106,6 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator { private final Map> metaAnnotationTypesCache = new ConcurrentHashMap<>(); - @Override public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) { if (definition instanceof AnnotatedBeanDefinition annotatedBeanDefinition) { @@ -214,8 +213,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator { return names.get(0); } if (names.size() > 1) { - throw new IllegalStateException( - "Stereotype annotations suggest inconsistent component names: " + names); + throw new IllegalStateException("Stereotype annotations suggest inconsistent component names: " + names); } return null; } @@ -236,7 +234,6 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator { annotationType.equals("javax.annotation.ManagedBean") || annotationType.equals("jakarta.inject.Named") || annotationType.equals("javax.inject.Named"); - return (isStereotype && attributes.containsKey(MergedAnnotation.VALUE)); } diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJsonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJsonHttpMessageConverter.java index 43248b90b4d..bf625debb2d 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJsonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJsonHttpMessageConverter.java @@ -134,7 +134,7 @@ public abstract class AbstractJsonHttpMessageConverter extends AbstractGenericHt /** * Template method that reads the JSON-bound object from the given {@link Reader}. * @param resolvedType the resolved generic type - * @param reader the {@code} Reader to use + * @param reader the {@code Reader} to use * @return the JSON-bound object * @throws Exception in case of read/parse failures */ @@ -144,7 +144,7 @@ public abstract class AbstractJsonHttpMessageConverter extends AbstractGenericHt * Template method that writes the JSON-bound object to the given {@link Writer}. * @param object the object to write to the output message * @param type the type of object to write (may be {@code null}) - * @param writer the {@code} Writer to use + * @param writer the {@code Writer} to use * @throws Exception in case of write failures */ protected abstract void writeInternal(Object object, @Nullable Type type, Writer writer) throws Exception; diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java index 896cf1d3ead..0dfdcffbee0 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java @@ -111,4 +111,5 @@ public class GsonHttpMessageConverter extends AbstractJsonHttpMessageConverter { protected boolean supportsRepeatableWrites(Object o) { return true; } + }