diff --git a/cli/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java b/cli/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java index 63688d0ed76..26f89c90159 100644 --- a/cli/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java +++ b/cli/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java @@ -51,14 +51,14 @@ class InitializrService { private static final String FILENAME_HEADER_PREFIX = "filename=\""; /** - * Accept header to use to retrieve the json meta-data. + * Accept header to use to retrieve the JSON meta-data. */ public static final String ACCEPT_META_DATA = "application/vnd.initializr.v2.1+" + "json,application/vnd.initializr.v2+json"; /** * Accept header to use to retrieve the service capabilities of the service. If the - * service does not offer such feature, the json meta-data are retrieved instead. + * service does not offer such feature, the JSON meta-data are retrieved instead. */ public static final String ACCEPT_SERVICE_CAPABILITIES = "text/plain," + ACCEPT_META_DATA; diff --git a/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java b/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java index 6312fbfd6b5..5041d3a4fcd 100644 --- a/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java +++ b/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java @@ -45,7 +45,7 @@ public final class ConfigurationMetadataRepositoryJsonBuilder { /** * Add the content of a {@link ConfigurationMetadataRepository} defined by the - * specified {@link InputStream} json document using the default charset. If this + * specified {@link InputStream} JSON document using the default charset. If this * metadata repository holds items that were loaded previously, these are ignored. *

* Leaves the stream open when done. @@ -59,7 +59,7 @@ public final class ConfigurationMetadataRepositoryJsonBuilder { /** * Add the content of a {@link ConfigurationMetadataRepository} defined by the - * specified {@link InputStream} json document using the specified {@link Charset}. If + * specified {@link InputStream} JSON document using the specified {@link Charset}. If * this metadata repository holds items that were loaded previously, these are * ignored. *

@@ -142,7 +142,7 @@ public final class ConfigurationMetadataRepositoryJsonBuilder { /** * Create a new builder instance using {@link StandardCharsets#UTF_8} as the default - * charset and the specified json resource. + * charset and the specified JSON resource. * @param inputStreams the source input streams * @return a new {@link ConfigurationMetadataRepositoryJsonBuilder} instance. * @throws IOException on error diff --git a/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java b/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java index e3820d7f8b4..7063ac4c5db 100644 --- a/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java +++ b/configuration-metadata/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java @@ -29,7 +29,7 @@ import org.springframework.boot.configurationmetadata.json.JSONArray; import org.springframework.boot.configurationmetadata.json.JSONObject; /** - * Read standard json metadata format as {@link ConfigurationMetadataRepository}. + * Read standard JSON metadata format as {@link ConfigurationMetadataRepository}. * * @author Stephane Nicoll */ diff --git a/module/spring-boot-http-converter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-http-converter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index dfdbb97f5bb..527a98532bf 100644 --- a/module/spring-boot-http-converter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-http-converter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -4,7 +4,7 @@ "name": "spring.http.converters.preferred-json-mapper", "type": "java.lang.String", "defaultValue": "jackson", - "description": "Preferred JSON mapper to use for HTTP message conversion. By default, auto-detected according to the environment. Supported values are 'jackson', 'jackson2' (deprecated), 'gson', 'jsonb' and 'kotlin-serialization'. When other json mapping libraries are present, use a custom HttpMessageConverters bean to control the preferred mapper." + "description": "Preferred JSON mapper to use for HTTP message conversion. By default, auto-detected according to the environment. Supported values are 'jackson', 'jackson2' (deprecated), 'gson', 'jsonb' and 'kotlin-serialization'. When other JSON mapping libraries are present, use a custom HttpMessageConverters bean to control the preferred mapper." } ], "hints": [ diff --git a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonMixinModuleEntries.java b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonMixinModuleEntries.java index 201c836f1f7..372979e4e95 100644 --- a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonMixinModuleEntries.java +++ b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/JsonMixinModuleEntries.java @@ -37,7 +37,7 @@ import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; /** - * Provide the mapping of json mixin class to consider. + * Provide the mapping of JSON mixin class to consider. * * @author Stephane Nicoll * @since 4.0.0