From d62827373de0f2971ef8e4b39efbb8735dda64f3 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Fri, 29 Jul 2016 10:24:29 +0200 Subject: [PATCH] Fix Bean Condition on GsonTester FactoryBean This commit fixes the `@ConditionalOnClass` typo on the GsonTester FactoryBean, which was testing for `ObjectMapper` instead of `Gson`. This means that the next condition `@ConditionalOnBean(Gson.class)` throws a `ClassNotFoundException: com.google.gson.Gson` since it's trying to load that class to check for an existing Bean of that type. Fixes gh-6502 --- .../test/autoconfigure/json/JsonTestersAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5391470b63..9035bb7eb9 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 @@ -77,7 +77,7 @@ public class JsonTestersAutoConfiguration { @Bean @Scope("prototype") - @ConditionalOnClass(ObjectMapper.class) + @ConditionalOnClass(Gson.class) @ConditionalOnBean(Gson.class) public FactoryBean> gsonTesterFactoryBean(Gson gson) { return new JsonTesterFactoryBean, Gson>(GsonTester.class, gson);