Merge branch '1.2.x'

2a5eecaf · Andy Wilkinson · 507520aa · b45bb6d0 · 2a5eecaf
Commit 2a5eecaf authored Apr 08, 2015 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

GsonHttpMessageConvertersConfiguration.java ...configure/web/GsonHttpMessageConvertersConfiguration.java +1 -1

No files found.
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
@@ -36,10 +36,10 @@ import com.google.gson.Gson;
 * @since 1.2.2
 */
 @Configuration
+@ConditionalOnClass(Gson.class)
 class GsonHttpMessageConvertersConfiguration {

 	@Configuration
-	@ConditionalOnClass(Gson.class)
 	@ConditionalOnBean(Gson.class)
 	@Conditional(PreferGsonOrMissingJacksonCondition.class)
 	protected static class GsonHttpMessageConverterConfiguration {