SEC-1486, SEC-1538, SEC-1537: Generification of AuthenticationDetailsSource. Deprecation of non-web pre-authentication classes and other unnecessary classes. Removal of reflection in WebAuthenticationDetailsSource.

core/src/main/java/org/springframework/security/authentication/AuthenticationDetails.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 * @author Ruud Senden
 * @since 2.0
 */
+@Deprecated
 public class AuthenticationDetails implements Serializable {
    //~ Instance fields ================================================================================================
 

core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java

@@ -21,7 +21,7 @@ package org.springframework.security.authentication;
  *
  * @author Ben Alex
  */
-public interface AuthenticationDetailsSource {
+public interface AuthenticationDetailsSource<C, T> {
     //~ Methods ========================================================================================================
 
     /**
@@ -31,5 +31,5 @@ public interface AuthenticationDetailsSource {
      *
      * @return a fully-configured authentication details instance
      */
-    Object buildDetails(Object context);
+    T buildDetails(C context);
 }

core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java

@@ -1,11 +1,10 @@
 package org.springframework.security.authentication;
 
-import java.lang.reflect.Constructor;
-
-import org.springframework.security.authentication.AuthenticationDetailsSource;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 
+import java.lang.reflect.Constructor;
+
 /**
  * Base implementation of {@link AuthenticationDetailsSource}.
  * <p>
@@ -16,7 +15,9 @@ import org.springframework.util.ReflectionUtils;
  *
  * @author Ruud Senden
  * @since 2.0
+ * @deprecated Write an implementation of AuthenticationDetailsSource which returns the desired type directly.
  */
+@Deprecated
 public class AuthenticationDetailsSourceImpl implements AuthenticationDetailsSource {
     //~ Instance fields ================================================================================================
 

core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainerImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
+@Deprecated
 public class GrantedAuthoritiesContainerImpl implements MutableGrantedAuthoritiesContainer {
     private List<GrantedAuthority> authorities;
 

core/src/main/java/org/springframework/security/core/authority/MutableGrantedAuthoritiesContainer.java

@@ -14,6 +14,7 @@ import org.springframework.security.core.GrantedAuthority;
  * @author Luke Taylor
  * @since 2.0
  */
+@Deprecated
 public interface MutableGrantedAuthoritiesContainer extends GrantedAuthoritiesContainer {
     /**
      * Used to store authorities in the containing object.

core/src/main/java/org/springframework/security/core/session/SessionIdentifierAware.java

@@ -22,7 +22,9 @@ package org.springframework.security.core.session;
  * Used to extract the session ID from an <code>Authentication</code> object.
  *
  * @author Ben Alex
+ * @deprecated Legacy of former concurrency control implementation. Will be removed in a future version.
  */
+@Deprecated
 public interface SessionIdentifierAware {
     //~ Methods ========================================================================================================