diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java index 9035bb7eb9..53e9da6e4d 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java @@ -66,27 +66,36 @@ public class JsonTestersAutoConfiguration { null); } - @Bean - @Scope("prototype") @ConditionalOnClass(ObjectMapper.class) - @ConditionalOnBean(ObjectMapper.class) - public FactoryBean> jacksonTesterFactoryBean(ObjectMapper mapper) { - return new JsonTesterFactoryBean, ObjectMapper>( - JacksonTester.class, mapper); + private static class JacksonJsonTestersConfiguration { + + @Bean + @Scope("prototype") + @ConditionalOnBean(ObjectMapper.class) + public FactoryBean> jacksonTesterFactoryBean( + ObjectMapper mapper) { + return new JsonTesterFactoryBean, ObjectMapper>( + JacksonTester.class, mapper); + } + } - @Bean - @Scope("prototype") @ConditionalOnClass(Gson.class) - @ConditionalOnBean(Gson.class) - public FactoryBean> gsonTesterFactoryBean(Gson gson) { - return new JsonTesterFactoryBean, Gson>(GsonTester.class, gson); + private static class GsonJsonTestersConfiguration { + + @Bean + @Scope("prototype") + @ConditionalOnBean(Gson.class) + public FactoryBean> gsonTesterFactoryBean(Gson gson) { + return new JsonTesterFactoryBean, Gson>(GsonTester.class, gson); + } + } /** * {@link FactoryBean} used to create JSON Tester instances. */ - private class JsonTesterFactoryBean implements FactoryBean { + private static class JsonTesterFactoryBean implements FactoryBean { private final Class objectType;