1158 applying changes detected during 1st round of review

Mario · Mario · commit 6a0446ebe0d8 · 2016-12-29T12:26:43.000-03:00
diff --git a/examples/spring-security-webmvc/src/main/java/com/stormpath/spring/examples/WebAppInitializer.java b/examples/spring-security-webmvc/src/main/java/com/stormpath/spring/examples/WebAppInitializer.java
@@ -15,6 +15,7 @@
  */
 package com.stormpath.spring.examples;
 
+import com.stormpath.sdk.servlet.filter.StormpathFilter;
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
@@ -51,10 +52,10 @@ public void onStartup(ServletContext sc) throws ServletException {
         securityFilter.addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), false, "/*");
 
         //Stormpath Filter (after Spring Security)
-        FilterRegistration.Dynamic filter = sc.addFilter("stormpathFilter", new DelegatingFilterProxy());
+        FilterRegistration.Dynamic stormpathFilter = sc.addFilter(StormpathFilter.DEFAULT_FILTER_NAME, DelegatingFilterProxy.class);
         EnumSet<DispatcherType> types =
                 EnumSet.of(DispatcherType.ERROR, DispatcherType.FORWARD, DispatcherType.INCLUDE, DispatcherType.REQUEST);
-        filter.addMappingForUrlPatterns(types, false, "/*");
+        stormpathFilter.addMappingForUrlPatterns(types, false, "/*");
 
     }
 }
diff --git a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/event/RequestEventListenerAdapter.java b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/event/RequestEventListenerAdapter.java
@@ -15,7 +15,6 @@
  */
 package com.stormpath.sdk.servlet.event;
 
-import com.stormpath.sdk.directory.CustomData;
 import com.stormpath.sdk.servlet.account.event.RegisteredAccountRequestEvent;
 import com.stormpath.sdk.servlet.account.event.VerifiedAccountRequestEvent;
 import com.stormpath.sdk.servlet.authc.FailedAuthenticationRequestEvent;
diff --git a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/filter/DefaultUsernamePasswordRequestFactory.java b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/filter/DefaultUsernamePasswordRequestFactory.java
@@ -21,6 +21,7 @@
 import com.stormpath.sdk.directory.AccountStore;
 import com.stormpath.sdk.lang.Assert;
 import com.stormpath.sdk.servlet.http.authc.AccountStoreResolver;
+import com.stormpath.sdk.servlet.http.authc.BasicAuthenticationScheme;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/filter/StormpathFilter.java b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/filter/StormpathFilter.java
@@ -37,6 +37,8 @@
  */
 public class StormpathFilter extends HttpFilter {
 
+    public final static String DEFAULT_FILTER_NAME = "stormpathFilter";
+
     private FilterChainResolver filterChainResolver;
     private Set<String> clientRequestAttributeNames;
     private Set<String> applicationRequestAttributeNames;
diff --git a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/AbstractController.java b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/AbstractController.java
@@ -166,18 +166,6 @@ public void setApplicationResolver(ApplicationResolver applicationResolver) {
         this.applicationResolver = applicationResolver;
     }
 
-    // Refactor of Provider requests for
-    // https://github.com/stormpath/stormpath-sdk-java/issues/915
-    // and to provide uniform responses across all integrations for
-    // conformance to stormpath-framework-spec as enforced by
-    // stormpath-framework-tck
-    /**
-     * @since 1.3.0
-     */
-    public void setProviderAccountRequestFactory(ProviderAccountRequestFactory providerAccountRequestFactory) {
-        this.providerAccountRequestFactory = providerAccountRequestFactory;
-    }
-
     public void init() throws Exception {
         Assert.hasText(this.uri, "uri cannot be null or empty.");
         Assert.hasText(this.nextUri, "nextUri property cannot be null or empty.");
diff --git a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebSecurityAutoConfiguration.java b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebSecurityAutoConfiguration.java
@@ -23,10 +23,7 @@
 import com.stormpath.spring.config.AbstractStormpathWebSecurityConfiguration;
 import com.stormpath.spring.config.StormpathWebSecurityConfigurer;
 import com.stormpath.spring.filter.ContentNegotiationSpringSecurityAuthenticationFilter;
-//import com.stormpath.spring.filter.SpringSecurityResolvedAccountFilter;
 import com.stormpath.spring.filter.StormpathSecurityContextPersistenceFilter;
-//import com.stormpath.spring.oauth.OAuthAuthenticationSpringSecurityProcessingFilter;
-//import com.stormpath.spring.filter.StormpathWrapperFilter;
 import com.stormpath.spring.filter.StormpathWrapperFilter;
 import com.stormpath.spring.security.provider.SocialCallbackSpringSecurityProcessingFilter;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
diff --git a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebMvcAutoConfiguration.java b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebMvcAutoConfiguration.java
@@ -691,5 +691,4 @@ public AccessTokenControllerConfig stormpathAccessTokenConfig() {
     public GrantTypeValidator stormpathGrantTypeStatusValidator() {
         return super.stormpathGrantTypeStatusValidator();
     }
-
 }
diff --git a/extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebSecurityConfiguration.java b/extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebSecurityConfiguration.java
@@ -301,5 +301,4 @@ public StormpathWrapperFilter stormpathWrapperFilter() {
         filter.setWrappedServletRequestFactory(wrappedServletRequestFactory);
         return filter;
     }
-
 }
diff --git a/extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/config/StormpathWebSecurityConfigurer.java b/extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/config/StormpathWebSecurityConfigurer.java
@@ -277,14 +277,13 @@ public void init(HttpSecurity http) throws Exception {
         http.servletApi().rolePrefix(""); //Fix for https://github.com/stormpath/stormpath-sdk-java/issues/325
 
         if (loginEnabled) {
-
             http.addFilterBefore(stormpathWrapperFilter, SecurityContextPersistenceFilter.class);
 
             // We need to add the springSecurityResolvedAccountFilter whenever we have our login enabled in order to
             // fix https://github.com/stormpath/stormpath-sdk-java/issues/450
             http.addFilterBefore(springSecurityResolvedAccountFilter, LogoutFilter.class);
 
-            //Fix for redirection loop when Cookie is present but WebApp is restarted and '/' is locked down to authenticated users (Bare Bones example)
+            // Fix for redirection loop when Cookie is present but WebApp is restarted and '/' is locked down to authenticated users (Bare Bones example)
             http.addFilterBefore(stormpathSecurityContextPersistenceFilter, UsernamePasswordAuthenticationFilter.class);
 
             http.addFilterBefore(socialCallbackSpringSecurityProcessingFilter, UsernamePasswordAuthenticationFilter.class);
diff --git a/extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/filter/LoginHandlerFilter.java b/extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/filter/LoginHandlerFilter.java
diff --git a/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java b/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java
@@ -226,8 +226,8 @@ public abstract class AbstractStormpathWebMvcConfiguration {
     private static final Logger log = LoggerFactory.getLogger(AbstractStormpathWebMvcConfiguration.class);
 
     private static final String PRODUCES_SUPPORTED_TYPES_MSG = "stormpath.web.produces property value must " +
-            "specify either " + MediaType.APPLICATION_JSON_VALUE + " or " + MediaType.TEXT_HTML_VALUE + " or both.  " +
-            "Other media types for this property are not currently supported.";
+        "specify either " + MediaType.APPLICATION_JSON_VALUE + " or " + MediaType.TEXT_HTML_VALUE + " or both.  " +
+        "Other media types for this property are not currently supported.";
 
     // =================== Authentication Components ==========================
 
@@ -495,19 +495,19 @@ public HandlerMapping stormpathStaticResourceHandlerMapping() {
         }
 
         AccessibleResourceHandlerRegistry registry =
-                new AccessibleResourceHandlerRegistry(applicationContext, servletContext);
+            new AccessibleResourceHandlerRegistry(applicationContext, servletContext);
         registry.setOrder(staticResourceHandlerMappingOrder);
 
         if (cssEnabled) {
             registry.addResourceHandler("/assets/css/*stormpath.css")
-                    //reference the actual files in the stormpath-sdk-servlet .jar:
-                    .addResourceLocations("classpath:/META-INF/resources/assets/css/");
+                //reference the actual files in the stormpath-sdk-servlet .jar:
+                .addResourceLocations("classpath:/META-INF/resources/assets/css/");
         }
 
         if (jsEnabled) {
             registry.addResourceHandler("/assets/js/*stormpath.js")
-                    //reference the actual files in the stormpath-sdk-servlet .jar:
-                    .addResourceLocations("classpath:/META-INF/resources/assets/js/");
+                //reference the actual files in the stormpath-sdk-servlet .jar:
+                .addResourceLocations("classpath:/META-INF/resources/assets/js/");
         }
 
         return registry.toHandlerMapping();
@@ -602,9 +602,9 @@ public ProviderAccountRequestFactory stormpathAccountProviderRequestHandler() {
 
     public Resolver<Boolean> stormpathRegisterEnabledResolver() {
         return new RegisterEnabledResolver(
-                stormpathRegisterConfig().isEnabled(),
-                stormpathApplicationResolver(),
-                stormpathRegisterEnabledPredicate()
+            stormpathRegisterConfig().isEnabled(),
+            stormpathApplicationResolver(),
+            stormpathRegisterEnabledPredicate()
         );
     }
 
@@ -739,9 +739,9 @@ public Saver<AuthenticationResult> stormpathCookieAuthenticationResultSaver() {
 
         if (cookieAuthenticationResultSaverEnabled) {
             return new CookieAuthenticationResultSaver(
-                    stormpathAccessTokenCookieConfig(),
-                    stormpathRefreshTokenCookieConfig(),
-                    stormpathSecureResolver()
+                stormpathAccessTokenCookieConfig(),
+                stormpathRefreshTokenCookieConfig(),
+                stormpathSecureResolver()
             );
         }
 
@@ -767,7 +767,7 @@ public Saver<AuthenticationResult> stormpathAuthenticationResultSaver() {
 
         if (Collections.isEmpty(savers)) {
             String msg = "No Saver<AuthenticationResult> instances have been enabled or configured.  This is " +
-                    "required to save authentication result state.";
+                "required to save authentication result state.";
             throw new IllegalStateException(msg);
         }
 
@@ -830,8 +830,8 @@ public RefreshTokenResultFactory stormpathRefreshTokenResultFactory() {
 
     public WrappedServletRequestFactory stormpathWrappedServletRequestFactory() {
         return new DefaultWrappedServletRequestFactory(
-                stormpathUsernamePasswordRequestFactory(), stormpathAuthenticationResultSaver(),
-                stormpathRequestEventPublisher(), requestUserPrincipalStrategy, requestRemoteUserStrategy
+            stormpathUsernamePasswordRequestFactory(), stormpathAuthenticationResultSaver(),
+            stormpathRequestEventPublisher(), requestUserPrincipalStrategy, requestRemoteUserStrategy
         );
     }
 
@@ -853,7 +853,7 @@ public List<HttpAuthenticationScheme> stormpathHttpAuthenticationSchemes() {
 
     public HeaderAuthenticator stormpathAuthorizationHeaderAuthenticator() {
         return new AuthorizationHeaderAuthenticator(
-                stormpathHttpAuthenticationSchemes(), httpAuthenticationChallenge, stormpathRequestEventPublisher()
+            stormpathHttpAuthenticationSchemes(), httpAuthenticationChallenge, stormpathRequestEventPublisher()
         );
     }
 
@@ -863,11 +863,11 @@ public Resolver<Account> stormpathAuthorizationHeaderAccountResolver() {
 
     public Resolver<Account> stormpathCookieAccountResolver() {
         return new CookieAccountResolver(
-                stormpathAccessTokenCookieConfig(),
-                stormpathRefreshTokenCookieConfig(),
-                stormpathJwtAccountResolver(),
-                stormpathCookieAuthenticationResultSaver(),
-                stormpathAccessTokenResultFactory());
+            stormpathAccessTokenCookieConfig(),
+            stormpathRefreshTokenCookieConfig(),
+            stormpathJwtAccountResolver(),
+            stormpathCookieAuthenticationResultSaver(),
+            stormpathAccessTokenResultFactory());
     }
 
     public List<Resolver<Account>> stormpathAccountResolvers() {
@@ -1270,7 +1270,7 @@ public RefreshTokenAuthenticationRequestFactory stormpathRefreshTokenAuthenticat
 
     public RequestAuthorizer stormpathAccessTokenRequestAuthorizer() {
         return new DefaultAccessTokenRequestAuthorizer(
-                stormpathSecureResolver(), stormpathOriginAccessTokenRequestAuthorizer()
+            stormpathSecureResolver(), stormpathOriginAccessTokenRequestAuthorizer()
         );
     }
 
@@ -1280,8 +1280,8 @@ public Set<String> stormpathAccessTokenAuthorizedOriginUris() {
 
     public RequestAuthorizer stormpathOriginAccessTokenRequestAuthorizer() {
         return new OriginAccessTokenRequestAuthorizer(
-                stormpathServerUriResolver(), stormpathLocalhostResolver(), stormpathAccessTokenAuthorizedOriginUris(),
-                stormpathProducedMediaTypes()
+            stormpathServerUriResolver(), stormpathLocalhostResolver(), stormpathAccessTokenAuthorizedOriginUris(),
+            stormpathProducedMediaTypes()
         );
     }
 
@@ -1573,6 +1573,5 @@ public List<String> stormpathCorsAllowedHeaders() {
 
         return java.util.Collections.emptyList();
     }
-
 }
 
diff --git a/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/StormpathWebMvcConfiguration.java b/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/StormpathWebMvcConfiguration.java
@@ -542,5 +542,4 @@ public AccessTokenControllerConfig stormpathAccessTokenConfig(){
     public GrantTypeValidator stormpathGrantTypeStatusValidator(){
         return super.stormpathGrantTypeStatusValidator();
     }
-
 }
diff --git a/impl/src/main/java/com/stormpath/sdk/impl/ds/cache/WriteCacheFilter.java b/impl/src/main/java/com/stormpath/sdk/impl/ds/cache/WriteCacheFilter.java

Original file line number	Diff line number	Diff line change
`@@ -691,5 +691,4 @@ public AccessTokenControllerConfig stormpathAccessTokenConfig() {`
`691`	`691`	`public GrantTypeValidator stormpathGrantTypeStatusValidator() {`
`692`	`692`	`return super.stormpathGrantTypeStatusValidator();`
`693`	`693`	`}`
`694`		`-`
`695`	`694`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,5 +301,4 @@ public StormpathWrapperFilter stormpathWrapperFilter() {`
`301`	`301`	`filter.setWrappedServletRequestFactory(wrappedServletRequestFactory);`
`302`	`302`	`return filter;`
`303`	`303`	`}`
`304`		`-`
`305`	`304`	`}`