diff --git a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/autoconfigure/Jackson2TesterTestAutoConfiguration.java b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/autoconfigure/Jackson2TesterTestAutoConfiguration.java index 227e0bb17c3..96f4b50d413 100644 --- a/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/autoconfigure/Jackson2TesterTestAutoConfiguration.java +++ b/module/spring-boot-jackson2/src/main/java/org/springframework/boot/jackson2/autoconfigure/Jackson2TesterTestAutoConfiguration.java @@ -48,7 +48,7 @@ final class Jackson2TesterTestAutoConfiguration { @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @ConditionalOnBean(ObjectMapper.class) @ImportRuntimeHints(Jackson2TesterRuntimeHints.class) - FactoryBean> jacksonTesterFactoryBean(ObjectMapper mapper) { + FactoryBean> jackson2TesterFactoryBean(ObjectMapper mapper) { return new JsonTesterFactoryBean<>(Jackson2Tester.class, mapper); } diff --git a/smoke-test/spring-boot-smoke-test-jackson2-mixed/src/test/java/smoketest/jackson2/mixed/SampleJackson2MixedApplicationJsonTests.java b/smoke-test/spring-boot-smoke-test-jackson2-mixed/src/test/java/smoketest/jackson2/mixed/SampleJackson2MixedApplicationJsonTests.java new file mode 100644 index 00000000000..e8194cfd28a --- /dev/null +++ b/smoke-test/spring-boot-smoke-test-jackson2-mixed/src/test/java/smoketest/jackson2/mixed/SampleJackson2MixedApplicationJsonTests.java @@ -0,0 +1,56 @@ +/* + * 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 smoketest.jackson2.mixed; + +import org.junit.jupiter.api.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.json.JsonTest; +import org.springframework.boot.test.json.JacksonTester; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * {@link JsonTest JSON Tests} for {@link SampleJackson2MixedApplication}. + * + * @author Andy Wilkinson + */ +@JsonTest +class SampleJackson2MixedApplicationJsonTests { + + @Autowired + @SuppressWarnings({ "deprecation", "removal" }) + org.springframework.boot.test.json.Jackson2Tester jackson2Tester; + + @Autowired + JacksonTester jacksonTester; + + @Test + void jackson2TesterIsInitialized() { + assertThat(this.jackson2Tester).isNotNull(); + } + + @Test + void jacksonTesterIsInitialized() { + assertThat(this.jacksonTester).isNotNull(); + } + + static class Pojo { + + } + +}