1123 - marked stormpathSecurityConfigurerAdapter as not required

Author: Mario

extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/config/StormpathWebSecurityConfigurer.java

@@ -19,7 +19,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -33,10 +35,13 @@ public class StormpathWebSecurityConfigurer extends AbstractHttpConfigurer<Storm
 
     private static final Logger log = LoggerFactory.getLogger(StormpathWebSecurityConfigurer.class);
 
-    @Autowired
+    @Autowired(required = false) //when stormpath.enabled = false then this bean is not present but Spring Boot is still loading this class, so we need required = false here
     @Qualifier("stormpathSecurityConfigurerAdapter")
     protected SecurityConfigurerAdapter stormpathSecurityConfigurerAdapter;
 
+    @Value("#{ @environment['stormpath.enabled'] ?: true }")
+    protected boolean stormpathEnabled;
+
     /**
      * Extend WebSecurityConfigurerAdapter and configure the {@code HttpSecurity} object using
      * the {@link com.stormpath.spring.config.StormpathWebSecurityConfigurer#stormpath stormpath()} utility method.
@@ -77,7 +82,9 @@ public void init(HttpSecurity http) throws Exception {
         ApplicationContext context = http.getSharedObject(ApplicationContext.class);
         context.getAutowireCapableBeanFactory().autowireBean(this);
 
-        stormpathSecurityConfigurerAdapter.init(http);
+        if (stormpathEnabled) {
+            stormpathSecurityConfigurerAdapter.init(http);
+        }
     }
 
 }