From ef7390d3f0c17950212097a67284a846bf9ce80a Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 30 May 2014 15:09:48 +0100 Subject: [PATCH] Add extra @Conditional to be defensive in Social autoconfig Older versions of Spring Social will not have the SocialConfigurerAdapter so making social autoconfig conditional on that class makes sense (since it all extends from it). Fixes gh-986 --- .../boot/autoconfigure/social/SocialAutoConfigurerAdapter.java | 2 ++ .../boot/autoconfigure/social/SocialWebAutoConfiguration.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialAutoConfigurerAdapter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialAutoConfigurerAdapter.java index fc55904924..605a10cda0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialAutoConfigurerAdapter.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialAutoConfigurerAdapter.java @@ -16,6 +16,7 @@ package org.springframework.boot.autoconfigure.social; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.context.EnvironmentAware; import org.springframework.core.env.Environment; @@ -30,6 +31,7 @@ import org.springframework.social.connect.ConnectionFactory; * @author Craig Walls * @since 1.1.0 */ +@ConditionalOnClass(SocialConfigurerAdapter.class) abstract class SocialAutoConfigurerAdapter extends SocialConfigurerAdapter implements EnvironmentAware { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java index b055c8f474..430804ee2c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.web.servlet.view.BeanNameViewResolver; * @since 1.1.0 */ @Configuration -@ConditionalOnClass({ ConnectController.class }) +@ConditionalOnClass({ ConnectController.class, SocialConfigurerAdapter.class }) @AutoConfigureAfter(WebMvcAutoConfiguration.class) public class SocialWebAutoConfiguration {