From c4e0f96ef732502a87b1a18018fbcabe05fd4f5b Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Mon, 11 Mar 2024 11:28:59 +0100
Subject: [PATCH] Polishing

---
 .../bean/override/example/ExampleBeanOverrideAnnotation.java    | 2 +-
 .../http/converter/json/Jackson2ObjectMapperBuilder.java        | 2 +-
 .../converter/yaml/MappingJackson2YamlHttpMessageConverter.java | 2 +-
 .../org/springframework/http/converter/yaml/package-info.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideAnnotation.java b/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideAnnotation.java
index d6474ccdcc..a4a3f58a85 100644
--- a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideAnnotation.java
+++ b/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideAnnotation.java
@@ -28,7 +28,7 @@ import org.springframework.test.bean.override.BeanOverride;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ExampleBeanOverrideAnnotation {
 
-	static final String DEFAULT_VALUE = "TEST OVERRIDE";
+	String DEFAULT_VALUE = "TEST OVERRIDE";
 
 	String value() default DEFAULT_VALUE;
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
index 641ff1d677..50370530b7 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -940,7 +940,7 @@ public class Jackson2ObjectMapperBuilder {
 
 	/**
 	 * Obtain a {@link Jackson2ObjectMapperBuilder} instance in order to
-	 * build a Yaml data format {@link ObjectMapper} instance.
+	 * build a YAML data format {@link ObjectMapper} instance.
 	 * @since 6.2
 	 */
 	public static Jackson2ObjectMapperBuilder yaml() {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/yaml/MappingJackson2YamlHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/yaml/MappingJackson2YamlHttpMessageConverter.java
index 3ab65a85ea..04ade12504 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/yaml/MappingJackson2YamlHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/yaml/MappingJackson2YamlHttpMessageConverter.java
@@ -65,7 +65,7 @@ public class MappingJackson2YamlHttpMessageConverter extends AbstractJackson2Htt
 
 	/**
 	 * {@inheritDoc}
-	 * The {@code ObjectMapper} must be configured with a {@code YAMLFactory} instance.
+	 * <p>The {@code ObjectMapper} must be configured with a {@code YAMLFactory} instance.
 	 */
 	@Override
 	public void setObjectMapper(ObjectMapper objectMapper) {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/yaml/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/yaml/package-info.java
index 18c07e5214..ef3a649192 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/yaml/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/yaml/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Provides an HttpMessageConverter for the Yaml data format.
+ * Provides an {@code HttpMessageConverter} for the YAML data format.
  */
 @NonNullApi
 @NonNullFields