Skip to content

Commit 5699915

Browse files
committed
Rename module for Kotlinx Serialization JSON support
Closes gh-48076
1 parent 44f0c77 commit 5699915

File tree

18 files changed

+50
-50
lines changed

18 files changed

+50
-50
lines changed

buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private void mailPrefixes(Config config) {
123123
private void jsonPrefixes(Config config) {
124124
config.accept("spring.jackson");
125125
config.accept("spring.gson");
126-
config.accept("spring.kotlin.serialization");
126+
config.accept("spring.kotlinx.serialization.json");
127127
}
128128

129129
private void dataPrefixes(Config config) {

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/json.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ The preferred JSON-B implementation is Eclipse Yasson for which dependency manag
101101

102102
Auto-configuration for Kotlin Serialization is provided.
103103
When `kotlinx-serialization-json` is on the classpath a https://kotlinlang.org/api/kotlinx.serialization/kotlinx-serialization-json/kotlinx.serialization.json/-json/[Json] bean is automatically configured.
104-
Several `+spring.kotlin.serialization.*+` configuration properties are provided for customizing the configuration.
104+
Several `+spring.kotlinx.serialization.json.*+` configuration properties are provided for customizing the configuration.

module/spring-boot-autoconfigure-classic-modules/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ dependencies {
157157
api(project(":module:spring-boot-kafka")) {
158158
transitive = false
159159
}
160-
api(project(":module:spring-boot-kotlin-serialization")) {
160+
api(project(":module:spring-boot-kotlinx-serialization-json")) {
161161
transitive = false
162162
}
163163
api(project(":module:spring-boot-ldap")) {

module/spring-boot-http-converter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
optional(project(":module:spring-boot-jackson"))
3636
optional(project(":module:spring-boot-jackson2"))
3737
optional(project(":module:spring-boot-jsonb"))
38-
optional(project(":module:spring-boot-kotlin-serialization"))
38+
optional(project(":module:spring-boot-kotlinx-serialization-json"))
3939
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
4040
optional("com.google.code.gson:gson")
4141
optional("jakarta.json.bind:jakarta.json.bind-api")

module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration",
5656
"org.springframework.boot.jsonb.autoconfigure.JsonbAutoConfiguration",
5757
"org.springframework.boot.gson.autoconfigure.GsonAutoConfiguration",
58-
"org.springframework.boot.kotlin.serialization.autoconfigure.KotlinSerializationAutoConfiguration" })
58+
"org.springframework.boot.kotlinx.serialization.json.autoconfigure.KotlinxSerializationJsonAutoConfiguration" })
5959
@ConditionalOnClass(HttpMessageConverter.class)
6060
@Conditional(NotReactiveWebApplicationCondition.class)
6161
@Import({ JacksonHttpMessageConvertersConfiguration.class, Jackson2HttpMessageConvertersConfiguration.class,

module/spring-boot-kotlin-serialization/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 0 additions & 1 deletion
This file was deleted.

module/spring-boot-kotlin-serialization/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports

Lines changed: 0 additions & 1 deletion
This file was deleted.

module/spring-boot-kotlin-serialization/build.gradle renamed to module/spring-boot-kotlinx-serialization-json/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
id "org.springframework.boot.optional-dependencies"
2525
}
2626

27-
description = "Spring Boot Kotlin Serialization"
27+
description = "Spring Boot Kotlinx Serialization JSON"
2828

2929
dependencies {
3030
api(project(":core:spring-boot"))
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.kotlin.serialization.autoconfigure;
17+
package org.springframework.boot.kotlinx.serialization.json.autoconfigure;
1818

1919
import java.util.List;
2020
import java.util.function.Consumer;
@@ -36,19 +36,19 @@
3636
import org.springframework.core.Ordered;
3737

3838
/**
39-
* {@link EnableAutoConfiguration Auto-configuration} for Kotlin Serialization.
39+
* {@link EnableAutoConfiguration Auto-configuration} for Kotlinx Serialization JSON.
4040
*
4141
* @author Dmitry Sulman
4242
* @since 4.0.0
4343
*/
4444
@AutoConfiguration
4545
@ConditionalOnClass(Json.class)
46-
@EnableConfigurationProperties(KotlinSerializationProperties.class)
47-
public final class KotlinSerializationAutoConfiguration {
46+
@EnableConfigurationProperties(KotlinxSerializationJsonProperties.class)
47+
public final class KotlinxSerializationJsonAutoConfiguration {
4848

4949
@Bean
5050
@ConditionalOnMissingBean
51-
Json kotlinSerializationJson(List<KotlinSerializationJsonBuilderCustomizer> customizers) {
51+
Json kotlinSerializationJson(List<KotlinxSerializationJsonBuilderCustomizer> customizers) {
5252
Function1<JsonBuilder, Unit> builderAction = (jsonBuilder) -> {
5353
customizers.forEach((c) -> c.customize(jsonBuilder));
5454
return Unit.INSTANCE;
@@ -58,16 +58,16 @@ Json kotlinSerializationJson(List<KotlinSerializationJsonBuilderCustomizer> cust
5858

5959
@Bean
6060
StandardKotlinSerializationJsonBuilderCustomizer standardKotlinSerializationJsonBuilderCustomizer(
61-
KotlinSerializationProperties kotlinSerializationProperties) {
61+
KotlinxSerializationJsonProperties kotlinSerializationProperties) {
6262
return new StandardKotlinSerializationJsonBuilderCustomizer(kotlinSerializationProperties);
6363
}
6464

6565
static final class StandardKotlinSerializationJsonBuilderCustomizer
66-
implements KotlinSerializationJsonBuilderCustomizer, Ordered {
66+
implements KotlinxSerializationJsonBuilderCustomizer, Ordered {
6767

68-
private final KotlinSerializationProperties properties;
68+
private final KotlinxSerializationJsonProperties properties;
6969

70-
StandardKotlinSerializationJsonBuilderCustomizer(KotlinSerializationProperties properties) {
70+
StandardKotlinSerializationJsonBuilderCustomizer(KotlinxSerializationJsonProperties properties) {
7171
this.properties = properties;
7272
}
7373

@@ -78,7 +78,7 @@ public int getOrder() {
7878

7979
@Override
8080
public void customize(JsonBuilder jsonBuilder) {
81-
KotlinSerializationProperties properties = this.properties;
81+
KotlinxSerializationJsonProperties properties = this.properties;
8282
PropertyMapper map = PropertyMapper.get();
8383
map.from(properties::getNamingStrategy).to(setNamingStrategy(jsonBuilder));
8484
map.from(properties::getPrettyPrint).to(jsonBuilder::setPrettyPrint);
@@ -98,7 +98,7 @@ public void customize(JsonBuilder jsonBuilder) {
9898
map.from(properties::getAllowComments).to(jsonBuilder::setAllowComments);
9999
}
100100

101-
private Consumer<KotlinSerializationProperties.JsonNamingStrategy> setNamingStrategy(JsonBuilder builder) {
101+
private Consumer<KotlinxSerializationJsonProperties.JsonNamingStrategy> setNamingStrategy(JsonBuilder builder) {
102102
return (strategy) -> {
103103
JsonNamingStrategy namingStrategy = switch (strategy) {
104104
case SNAKE_CASE -> JsonNamingStrategy.Builtins.getSnakeCase();
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.kotlin.serialization.autoconfigure;
17+
package org.springframework.boot.kotlinx.serialization.json.autoconfigure;
1818

1919
import kotlinx.serialization.json.Json;
2020
import kotlinx.serialization.json.JsonBuilder;
@@ -27,7 +27,7 @@
2727
* @since 4.0.0
2828
*/
2929
@FunctionalInterface
30-
public interface KotlinSerializationJsonBuilderCustomizer {
30+
public interface KotlinxSerializationJsonBuilderCustomizer {
3131

3232
/**
3333
* Customize the Kotlin Serialization {@link Json} through {@link JsonBuilder}.

0 commit comments

Comments
 (0)