Merge branch '1158_handlers_fix_using_spring_security_in_front_stormpath' of github.com:stormpath/stormpath-sdk-java into 1123_spring_security_4.2.0_remove_apply

Author: Mario

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/FormController.java

@@ -133,8 +133,8 @@ protected ViewModel doGet(HttpServletRequest request, HttpServletResponse respon
     protected Map<String,?> createModel(HttpServletRequest request, HttpServletResponse response) {
         List<ErrorModel> errors = null;
         // We need to look for error in queryString now that we moved SpringSecurity to in in front of us: https://github.com/stormpath/stormpath-sdk-java/issues/915
-        String errorQueryString = request.getQueryString();
-        boolean requestContainsError = request.getParameter("error") != null || (errorQueryString != null && errorQueryString.contains("error"));
+        String queryString = request.getQueryString();
+        boolean requestContainsError = request.getParameter("error") != null || (queryString != null && queryString.contains("error"));
         if (requestContainsError) {
             errors = new ArrayList<>();
             ErrorModel error = null;

extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebSecurityAutoConfiguration.java

@@ -135,7 +135,7 @@ public SocialCallbackSpringSecurityProcessingFilter socialCallbackSpringSecurity
      * @since 1.3.0
      */
     @Bean
-    @ConditionalOnMissingBean(name="contentNegotiationSpringSecurityAuthenticationFilter")
+    @ConditionalOnMissingBean
     @Override
     public ContentNegotiationSpringSecurityAuthenticationFilter contentNegotiationSpringSecurityAuthenticationFilter() {
         return super.contentNegotiationSpringSecurityAuthenticationFilter();
@@ -161,8 +161,8 @@ public CorsConfigurationSource corsConfigurationSource() {
      */
     @Bean
     @ConditionalOnMissingBean
-    public AccountResolverFilter springSecuritResolvedAccountFilter() {
-        return super.springSecuritResolvedAccountFilter();
+    public AccountResolverFilter springSecurityResolvedAccountFilter() {
+        return super.springSecurityResolvedAccountFilter();
     }
 
     /**

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

@@ -256,7 +256,7 @@ public ContentNegotiationSpringSecurityAuthenticationFilter contentNegotiationSp
     /**
      * @since 1.3.0
      */
-    public AccountResolverFilter springSecuritResolvedAccountFilter() {
+    public AccountResolverFilter springSecurityResolvedAccountFilter() {
         AccountResolverFilter accountResolverFilter = new AccountResolverFilter();
         accountResolverFilter.setEnabled(stormpathFilterEnabled);
         accountResolverFilter.setResolvers(stormpathAccountResolvers);

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

@@ -127,8 +127,8 @@ public CorsConfigurationSource corsConfigurationSource() {
      * @since 1.3.0
      */
     @Bean
-    public AccountResolverFilter springSecuritResolvedAccountFilter() {
-        return super.springSecuritResolvedAccountFilter();
+    public AccountResolverFilter springSecurityResolvedAccountFilter() {
+        return super.springSecurityResolvedAccountFilter();
     }
 
     /**