From 2a2d3a88d288f5e47712ab2f32f667da985bcea4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 10 Oct 2025 09:55:20 +0100 Subject: [PATCH] Correct imports for AutoConfigureJson See gh-47322 --- ...toconfigure.json.AutoConfigureJson.imports | 1 + ...gure.json.AutoConfigureJsonTesters.imports | 1 - ...GsonAutoConfigureJsonIntegrationTests.java | 47 +++++++++++++++++++ ...toconfigure.json.AutoConfigureJson.imports | 1 + ...gure.json.AutoConfigureJsonTesters.imports | 1 - ...ksonAutoConfigureJsonIntegrationTests.java | 47 +++++++++++++++++++ ...toconfigure.json.AutoConfigureJson.imports | 1 + ...gure.json.AutoConfigureJsonTesters.imports | 3 +- ...sonbAutoConfigureJsonIntegrationTests.java | 47 +++++++++++++++++++ 9 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports create mode 100644 module/spring-boot-gson/src/test/java/org/springframework/boot/gson/autoconfigure/jsontest/GsonAutoConfigureJsonIntegrationTests.java create mode 100644 module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports create mode 100644 module/spring-boot-jackson/src/test/java/org/springframework/boot/jackson/autoconfigure/jsontest/JacksonAutoConfigureJsonIntegrationTests.java create mode 100644 module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports create mode 100644 module/spring-boot-jsonb/src/test/java/org/springframework/boot/jsonb/autoconfigure/jsontest/JsonbAutoConfigureJsonIntegrationTests.java diff --git a/module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports b/module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports new file mode 100644 index 00000000000..4a29fa16875 --- /dev/null +++ b/module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports @@ -0,0 +1 @@ +org.springframework.boot.gson.autoconfigure.GsonAutoConfiguration diff --git a/module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports b/module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports index 154814b8f3c..d2bb9af22da 100644 --- a/module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports +++ b/module/spring-boot-gson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports @@ -1,2 +1 @@ -org.springframework.boot.gson.autoconfigure.GsonAutoConfiguration org.springframework.boot.gson.autoconfigure.GsonTesterAutoConfiguration \ No newline at end of file diff --git a/module/spring-boot-gson/src/test/java/org/springframework/boot/gson/autoconfigure/jsontest/GsonAutoConfigureJsonIntegrationTests.java b/module/spring-boot-gson/src/test/java/org/springframework/boot/gson/autoconfigure/jsontest/GsonAutoConfigureJsonIntegrationTests.java new file mode 100644 index 00000000000..c4a787cb4cb --- /dev/null +++ b/module/spring-boot-gson/src/test/java/org/springframework/boot/gson/autoconfigure/jsontest/GsonAutoConfigureJsonIntegrationTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2012-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.gson.autoconfigure.jsontest; + +import com.google.gson.Gson; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.assertj.core.api.Assertions.assertThatNoException; + +/** + * Integration tests for {@link AutoConfigureJson @AutoConfigureJson} with Gson. + * + * @author Andy Wilkinson + */ +@AutoConfigureJson +@ExtendWith(SpringExtension.class) +class GsonAutoConfigureJsonIntegrationTests { + + @Autowired + private ApplicationContext context; + + @Test + void gsonIsAvailable() { + assertThatNoException().isThrownBy(() -> this.context.getBean(Gson.class)); + } + +} diff --git a/module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports b/module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports new file mode 100644 index 00000000000..a34159d6087 --- /dev/null +++ b/module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports @@ -0,0 +1 @@ +org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration diff --git a/module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports b/module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports index ffd53e2f4f6..48e94bd77b0 100644 --- a/module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports +++ b/module/spring-boot-jackson/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports @@ -1,2 +1 @@ -org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration org.springframework.boot.jackson.autoconfigure.JacksonTesterAutoConfiguration diff --git a/module/spring-boot-jackson/src/test/java/org/springframework/boot/jackson/autoconfigure/jsontest/JacksonAutoConfigureJsonIntegrationTests.java b/module/spring-boot-jackson/src/test/java/org/springframework/boot/jackson/autoconfigure/jsontest/JacksonAutoConfigureJsonIntegrationTests.java new file mode 100644 index 00000000000..2e471f68b2b --- /dev/null +++ b/module/spring-boot-jackson/src/test/java/org/springframework/boot/jackson/autoconfigure/jsontest/JacksonAutoConfigureJsonIntegrationTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2012-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.jackson.autoconfigure.jsontest; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import tools.jackson.databind.json.JsonMapper; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.assertj.core.api.Assertions.assertThatNoException; + +/** + * Integration tests for {@link AutoConfigureJson @AutoConfigureJson} with Jackson. + * + * @author Andy Wilkinson + */ +@AutoConfigureJson +@ExtendWith(SpringExtension.class) +class JacksonAutoConfigureJsonIntegrationTests { + + @Autowired + private ApplicationContext context; + + @Test + void jsonMapperIsAvailable() { + assertThatNoException().isThrownBy(() -> this.context.getBean(JsonMapper.class)); + } + +} diff --git a/module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports b/module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports new file mode 100644 index 00000000000..6c06417e182 --- /dev/null +++ b/module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJson.imports @@ -0,0 +1 @@ +org.springframework.boot.jsonb.autoconfigure.JsonbAutoConfiguration diff --git a/module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports b/module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports index 32a6c51941e..8b0d01c7477 100644 --- a/module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports +++ b/module/spring-boot-jsonb/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.json.AutoConfigureJsonTesters.imports @@ -1,2 +1 @@ -org.springframework.boot.jsonb.autoconfigure.JsonbAutoConfiguration -org.springframework.boot.jsonb.autoconfigure.JsonbTesterAutoConfiguration \ No newline at end of file +org.springframework.boot.jsonb.autoconfigure.JsonbTesterAutoConfiguration diff --git a/module/spring-boot-jsonb/src/test/java/org/springframework/boot/jsonb/autoconfigure/jsontest/JsonbAutoConfigureJsonIntegrationTests.java b/module/spring-boot-jsonb/src/test/java/org/springframework/boot/jsonb/autoconfigure/jsontest/JsonbAutoConfigureJsonIntegrationTests.java new file mode 100644 index 00000000000..a5cbc67cdc7 --- /dev/null +++ b/module/spring-boot-jsonb/src/test/java/org/springframework/boot/jsonb/autoconfigure/jsontest/JsonbAutoConfigureJsonIntegrationTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2012-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.jsonb.autoconfigure.jsontest; + +import jakarta.json.bind.Jsonb; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.assertj.core.api.Assertions.assertThatNoException; + +/** + * Integration tests for {@link AutoConfigureJson @AutoConfigureJson} with JSON-B. + * + * @author Andy Wilkinson + */ +@AutoConfigureJson +@ExtendWith(SpringExtension.class) +class JsonbAutoConfigureJsonIntegrationTests { + + @Autowired + private ApplicationContext context; + + @Test + void jsonbIsAvailable() { + assertThatNoException().isThrownBy(() -> this.context.getBean(Jsonb.class)); + } + +}