1158 doing some clean up

Author: Mario

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/filter/DefaultUsernamePasswordRequestFactory.java

@@ -21,7 +21,6 @@
 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;

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

@@ -80,7 +80,6 @@ public abstract class AbstractController implements Controller {
     private Resolver<Locale> localeResolver;
     private AccountResolver accountResolver = AccountResolver.INSTANCE;
     private ContentNegotiationResolver contentNegotiationResolver = ContentNegotiationResolver.INSTANCE;
-    private ProviderAccountRequestFactory providerAccountRequestFactory;
 
     public String getUri() {
         return uri;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stormpath, Inc.
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,6 +71,11 @@ public ProviderAccountRequest getProviderAccountRequest(HttpServletRequest reque
                         return Providers.LINKEDIN
                                 .account().setCode(code).build();
                     }
+                    case "twitter": {
+                        String code = providerData.get("accessToken");
+                        return Providers.TWITTER
+                                .account().setAccessToken(code).build();
+                    }
                     default: {
                         log.error("No provider configured for " + providerId);
                         return null;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stormpath, Inc.
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import com.stormpath.sdk.directory.AccountStoreVisitorAdapter;
 import com.stormpath.sdk.directory.Directory;
 import com.stormpath.sdk.impl.provider.DefaultGithubProvider;
-import com.stormpath.sdk.impl.provider.IdentityProviderType;
 import com.stormpath.sdk.lang.Assert;
 import com.stormpath.sdk.servlet.application.ApplicationResolver;
 import com.stormpath.sdk.servlet.http.MediaType;
@@ -45,8 +44,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.stormpath.sdk.servlet.mvc.JacksonFieldValueResolver.MARSHALLED_OBJECT;
-
 /**
  * @since 1.3.0
  */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stormpath, Inc.
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import com.stormpath.sdk.provider.ProviderAccountRequest;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
 
 // Refactor of Provider requests for
 // https://github.com/stormpath/stormpath-sdk-java/issues/915

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

@@ -153,7 +153,6 @@ public abstract class AbstractStormpathWebSecurityConfiguration {
     @Qualifier("stormpathWrappedServletRequestFactory")
     private WrappedServletRequestFactory wrappedServletRequestFactory;
 
-
     public StormpathWebSecurityConfigurer stormpathWebSecurityConfigurer() {
         return new StormpathWebSecurityConfigurer();
     }

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

@@ -277,6 +277,7 @@ public void init(HttpSecurity http) throws Exception {
         http.servletApi().rolePrefix(""); //Fix for https://github.com/stormpath/stormpath-sdk-java/issues/325
 
         if (loginEnabled) {
+            //This filter adds Client and Application as attributes to every request in order for subsequent Filters to have access to them
             http.addFilterBefore(stormpathWrapperFilter, SecurityContextPersistenceFilter.class);
 
             // We need to add the springSecurityResolvedAccountFilter whenever we have our login enabled in order to

extensions/spring/stormpath-spring-security-webmvc/src/main/java/com/stormpath/spring/security/provider/SocialCallbackSpringSecurityProcessingFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stormpath, Inc.
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/LoginAndLogoutHandlersConfig.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stormpath, Inc.
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

extensions/spring/stormpath-spring-security-webmvc/src/test/resources/com/stormpath/spring/config/loginAndLogoutHandlers.properties

@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Stormpath, Inc.
+# Copyright 2017 Stormpath, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 stormpath.web.csrf.token.enabled = false