Merge branch '7.0.x'

spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java

@@ -103,7 +103,6 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 	private final Map<String, Set<String>> metaAnnotationTypesCache = new ConcurrentHashMap<>();
 
 
-
 	@Override
 	public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 		if (definition instanceof AnnotatedBeanDefinition annotatedBeanDefinition) {
@@ -200,8 +199,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;
 	}
@@ -219,7 +217,6 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 
 		boolean isStereotype = metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME) ||
 				annotationType.equals("jakarta.inject.Named");
-
 		return (isStereotype && attributes.containsKey(MergedAnnotation.VALUE));
 	}
 

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

@@ -127,6 +127,7 @@ public abstract class AbstractJsonHttpMessageConverter extends AbstractGenericHt
 		catch (Exception ex) {
 			throw new HttpMessageNotWritableException("Could not write JSON: " + ex.getMessage(), ex);
 		}
+		writer.close();
 	}
 
 

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

@@ -110,7 +110,6 @@ public class GsonHttpMessageConverter extends AbstractJsonHttpMessageConverter {
 		else {
 			getGson().toJson(object, writer);
 		}
-		writer.flush();
 	}
 
 	@Override