Fix Formatting and Style

Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Merge branch '7.0.x' into dependabot/gradle/7.1.x/io-spring-javaformat-0.0.48
2026-09-05 16:59:59 +00:00 · 2026-09-04 11:53:48 -06:00 · 2026-09-04 10:42:43 -06:00 · 2026-09-04 10:26:18 -06:00 · 2026-09-04 09:24:19 -07:00 · 2026-09-04 09:24:19 -07:00
1233 changed files with 2784 additions and 8115 deletions
@@ -4,6 +4,52 @@ registries:
    type: maven-repository
    url: https://build.shibboleth.net/maven/releases
 updates:
+  # 6.5.x
+  - package-ecosystem: gradle
+    target-branch: 6.5.x
+    directory: /
+    schedule:
+      interval: daily
+      time: '03:00'
+      timezone: Etc/UTC
+    labels:
+      - 'type: dependency-upgrade'
+      - 'in: build'
+    registries:
+      - shibboleth
+    ignore:
+      - dependency-name: com.nimbusds:nimbus-jose-jwt
+      - dependency-name: org.python:jython
+      - dependency-name: org.apache.directory.server:*
+      - dependency-name: org.apache.directory.shared:*
+      - dependency-name: org.junit:junit-bom
+        update-types:
+          - version-update:semver-major
+      - dependency-name: org.mockito:mockito-bom
+        update-types:
+          - version-update:semver-major
+      - dependency-name: '*'
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
+  - package-ecosystem: npm
+    target-branch: 6.5.x
+    directory: /docs
+    schedule:
+      interval: weekly
+    labels:
+      - 'type: task'
+      - 'type: dependency-upgrade'
+      - 'in: build'
+  - package-ecosystem: github-actions
+    target-branch: 6.5.x
+    directory: /
+    schedule:
+      interval: weekly
+    labels:
+      - 'type: task'
+      - 'type: dependency-upgrade'
+      - 'in: build'

  # 7.0.x
  - package-ecosystem: gradle
@@ -57,57 +103,6 @@ updates:
      - 'type: dependency-upgrade'
      - 'in: build'

-  # 7.1.x
-  - package-ecosystem: gradle
-    target-branch: 7.1.x
-    directory: /
-    schedule:
-      interval: daily
-      time: '03:00'
-      timezone: Etc/UTC
-    labels:
-      - 'type: dependency-upgrade'
-      - 'in: build'
-    registries:
-      - shibboleth
-    ignore:
-      - dependency-name: com.nimbusds:nimbus-jose-jwt
-      - dependency-name: org.python:jython
-      - dependency-name: org.apache.directory.server:*
-      - dependency-name: org.apache.directory.shared:*
-      - dependency-name: org.junit:junit-bom
-        update-types:
-          - version-update:semver-major
-      - dependency-name: org.mockito:mockito-bom
-        update-types:
-          - version-update:semver-major
-      - dependency-name: com.gradle.enterprise
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-      - dependency-name: '*'
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-  - package-ecosystem: npm
-    target-branch: 7.1.x
-    directory: /docs
-    schedule:
-      interval: weekly
-    labels:
-      - 'type: task'
-      - 'type: dependency-upgrade'
-      - 'in: build'
-  - package-ecosystem: github-actions
-    target-branch: 7.1.x
-    directory: /
-    schedule:
-      interval: weekly
-    labels:
-      - 'type: task'
-      - 'type: dependency-upgrade'
-      - 'in: build'
-
  # main
  - package-ecosystem: gradle
    target-branch: main
@@ -1,16 +0,0 @@
-name: Merge Dependabot PR
-
-on:
-  pull_request:
-    branches:
-      - main
-      - 'docs-build'
-
-run-name: Merge Dependabot PR ${{ github.ref_name }}
-
-jobs:
-  merge-dependabot-pr:
-    permissions: write-all
-    uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@0d3f15bb384839966a1ff5c4383731a2b747f24b # v7
-    with:
-      mergeArguments: --auto --rebase
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        branch: [ '6.5.x', '7.0.x', '7.1.x', 'main' ]
+        branch: [ '6.5.x', '7.0.x', 'main' ]
    steps:
      - uses: spring-io/spring-doc-actions/update-antora-spring-ui@415e2b11a766ba64799fffb5c97a4f7e17f677cf # v0.0.22
        name: Update
@@ -90,7 +90,7 @@ public class ExpressionBasedAnnotationAttributeFactory implements PrePostInvocat
 	}

 	/**
-	 * Delay the lookup of the {@link ExpressionParser} to prevent SEC-2136
+	 * Delay the lookup of the {@link ExpressionParser} to prevent SEC-2136.
 	 * @return
 	 */
 	private ExpressionParser getParser() {
@@ -30,6 +30,9 @@ import org.springframework.security.access.prepost.PostInvocationAuthorizationAd
 import org.springframework.security.core.Authentication;

 /**
+ * A {@link PostInvocationAuthorizationAdvice} that applies {@code PostFilter} and
+ * {@code PostAuthorize} expressions.
+ *
 * @author Luke Taylor
 * @since 3.0
 * @deprecated Use
@@ -23,6 +23,8 @@ import org.springframework.expression.ParseException;
 import org.springframework.security.access.prepost.PostInvocationAttribute;

 /**
+ * A {@link PostInvocationAttribute} based on filter and authorize expressions.
+ *
 * @author Luke Taylor
 * @since 3.0
 * @deprecated Use
@@ -23,6 +23,8 @@ import org.springframework.expression.ParseException;
 import org.springframework.security.access.prepost.PreInvocationAttribute;

 /**
+ * A {@link PreInvocationAttribute} based on parsed {@link Expression}s.
+ *
 * @author Luke Taylor
 * @since 3.0
 * @deprecated Use
@@ -59,12 +59,12 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod
 	private @Nullable ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();

 	/**
-	 * Map from RegisteredMethod to ConfigAttribute list
+	 * Map from RegisteredMethod to ConfigAttribute list.
 	 */
 	protected final Map<RegisteredMethod, List<ConfigAttribute>> methodMap = new HashMap<>();

 	/**
-	 * Map from RegisteredMethod to name pattern used for registration
+	 * Map from RegisteredMethod to name pattern used for registration.
 	 */
 	private final Map<RegisteredMethod, String> nameMap = new HashMap<>();

@@ -72,7 +72,7 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod
 	}

 	/**
-	 * Creates the <tt>MapBasedMethodSecurityMetadataSource</tt> from a
+	 * Creates the <tt>MapBasedMethodSecurityMetadataSource</tt> from a.
 	 * @param methodMap map of method names to <tt>ConfigAttribute</tt>s.
 	 */
 	public MapBasedMethodSecurityMetadataSource(Map<String, List<ConfigAttribute>> methodMap) {
@@ -236,6 +236,7 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod
 	}

 	/**
+	 * Returns the size of the method map.
 	 * @return map size (for unit tests and diagnostics)
 	 */
 	public int getMethodMapSize() {
@@ -41,7 +41,7 @@ import org.springframework.security.core.parameters.AnnotationParameterNameDisco
 public @interface P {

 	/**
-	 * The parameter name
+	 * The parameter name.
 	 * @return
 	 */
 	String value();
@@ -74,7 +74,7 @@ public class PrePostAdviceReactiveMethodInterceptor implements MethodInterceptor
 	private static final int RETURN_TYPE_METHOD_PARAMETER_INDEX = -1;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param attributeSource the {@link MethodSecurityMetadataSource} to use
 	 * @param preInvocationAdvice the {@link PreInvocationAuthorizationAdvice} to use
 	 * @param postInvocationAdvice the {@link PostInvocationAuthorizationAdvice} to use
@@ -22,6 +22,9 @@ import org.springframework.aop.framework.AopInfrastructureBean;
 import org.springframework.security.authorization.AuthorizationManager;

 /**
+ * A factory for creating {@link PreInvocationAttribute}s and
+ * {@link PostInvocationAttribute}s.
+ *
 * @author Luke Taylor
 * @since 3.0
 * @see org.springframework.security.authorization.method.AuthorizationManagerBeforeMethodInterceptor
@@ -19,7 +19,7 @@ package org.springframework.security.messaging.access.expression;
 import org.springframework.expression.EvaluationContext;

 /**
- * Allows post processing the {@link EvaluationContext}
+ * Allows post processing the {@link EvaluationContext}.
 *
 * <p>
 * This API is intentionally kept package scope as it may evolve over time.
@@ -46,7 +46,7 @@ class MessageExpressionConfigAttribute implements ConfigAttribute, EvaluationCon
 	private final MessageMatcher<Object> matcher;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param authorizeExpression the {@link Expression} to use. Cannot be null
 	 * @param matcher the {@link MessageMatcher} used to match the messages.
 	 */
@@ -48,7 +48,7 @@ public final class ChannelSecurityInterceptor extends AbstractSecurityIntercepto
 	private final MessageSecurityMetadataSource metadataSource;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param metadataSource the MessageSecurityMetadataSource to use. Cannot be null.
 	 *
 	 * @see DefaultMessageSecurityMetadataSource
@@ -20,7 +20,7 @@ import org.springframework.messaging.Message;
 import org.springframework.security.access.SecurityMetadataSource;

 /**
- * A {@link SecurityMetadataSource} that is used for securing {@link Message}
+ * A {@link SecurityMetadataSource} that is used for securing {@link Message}.
 *
 * @author Rob Winch
 * @since 4.0
@@ -32,6 +32,8 @@ import org.springframework.security.web.RedirectStrategy;
 import org.springframework.util.Assert;

 /**
+ * A {@link ChannelEntryPoint} that retries the request on a different scheme and port.
+ *
 * @author Luke Taylor
 * @deprecated please use
 * {@link org.springframework.security.web.transport.HttpsRedirectFilter} and its
@@ -45,12 +47,12 @@ public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint {
 	private PortMapper portMapper = new PortMapperImpl();

 	/**
-	 * The scheme ("http://" or "https://")
+	 * The scheme ("http://" or "https://").
 	 */
 	private final String scheme;

 	/**
-	 * The standard port for the scheme (80 for http, 443 for https)
+	 * The standard port for the scheme (80 for http, 443 for https).
 	 */
 	private final int standardPort;

@@ -28,6 +28,8 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.web.FilterInvocation;

 /**
+ * The default implementation of {@link SecurityExpressionHandler} for web security.
+ *
 * @author Luke Taylor
 * @author Eddú Meléndez
 * @author Steve Riesenberg
@@ -54,7 +54,7 @@ public class FilterSecurityInterceptor extends AbstractSecurityInterceptor imple
 	private boolean observeOncePerRequest = false;

 	/**
-	 * Not used (we rely on IoC container lifecycle services instead)
+	 * Not used (we rely on IoC container lifecycle services instead).
 	 * @param arg0 ignored
 	 *
 	 */
@@ -63,7 +63,7 @@ public class FilterSecurityInterceptor extends AbstractSecurityInterceptor imple
 	}

 	/**
-	 * Not used (we rely on IoC container lifecycle services instead)
+	 * Not used (we rely on IoC container lifecycle services instead).
 	 */
 	@Override
 	public void destroy() {
@@ -141,7 +141,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 	private AclClassIdUtils aclClassIdUtils;

 	/**
-	 * Constructor accepting mandatory arguments
+	 * Constructor accepting mandatory arguments.
 	 * @param dataSource to access the database
 	 * @param aclCache the cache where fully-loaded elements can be stored
 	 * @param aclAuthorizationStrategy authorization strategy (required)
@@ -152,7 +152,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 	}

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param dataSource to access the database
 	 * @param aclCache the cache where fully-loaded elements can be stored
 	 * @param aclAuthorizationStrategy authorization strategy (required)
@@ -565,7 +565,7 @@ public class BasicLookupStrategy implements LookupStrategy {

 		/**
 		 * Accepts the current <code>ResultSet</code> row, and converts it into an
-		 * <code>AclImpl</code> that contains a <code>StubAclParent</code>
+		 * <code>AclImpl</code> that contains a <code>StubAclParent</code>.
 		 * @param acls the Map we should add the converted Acl to
 		 * @param rs the ResultSet focused on a current row
 		 * @throws SQLException if something goes wrong converting values
@@ -479,6 +479,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	}

 	/**
+	 * Sets whether the database enforces foreign key constraints.
 	 * @param foreignKeysInDatabase if false this class will perform additional FK
 	 * constrain checking, which may cause deadlocks (the default is true, so deadlocks
 	 * are avoided but the database is expected to enforce FKs)
@@ -15,7 +15,7 @@
 */

 /**
- * JDBC-based persistence of ACL information
+ * JDBC-based persistence of ACL information.
 */
@NullMarked
 package org.springframework.security.acls.jdbc;
@@ -37,6 +37,7 @@ import org.jspecify.annotations.Nullable;
 public interface ObjectIdentity extends Serializable {

 	/**
+	 * Compares this <tt>ObjectIdentity</tt> to the given object for equality.
 	 * @param obj to be compared
 	 * @return <tt>true</tt> if the objects are equal, <tt>false</tt> otherwise
 	 * @see Object#equals(Object)
@@ -67,6 +68,7 @@ public interface ObjectIdentity extends Serializable {
 	String getType();

 	/**
+	 * Returns a hash code representation of the <tt>ObjectIdentity</tt>.
 	 * @return a hash code representation of the <tt>ObjectIdentity</tt>
 	 * @see Object#hashCode()
 	 */
@@ -31,6 +31,8 @@ import java.io.Serializable;
 public interface ObjectIdentityGenerator {

 	/**
+	 * Creates an {@link ObjectIdentity} using the supplied identifier and type
+	 * information.
 	 * @param id the identifier of the domain object, not null
 	 * @param type the type of the object (often a class name), not null
 	 * @return the identity constructed using the supplied identifier and type
@@ -18,7 +18,7 @@ package org.springframework.security.acls.model;

 /**
 * Strategy interface that provides the ability to determine which {@link ObjectIdentity}
- * will be returned for a particular domain object
+ * will be returned for a particular domain object.
 *
 * @author Ben Alex
 */
@@ -72,7 +72,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
 	}

 	/**
-	 * Private constructor for Jackson Deserialization support
+	 * Private constructor for Jackson Deserialization support.
 	 * @param keyHash hashCode of provided key to identify if this object made by a given
 	 * {@link CasAuthenticationProvider}
 	 * @param principal typically the UserDetails object (cannot be <code>null</code>)
@@ -182,7 +182,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
 	}

 	/**
-	 * A builder of {@link CasAuthenticationToken} instances
+	 * A builder of {@link CasAuthenticationToken} instances.
 	 *
 	 * @since 7.0
 	 */
@@ -208,7 +208,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
 		}

 		/**
-		 * Use this key
+		 * Use this key.
 		 * @param key the key to use
 		 * @return the {@link Builder} for further configurations
 		 */
@@ -232,7 +232,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
 		}

 		/**
-		 * Use this {@link UserDetails}
+		 * Use this {@link UserDetails}.
 		 * @param userDetails the {@link UserDetails} to use
 		 * @return the {@link Builder} for further configurations
 		 */
@@ -242,7 +242,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
 		}

 		/**
-		 * Use this {@link Assertion}
+		 * Use this {@link Assertion}.
 		 * @param assertion the {@link Assertion} to use
 		 * @return the {@link Builder} for further configurations
 		 */
@@ -121,7 +121,7 @@ public class CasServiceTicketAuthenticationToken extends AbstractAuthenticationT
 	}

 	/**
-	 * A builder of {@link CasServiceTicketAuthenticationToken} instances
+	 * A builder of {@link CasServiceTicketAuthenticationToken} instances.
 	 *
 	 * @since 7.0
 	 */
@@ -32,6 +32,7 @@ import org.jspecify.annotations.Nullable;
 public final class NullStatelessTicketCache implements StatelessTicketCache {

 	/**
+	 * Always returns {@code null} since tickets are not stored.
 	 * @return null since we are not storing any tickets.
 	 */
 	@Override
@@ -20,9 +20,11 @@ import java.util.Date;
 import java.util.Map;

 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import org.apereo.cas.client.authentication.AttributePrincipal;

 /**
@@ -36,14 +38,14 @@ import org.apereo.cas.client.authentication.AttributePrincipal;
 * @see CasJacksonModule
 * @see org.springframework.security.jackson.SecurityJacksonModules
 */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
-		isGetterVisibility = JsonAutoDetect.Visibility.NONE)
+@JsonTypeInfo(use = Id.CLASS)
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE,
+		isGetterVisibility = Visibility.NONE)
 class AssertionImplMixin {

 	/**
 	 * Mixin Constructor helps in deserialize
-	 * {@link org.apereo.cas.client.validation.AssertionImpl}
+	 * {@link org.apereo.cas.client.validation.AssertionImpl}.
 	 * @param principal the Principal to associate with the Assertion.
 	 * @param validFromDate when the assertion is valid from.
 	 * @param validUntilDate when the assertion is valid to.
@@ -19,9 +19,11 @@ package org.springframework.security.cas.jackson;
 import java.util.Map;

 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import org.apereo.cas.client.proxy.ProxyRetriever;

 /**
@@ -35,14 +37,14 @@ import org.apereo.cas.client.proxy.ProxyRetriever;
 * @see CasJacksonModule
 * @see org.springframework.security.jackson.SecurityJacksonModules
 */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
-		isGetterVisibility = JsonAutoDetect.Visibility.NONE)
+@JsonTypeInfo(use = Id.CLASS)
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE,
+		isGetterVisibility = Visibility.NONE)
 class AttributePrincipalImplMixin {

 	/**
 	 * Mixin Constructor helps in deserialize
-	 * {@link org.apereo.cas.client.authentication.AttributePrincipalImpl}
+	 * {@link org.apereo.cas.client.authentication.AttributePrincipalImpl}.
 	 * @param name the unique identifier for the principal.
 	 * @param attributes the key/value pairs for this principal.
 	 * @param proxyGrantingTicket the ticket associated with this principal.
@@ -19,9 +19,11 @@ package org.springframework.security.cas.jackson;
 import java.util.Collection;

 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import org.apereo.cas.client.validation.Assertion;

 import org.springframework.security.cas.authentication.CasAuthenticationProvider;
@@ -38,13 +40,13 @@ import org.springframework.security.core.userdetails.UserDetails;
 * @see CasJacksonModule
 * @see org.springframework.security.jackson.SecurityJacksonModules
 */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE,
-		getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
+@JsonTypeInfo(use = Id.CLASS)
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, isGetterVisibility = Visibility.NONE,
+		getterVisibility = Visibility.NONE, creatorVisibility = Visibility.ANY)
 class CasAuthenticationTokenMixin {

 	/**
-	 * Mixin Constructor helps in deserialize {@link CasAuthenticationToken}
+	 * Mixin Constructor helps in deserialize {@link CasAuthenticationToken}.
 	 * @param keyHash hashCode of provided key to identify if this object made by a given
 	 * {@link CasAuthenticationProvider}
 	 * @param principal typically the UserDetails object (cannot be <code>null</code>)
@@ -20,10 +20,13 @@ import java.util.Date;
 import java.util.Map;

 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import org.apereo.cas.client.authentication.AttributePrincipal;

 /**
@@ -49,15 +52,15 @@ import org.apereo.cas.client.authentication.AttributePrincipal;
 */
@SuppressWarnings("removal")
@Deprecated(forRemoval = true)
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
-		isGetterVisibility = JsonAutoDetect.Visibility.NONE)
+@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY)
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE,
+		isGetterVisibility = Visibility.NONE)
@JsonIgnoreProperties(ignoreUnknown = true)
 class AssertionImplMixin {

 	/**
 	 * Mixin Constructor helps in deserialize
-	 * {@link org.apereo.cas.client.validation.AssertionImpl}
+	 * {@link org.apereo.cas.client.validation.AssertionImpl}.
 	 * @param principal the Principal to associate with the Assertion.
 	 * @param validFromDate when the assertion is valid from.
 	 * @param validUntilDate when the assertion is valid to.
@@ -19,10 +19,13 @@ package org.springframework.security.cas.jackson2;
 import java.util.Map;

 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import org.apereo.cas.client.proxy.ProxyRetriever;

 /**
@@ -47,15 +50,15 @@ import org.apereo.cas.client.proxy.ProxyRetriever;
 */
@SuppressWarnings("removal")
@Deprecated(forRemoval = true)
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
-		isGetterVisibility = JsonAutoDetect.Visibility.NONE)
+@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY)
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE,
+		isGetterVisibility = Visibility.NONE)
@JsonIgnoreProperties(ignoreUnknown = true)
 class AttributePrincipalImplMixin {

 	/**
 	 * Mixin Constructor helps in deserialize
-	 * {@link org.apereo.cas.client.authentication.AttributePrincipalImpl}
+	 * {@link org.apereo.cas.client.authentication.AttributePrincipalImpl}.
 	 * @param name the unique identifier for the principal.
 	 * @param attributes the key/value pairs for this principal.
 	 * @param proxyGrantingTicket the ticket associated with this principal.
@@ -19,10 +19,13 @@ package org.springframework.security.cas.jackson2;
 import java.util.Collection;

 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import org.apereo.cas.client.validation.Assertion;

 import org.springframework.security.cas.authentication.CasAuthenticationProvider;
@@ -55,14 +58,14 @@ import org.springframework.security.core.userdetails.UserDetails;
 */
@SuppressWarnings("removal")
@Deprecated(forRemoval = true)
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE,
-		getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
+@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY)
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, isGetterVisibility = Visibility.NONE,
+		getterVisibility = Visibility.NONE, creatorVisibility = Visibility.ANY)
@JsonIgnoreProperties(ignoreUnknown = true)
 class CasAuthenticationTokenMixin {

 	/**
-	 * Mixin Constructor helps in deserialize {@link CasAuthenticationToken}
+	 * Mixin Constructor helps in deserialize {@link CasAuthenticationToken}.
 	 * @param keyHash hashCode of provided key to identify if this object made by a given
 	 * {@link CasAuthenticationProvider}
 	 * @param principal typically the UserDetails object (cannot be <code>null</code>)
@@ -155,7 +155,7 @@ public class CasAuthenticationEntryPoint implements AuthenticationEntryPoint, In
 	}

 	/**
-	 * Sets the {@link RedirectStrategy} to use
+	 * Sets the {@link RedirectStrategy} to use.
 	 * @param redirectStrategy the {@link RedirectStrategy} to use
 	 * @since 6.3
 	 */
@@ -69,7 +69,7 @@ public final class CasGatewayAuthenticationRedirectFilter extends GenericFilterB
 	private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();

 	/**
-	 * Constructs a new instance of this class
+	 * Constructs a new instance of this class.
 	 * @param serviceProperties the {@link ServiceProperties}
 	 */
 	public CasGatewayAuthenticationRedirectFilter(String casLoginUrl, ServiceProperties serviceProperties) {
@@ -44,7 +44,7 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails
 	private final String serviceUrl;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param request the current {@link HttpServletRequest} to obtain the
 	 * {@link #getServiceUrl()} from.
 	 * @param artifactPattern the {@link Pattern} that will be used to clean up the query
@@ -53,7 +53,7 @@ public class ServiceAuthenticationDetailsSource
 	}

 	/**
-	 * Creates an implementation that uses the specified artifactParameterName
+	 * Creates an implementation that uses the specified artifactParameterName.
 	 * @param serviceProperties The ServiceProperties to use to construct the serviceUrl.
 	 * @param artifactParameterName the artifactParameterName that is removed from the
 	 * current URL. The result becomes the service url. Cannot be null and cannot be an
@@ -66,6 +66,7 @@ public class ServiceAuthenticationDetailsSource
 	}

 	/**
+	 * Builds the {@code ServiceAuthenticationDetails} from the given request.
 	 * @param context the {@code HttpServletRequest} object.
 	 * @return the {@code ServiceAuthenticationDetails} containing information about the
 	 * current request
@@ -25,6 +25,8 @@ import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
 import org.springframework.security.ldap.userdetails.PersonContextMapper;

 /**
+ * Test configurations for namespace-based LDAP {@code AuthenticationProvider} setup.
+ *
 * @author Rob Winch
 *
 */
@@ -50,6 +50,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
+ * Integration tests for anonymous authentication over RSocket.
+ *
 * @author Andrey Litvitski
 */
@ContextConfiguration
@@ -50,6 +50,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
+ * Integration tests for securing RSocket requests and responses.
+ *
 * @author Rob Winch
 */
@ContextConfiguration
@@ -60,6 +60,8 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

 /**
+ * Integration tests for RSocket security observations.
+ *
 * @author Rob Winch
 */
@ContextConfiguration
@@ -50,6 +50,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
+ * Integration tests for RSocket security combined with WebFlux security.
+ *
 * @author Rob Winch
 */
@ContextConfiguration
@@ -59,6 +59,8 @@ import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

 /**
+ * Integration tests for RSocket JWT authentication.
+ *
 * @author Rob Winch
 */
@ContextConfiguration
@@ -53,6 +53,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
+ * Integration tests for connecting to an {@link RSocketMessageHandler} secured server.
+ *
 * @author Rob Winch
 * @author Luis Felipe Vega
 * @author Jesús Ascama Arias
@@ -55,6 +55,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
+ * Integration tests for securing an {@link RSocketMessageHandler}.
+ *
 * @author Rob Winch
 */
@ContextConfiguration
@@ -55,6 +55,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
+ * Integration tests for securing RSocket requests using simple authentication metadata.
+ *
 * @author Rob Winch
 */
@ContextConfiguration
@@ -32,6 +32,8 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;

 /**
+ * Tests for the {@code ldap-server} XML namespace element.
+ *
 * @author Luke Taylor
 * @author Rob Winch
 */
@@ -39,6 +39,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;

 /**
+ * Tests for the {@code ldap-user-service} bean definition parser.
+ *
 * @author Luke Taylor
 * @author Rob Winch
 * @author Eddú Meléndez
@@ -31,7 +31,7 @@ public abstract class BeanIds {

 	/**
 	 * The "global" AuthenticationManager instance, registered by the
-	 * &lt;authentication-manager&gt; element
+	 * &lt;authentication-manager&gt; element.
 	 */
 	public static final String AUTHENTICATION_MANAGER = PREFIX + "authenticationManager";

@@ -25,6 +25,9 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.security.config.debug.SecurityDebugBeanFactoryPostProcessor;

 /**
+ * Parses the {@code debug} element to register a
+ * {@link SecurityDebugBeanFactoryPostProcessor}.
+ *
 * @author Luke Taylor
 */
 public class DebugBeanDefinitionParser implements BeanDefinitionParser {
@@ -94,7 +94,7 @@ public final class SecurityNamespaceHandler implements NamespaceHandler {
 	public BeanDefinition parse(Element element, ParserContext pc) {
 		if (!namespaceMatchesVersion(element)) {
 			pc.getReaderContext()
-				.fatal("You cannot use any XSD older than spring-security-7.2.xsd. Either change to spring-security.xsd or spring-security-7.2.xsd",
+				.fatal("You cannot use any XSD older than spring-security-7.1.xsd. Either change to spring-security.xsd or spring-security-7.1.xsd",
 						element);
 		}
 		String name = pc.getDelegate().getLocalName(element);
@@ -219,7 +219,7 @@ public final class SecurityNamespaceHandler implements NamespaceHandler {

 	private boolean matchesVersionInternal(Element element) {
 		String schemaLocation = element.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "schemaLocation");
-		return schemaLocation.matches("(?m).*spring-security-7\\.2.*.xsd.*")
+		return schemaLocation.matches("(?m).*spring-security-7\\.1.*.xsd.*")
 				|| schemaLocation.matches("(?m).*spring-security.xsd.*")
 				|| !schemaLocation.matches("(?m).*spring-security.*");
 	}
@@ -187,7 +187,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 	}

 	/**
-	 * Gets the shared objects
+	 * Gets the shared objects.
 	 * @return the shared Objects
 	 */
 	public Map<Class<?>, Object> getSharedObjects() {
@@ -315,7 +315,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui

 	/**
 	 * Executes the build using the {@link SecurityConfigurer}'s that have been applied
-	 * using the following steps:
+	 * using the following steps:.
 	 *
 	 * <ul>
 	 * <li>Invokes {@link #beforeInit()} for any subclass to hook into</li>
@@ -406,7 +406,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 	}

 	/**
-	 * The build state for the application
+	 * The build state for the application.
 	 *
 	 * @author Rob Winch
 	 * @since 3.2
@@ -414,7 +414,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 	private enum BuildState {

 		/**
-		 * This is the state before the {@link SecurityBuilder#build()} is invoked
+		 * This is the state before the {@link SecurityBuilder#build()} is invoked.
 		 */
 		UNBUILT(0),

@@ -455,7 +455,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 		}

 		/**
-		 * Determines if the state is CONFIGURING or later
+		 * Determines if the state is CONFIGURING or later.
 		 * @return
 		 */
 		public boolean isConfigured() {
@@ -17,7 +17,7 @@
 package org.springframework.security.config.annotation;

 /**
- * Interface for building an Object
+ * Interface for building an Object.
 *
 * @param <O> The type of the Object being built
 * @author Rob Winch
@@ -115,7 +115,7 @@ public abstract class SecurityConfigurerAdapter<O, B extends SecurityBuilder<O>>
 		}

 		/**
-		 * Adds an {@link ObjectPostProcessor} to use
+		 * Adds an {@link ObjectPostProcessor} to use.
 		 * @param objectPostProcessor the {@link ObjectPostProcessor} to add
 		 * @return true if the {@link ObjectPostProcessor} was added, else false
 		 */
@@ -22,7 +22,7 @@ import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.config.annotation.SecurityBuilder;

 /**
- * Interface for operating on a SecurityBuilder that creates a {@link ProviderManager}
+ * Interface for operating on a SecurityBuilder that creates a {@link ProviderManager}.
 *
 * @param <B> the type of the {@link SecurityBuilder}
 * @author Rob Winch
@@ -66,7 +66,7 @@ public class AuthenticationManagerBuilder
 	private AuthenticationEventPublisher eventPublisher;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param objectPostProcessor the {@link ObjectPostProcessor} instance to use.
 	 */
 	public AuthenticationManagerBuilder(ObjectPostProcessor<Object> objectPostProcessor) {
@@ -92,7 +92,7 @@ public class AuthenticationManagerBuilder
 	}

 	/**
-	 * Sets the {@link AuthenticationEventPublisher}
+	 * Sets the {@link AuthenticationEventPublisher}.
 	 * @param eventPublisher the {@link AuthenticationEventPublisher} to use
 	 * @return the {@link AuthenticationManagerBuilder} for further customizations
 	 */
@@ -103,6 +103,7 @@ public class AuthenticationManagerBuilder
 	}

 	/**
+	 * Sets whether the {@link AuthenticationManager} should clear the credentials.
 	 * @param eraseCredentials true if {@link AuthenticationManager} should clear the
 	 * credentials from the {@link Authentication} object after authenticating
 	 * @return the {@link AuthenticationManagerBuilder} for further customizations
@@ -54,7 +54,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.util.Assert;

 /**
- * Exports the authentication {@link Configuration}
+ * Exports the authentication {@link Configuration}.
 *
 * @author Rob Winch
 * @author Ngoc Nhan
@@ -265,7 +265,7 @@ public class AuthenticationConfiguration {
 		private PasswordEncoder defaultPasswordEncoder;

 		/**
-		 * Creates a new instance
+		 * Creates a new instance.
 		 * @param objectPostProcessor the {@link ObjectPostProcessor} instance to use.
 		 */
 		DefaultPasswordEncoderAuthenticationManagerBuilder(ObjectPostProcessor<Object> objectPostProcessor,
@@ -42,6 +42,7 @@ class InitializeAuthenticationProviderBeanManagerConfigurer extends GlobalAuthen
 	private final ApplicationContext context;

 	/**
+	 * Creates a new instance.
 	 * @param context the ApplicationContext to look up beans.
 	 */
 	InitializeAuthenticationProviderBeanManagerConfigurer(ApplicationContext context) {
@@ -49,6 +49,7 @@ class InitializeUserDetailsBeanManagerConfigurer extends GlobalAuthenticationCon
 	private final ApplicationContext context;

 	/**
+	 * Creates a new instance using the given {@link ApplicationContext}.
 	 * @param context
 	 */
 	InitializeUserDetailsBeanManagerConfigurer(ApplicationContext context) {
@@ -112,6 +113,8 @@ class InitializeUserDetailsBeanManagerConfigurer extends GlobalAuthenticationCon
 		}

 		/**
+		 * Returns a bean of the requested class if there's just a single registered
+		 * component, null otherwise.
 		 * @return a bean of the requested class if there's just a single registered
 		 * component, null otherwise.
 		 */
@@ -136,7 +136,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild

 	/**
 	 * Gets the {@link LdapAuthoritiesPopulator} and defaults to
-	 * {@link DefaultLdapAuthoritiesPopulator}
+	 * {@link DefaultLdapAuthoritiesPopulator}.
 	 * @return the {@link LdapAuthoritiesPopulator}
 	 */
 	private LdapAuthoritiesPopulator getLdapAuthoritiesPopulator() {
@@ -185,7 +185,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
 	}

 	/**
-	 * Creates the {@link LdapAuthenticator} to use
+	 * Creates the {@link LdapAuthenticator} to use.
 	 * @param contextSource the {@link BaseLdapPathContextSource} to use
 	 * @return the {@link LdapAuthenticator} to use
 	 */
@@ -203,7 +203,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
 	}

 	/**
-	 * Creates {@link PasswordComparisonAuthenticator}
+	 * Creates {@link PasswordComparisonAuthenticator}.
 	 * @param contextSource the {@link BaseLdapPathContextSource} to use
 	 * @return
 	 */
@@ -218,7 +218,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
 	}

 	/**
-	 * Creates a {@link BindAuthenticator}
+	 * Creates a {@link BindAuthenticator}.
 	 * @param contextSource the {@link BaseLdapPathContextSource} to use
 	 * @return the {@link BindAuthenticator} to use
 	 */
@@ -395,6 +395,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
 	}

 	/**
+	 * Enables password-based comparison for authentication.
 	 * @return the {@link PasswordCompareConfigurer} for further customizations
 	 */
 	public PasswordCompareConfigurer passwordCompare() {
@@ -403,7 +404,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
 	}

 	/**
-	 * Sets up Password based comparison
+	 * Sets up Password based comparison.
 	 *
 	 * @author Rob Winch
 	 */
@@ -434,7 +435,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild

 		/**
 		 * Allows obtaining a reference to the
-		 * {@link LdapAuthenticationProviderConfigurer} for further customizations
+		 * {@link LdapAuthenticationProviderConfigurer} for further customizations.
 		 * @return attribute in the directory which contains the user password
 		 */
 		public LdapAuthenticationProviderConfigurer<B> and() {
@@ -547,7 +548,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild

 		/**
 		 * Gets the {@link LdapAuthenticationProviderConfigurer} for further
-		 * customizations
+		 * customizations.
 		 * @return the {@link LdapAuthenticationProviderConfigurer} for further
 		 * customizations
 		 */
@@ -35,7 +35,7 @@ public class InMemoryUserDetailsManagerConfigurer<B extends ProviderManagerBuild
 		extends UserDetailsManagerConfigurer<B, InMemoryUserDetailsManagerConfigurer<B>> {

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 */
 	public InMemoryUserDetailsManagerConfigurer() {
 		super(new InMemoryUserDetailsManager(new ArrayList<>()));
@@ -140,7 +140,7 @@ public class JdbcUserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B
 	}

 	/**
-	 * Defines the {@link UserCache} to use
+	 * Defines the {@link UserCache} to use.
 	 * @param userCache the {@link UserCache} to use
 	 * @return the {@link JdbcUserDetailsManagerConfigurer} for further customizations
 	 */
@@ -112,7 +112,7 @@ public class UserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B>, C
 		private final C builder;

 		/**
-		 * Creates a new instance
+		 * Creates a new instance.
 		 * @param builder the builder to return
 		 */
 		private UserDetailsBuilder(C builder) {
@@ -25,7 +25,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.PasswordEncoder;

 /**
- * Allows configuring a {@link DaoAuthenticationProvider}
+ * Allows configuring a {@link DaoAuthenticationProvider}.
 *
 * @param <B> the type of the {@link SecurityBuilder}
 * @param <C> the type of {@link AbstractDaoAuthenticationConfigurer} this is
@@ -41,7 +41,7 @@ public abstract class AbstractDaoAuthenticationConfigurer<B extends ProviderMana
 	private final U userDetailsService;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param userDetailsService
 	 */
 	AbstractDaoAuthenticationConfigurer(U userDetailsService) {
@@ -88,7 +88,7 @@ public abstract class AbstractDaoAuthenticationConfigurer<B extends ProviderMana

 	/**
 	 * Gets the {@link UserDetailsService} that is used with the
-	 * {@link DaoAuthenticationProvider}
+	 * {@link DaoAuthenticationProvider}.
 	 * @return the {@link UserDetailsService} that is used with the
 	 * {@link DaoAuthenticationProvider}
 	 */
@@ -21,7 +21,7 @@ import org.springframework.security.config.annotation.authentication.ProviderMan
 import org.springframework.security.core.userdetails.UserDetailsService;

 /**
- * Allows configuring a {@link DaoAuthenticationProvider}
+ * Allows configuring a {@link DaoAuthenticationProvider}.
 *
 * @param <B> The type of {@link ProviderManagerBuilder} this is
 * @param <U> The type of {@link UserDetailsService} that is being used
@@ -32,7 +32,7 @@ public class DaoAuthenticationConfigurer<B extends ProviderManagerBuilder<B>, U
 		extends AbstractDaoAuthenticationConfigurer<B, DaoAuthenticationConfigurer<B, U>, U> {

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param userDetailsService
 	 */
 	public DaoAuthenticationConfigurer(U userDetailsService) {
@@ -34,7 +34,7 @@ public abstract class UserDetailsAwareConfigurer<B extends ProviderManagerBuilde
 		extends SecurityConfigurerAdapter<AuthenticationManager, B> {

 	/**
-	 * Gets the {@link UserDetailsService} or null if it is not available
+	 * Gets the {@link UserDetailsService} or null if it is not available.
 	 * @return the {@link UserDetailsService} or null if it is not available
 	 */
 	public abstract U getUserDetailsService();
@@ -35,7 +35,7 @@ public class UserDetailsServiceConfigurer<B extends ProviderManagerBuilder<B>, C
 		extends AbstractDaoAuthenticationConfigurer<B, C, U> {

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param userDetailsService the {@link UserDetailsService} that should be used
 	 */
 	public UserDetailsServiceConfigurer(U userDetailsService) {
@@ -28,6 +28,8 @@ import org.springframework.core.Ordered;
 import org.springframework.security.authorization.ReactiveAuthorizationManager;

 /**
+ * Enables Spring Security reactive method security.
+ *
 * @author Rob Winch
 * @since 5.0
 */
@@ -32,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportAware;
 import org.springframework.context.annotation.Role;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
@@ -128,11 +127,6 @@ final class PrePostMethodSecurityConfiguration implements ImportAware, Applicati
 		this.expressionHandler.setAuthorizationManagerFactory(authorizationManagerFactory);
 	}

-	@Autowired(required = false)
-	void setPermissionEvaluator(PermissionEvaluator permissionEvaluator) {
-		this.expressionHandler.setPermissionEvaluator(permissionEvaluator);
-	}
-
 	@Autowired(required = false)
 	void setTemplateDefaults(AnnotationTemplateExpressionDefaults templateDefaults) {
 		this.preFilterMethodInterceptor.setTemplateDefaults(templateDefaults);
@@ -39,6 +39,8 @@ import org.springframework.security.access.prepost.PrePostAnnotationSecurityMeta
 import org.springframework.security.config.core.GrantedAuthorityDefaults;

 /**
+ * Configures the infrastructure beans for reactive method security.
+ *
 * @author Rob Winch
 * @author Tadaya Tsuyukubo
 * @since 5.0
@@ -30,6 +30,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

 /**
+ * Selects the imports to register for {@link EnableReactiveMethodSecurity}.
+ *
 * @author Rob Winch
 * @author Evgeniy Cheban
 * @since 5.0
@@ -154,7 +154,7 @@ public class RSocketSecurity {
 	/**
 	 * Adds support for validating a username and password using <a href=
 	 * "https://github.com/rsocket/rsocket/blob/5920ed374d008abb712cb1fd7c9d91778b2f4a68/Extensions/Security/Simple.md">Simple
-	 * Authentication</a>
+	 * Authentication</a>.
 	 * @param simple a customizer
 	 * @return RSocketSecurity for additional configuration
 	 * @since 5.3
@@ -168,7 +168,7 @@ public class RSocketSecurity {
 	}

 	/**
-	 * Adds anonymous authentication
+	 * Adds anonymous authentication.
 	 * @param anonymous a customizer
 	 * @return this instance
 	 * @since 7.0
@@ -265,6 +265,9 @@ public class RSocketSecurity {
 	}

 	/**
+	 * Specifies the {@link ReactiveAuthenticationManager} to use for simple
+	 * authentication.
+	 *
 	 * @since 5.3
 	 */
 	public final class SimpleAuthenticationSpec {
@@ -286,7 +289,7 @@ public class RSocketSecurity {
 			return this.authenticationManager;
 		}

-		protected AuthenticationPayloadInterceptor build() {
+		AuthenticationPayloadInterceptor build() {
 			ReactiveAuthenticationManager manager = getAuthenticationManager();
 			AuthenticationPayloadInterceptor result = new AuthenticationPayloadInterceptor(manager);
 			result.setAuthenticationConverter(new AuthenticationPayloadExchangeConverter());
@@ -304,7 +307,7 @@ public class RSocketSecurity {
 			this.parent = parent;
 		}

-		protected AnonymousPayloadInterceptor build() {
+		AnonymousPayloadInterceptor build() {
 			AnonymousPayloadInterceptor result = new AnonymousPayloadInterceptor("anonymousUser");
 			result.setOrder(PayloadInterceptorOrder.ANONYMOUS.getOrder());
 			return result;
@@ -335,7 +338,7 @@ public class RSocketSecurity {
 			return this.authenticationManager;
 		}

-		protected AuthenticationPayloadInterceptor build() {
+		AuthenticationPayloadInterceptor build() {
 			ReactiveAuthenticationManager manager = getAuthenticationManager();
 			AuthenticationPayloadInterceptor result = new AuthenticationPayloadInterceptor(manager);
 			result.setOrder(PayloadInterceptorOrder.AUTHENTICATION.getOrder());
@@ -368,7 +371,7 @@ public class RSocketSecurity {
 			return RSocketSecurity.this.authenticationManager;
 		}

-		protected List<AuthenticationPayloadInterceptor> build() {
+		List<AuthenticationPayloadInterceptor> build() {
 			ReactiveAuthenticationManager manager = getAuthenticationManager();
 			AuthenticationPayloadInterceptor legacy = new AuthenticationPayloadInterceptor(manager);
 			legacy.setAuthenticationConverter(new BearerPayloadExchangeConverter());
@@ -393,7 +396,7 @@ public class RSocketSecurity {
 		/**
 		 * Matches if
 		 * {@link org.springframework.security.rsocket.api.PayloadExchangeType#isRequest()}
-		 * is true, else not a match
+		 * is true, else not a match.
 		 * @return the Access to set up the authorization rule.
 		 */
 		public Access anyRequest() {
@@ -401,7 +404,7 @@ public class RSocketSecurity {
 		}

 		/**
-		 * Always matches
+		 * Always matches.
 		 * @return the Access to set up the authorization rule.
 		 */
 		public Access anyExchange() {
@@ -30,6 +30,8 @@ import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
 import org.springframework.security.crypto.password.PasswordEncoder;

 /**
+ * {@link Configuration} for RSocket security infrastructure beans.
+ *
 * @author Rob Winch
 * @since 5.2
 */
@@ -26,6 +26,8 @@ import org.springframework.security.rsocket.core.SecuritySocketAcceptorIntercept
 import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher.MatchResult;

 /**
+ * {@link Configuration} that exposes a {@link SecuritySocketAcceptorInterceptor} bean.
+ *
 * @author Rob Winch
 * @since 5.2
 */
@@ -61,7 +61,7 @@ public abstract class AbstractRequestMatcherRegistry<C> {
 	}

 	/**
-	 * Gets the {@link ApplicationContext}
+	 * Gets the {@link ApplicationContext}.
 	 * @return the {@link ApplicationContext}
 	 */
 	protected final ApplicationContext getApplicationContext() {
@@ -111,7 +111,7 @@ public abstract class AbstractRequestMatcherRegistry<C> {

 	/**
 	 * Associates a list of {@link RequestMatcher} instances with the
-	 * {@link AbstractRequestMatcherRegistry}
+	 * {@link AbstractRequestMatcherRegistry}.
 	 * @param requestMatchers the {@link RequestMatcher} instances
 	 * @return the object that is chained after creating the {@link RequestMatcher}
 	 */
@@ -203,6 +203,7 @@ public abstract class AbstractRequestMatcherRegistry<C> {
 	 * If a specific {@link RequestMatcher} must be specified, use
 	 * {@link #requestMatchers(RequestMatcher...)} instead
 	 * </p>
+	 * .
 	 * @param method the {@link HttpMethod} to use or {@code null} for any
 	 * {@link HttpMethod}.
 	 * @return the object that is chained after creating the {@link RequestMatcher}.
@@ -53,6 +53,9 @@ import org.springframework.security.web.session.SessionManagementFilter;
 import org.springframework.web.filter.CorsFilter;

 /**
+ * A builder for a {@link DefaultSecurityFilterChain} that allows configuring and ordering
+ * the standard Spring Security {@link Filter} instances.
+ *
 * @param <H>
 * @author Rob Winch
 */
@@ -89,14 +92,14 @@ public interface HttpSecurityBuilder<H extends HttpSecurityBuilder<H>>
 	<C> C getSharedObject(Class<C> sharedType);

 	/**
-	 * Allows adding an additional {@link AuthenticationProvider} to be used
+	 * Allows adding an additional {@link AuthenticationProvider} to be used.
 	 * @param authenticationProvider the {@link AuthenticationProvider} to be added
 	 * @return the {@link HttpSecurity} for further customizations
 	 */
 	H authenticationProvider(AuthenticationProvider authenticationProvider);

 	/**
-	 * Allows adding an additional {@link UserDetailsService} to be used
+	 * Allows adding an additional {@link UserDetailsService} to be used.
 	 * @param userDetailsService the {@link UserDetailsService} to be added
 	 * @return the {@link HttpSecurity} for further customizations
 	 */
@@ -159,7 +159,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
 	private AuthenticationManager authenticationManager;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param objectPostProcessor the {@link ObjectPostProcessor} that should be used
 	 * @param authenticationBuilder the {@link AuthenticationManagerBuilder} to use for
 	 * additional updates
@@ -2092,7 +2092,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
 	}

 	/**
-	 * Allows mapping HTTP requests that this {@link HttpSecurity} will be used for
+	 * Allows mapping HTTP requests that this {@link HttpSecurity} will be used for.
 	 *
 	 * @author Rob Winch
 	 * @since 3.2
@@ -144,7 +144,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder<Filter,
 	private ServletContext servletContext;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param objectPostProcessor the {@link ObjectPostProcessor} to use
 	 * @see WebSecurityConfiguration
 	 */
@@ -279,7 +279,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder<Filter,
 	}

 	/**
-	 * Executes the Runnable immediately after the build takes place
+	 * Executes the Runnable immediately after the build takes place.
 	 * @param postBuildAction
 	 * @return the {@link WebSecurity} for further customizations
 	 */
@@ -290,7 +290,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder<Filter,

 	/**
 	 * Sets the handler to handle
-	 * {@link org.springframework.security.web.firewall.RequestRejectedException}
+	 * {@link org.springframework.security.web.firewall.RequestRejectedException}.
 	 * @param requestRejectedHandler
 	 * @return the {@link WebSecurity} for further customizations
 	 * @since 5.7
@@ -32,7 +32,7 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
 import org.springframework.util.ClassUtils;

 /**
- * A filter chain validator for filter chains built by {@link WebSecurity}
+ * A filter chain validator for filter chains built by {@link WebSecurity}.
 *
 * @author Josh Cummings
 * @author Max Batischev
@@ -30,7 +30,7 @@ import org.springframework.security.web.SecurityFilterChain;
 /**
 * Add this annotation to an {@code @Configuration} class to have the Spring Security
 * configuration defined in any {@link WebSecurityConfigurer} or more likely by exposing a
- * {@link SecurityFilterChain} bean:
+ * {@link SecurityFilterChain} bean:.
 *
 * <pre class="code">
 * &#064;Configuration
@@ -256,7 +256,7 @@ class HttpSecurityConfiguration {
 		private PasswordEncoder defaultPasswordEncoder;

 		/**
-		 * Creates a new instance
+		 * Creates a new instance.
 		 * @param objectPostProcessor the {@link ObjectPostProcessor} instance to use.
 		 */
 		DefaultPasswordEncoderAuthenticationManagerBuilder(ObjectPostProcessor<Object> objectPostProcessor,
@@ -101,6 +101,8 @@ final class OAuth2ClientConfiguration {
 	}

 	/**
+	 * Configures the infrastructure beans for the {@code OAuth2AuthorizedClientManager}.
+	 *
 	 * @author Joe Grandja
 	 * @since 6.2.0
 	 */
@@ -25,7 +25,7 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;

 /**
- * Used by {@link EnableWebSecurity} to conditionally import:
+ * Used by {@link EnableWebSecurity} to conditionally import:.
 *
 * <ul>
 * <li>{@link OAuth2ClientConfiguration} when the {@code spring-security-oauth2-client}
@@ -200,7 +200,7 @@ class SecurityReactorContextConfiguration {
 	}

 	/**
-	 * A map that computes each value when {@link #get} is invoked
+	 * A map that computes each value when {@link #get} is invoked.
 	 */
 	static class LoadingMap<K, V> implements Map<K, V> {

@@ -118,14 +118,14 @@ class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContex
 	static class CompositeFilterChainProxy extends FilterChainProxy {

 		/**
-		 * Used for {@link #doFilter(ServletRequest, ServletResponse, FilterChain)}
+		 * Used for {@link #doFilter(ServletRequest, ServletResponse, FilterChain)}.
 		 */
 		private final Filter doFilterDelegate;

 		private final FilterChainProxy springSecurityFilterChain;

 		/**
-		 * Creates a new instance
+		 * Creates a new instance.
 		 * @param filters the Filters to delegate to. One of which must be
 		 * FilterChainProxy.
 		 */
@@ -197,7 +197,7 @@ class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContex
 		}

 		/**
-		 * Creates the Filter to delegate to for doFilter
+		 * Creates the Filter to delegate to for doFilter.
 		 * @param filters the Filters to delegate to.
 		 * @return the Filter for doFilter
 		 */
@@ -208,7 +208,7 @@ class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContex
 		}

 		/**
-		 * Find the FilterChainProxy in a List of Filter
+		 * Find the FilterChainProxy in a List of Filter.
 		 * @param filters
 		 * @return non-null FilterChainProxy
 		 * @throws IllegalStateException if the FilterChainProxy cannot be found
@@ -106,7 +106,7 @@ public class WebSecurityConfiguration implements ImportAware {
 	}

 	/**
-	 * Creates the Spring Security Filter Chain
+	 * Creates the Spring Security Filter Chain.
 	 * @return the {@link Filter} that represents the security filter chain
 	 * @throws Exception
 	 */
@@ -133,7 +133,7 @@ public class WebSecurityConfiguration implements ImportAware {

 	/**
 	 * Creates the {@link WebInvocationPrivilegeEvaluator} that is necessary to evaluate
-	 * privileges for a given web URI
+	 * privileges for a given web URI.
 	 * @return the {@link WebInvocationPrivilegeEvaluator}
 	 */
 	@Bean
@@ -290,14 +290,14 @@ public class WebSecurityConfiguration implements ImportAware {
 	static class CompositeFilterChainProxy extends FilterChainProxy {

 		/**
-		 * Used for {@link #doFilter(ServletRequest, ServletResponse, FilterChain)}
+		 * Used for {@link #doFilter(ServletRequest, ServletResponse, FilterChain)}.
 		 */
 		private final Filter doFilterDelegate;

 		private final FilterChainProxy springSecurityFilterChain;

 		/**
-		 * Creates a new instance
+		 * Creates a new instance.
 		 * @param filters the Filters to delegate to. One of which must be
 		 * FilterChainProxy.
 		 */
@@ -369,7 +369,7 @@ public class WebSecurityConfiguration implements ImportAware {
 		}

 		/**
-		 * Creates the Filter to delegate to for doFilter
+		 * Creates the Filter to delegate to for doFilter.
 		 * @param filters the Filters to delegate to.
 		 * @return the Filter for doFilter
 		 */
@@ -380,7 +380,7 @@ public class WebSecurityConfiguration implements ImportAware {
 		}

 		/**
-		 * Find the FilterChainProxy in a List of Filter
+		 * Find the FilterChainProxy in a List of Filter.
 		 * @param filters
 		 * @return non-null FilterChainProxy
 		 * @throws IllegalStateException if the FilterChainProxy cannot be found
@@ -85,14 +85,14 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	private String failureUrl;

 	/**
-	 * Creates a new instance with minimal defaults
+	 * Creates a new instance with minimal defaults.
 	 */
 	protected AbstractAuthenticationFilterConfigurer() {
 		setLoginPage("/login");
 	}

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @param authenticationFilter the {@link AbstractAuthenticationProcessingFilter} to
 	 * use
 	 * @param defaultLoginProcessingUrl the default URL to use for
@@ -152,7 +152,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
-	 * Create the {@link RequestMatcher} given a loginProcessingUrl
+	 * Create the {@link RequestMatcher} given a loginProcessingUrl.
 	 * @param loginProcessingUrl creates the {@link RequestMatcher} based upon the
 	 * loginProcessingUrl
 	 * @return the {@link RequestMatcher} to use based upon the loginProcessingUrl
@@ -184,7 +184,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
-	 * Equivalent of invoking permitAll(true)
+	 * Equivalent of invoking permitAll(true).
 	 * @return the {@link FormLoginConfigurer} for additional customization
 	 */
 	public final T permitAll() {
@@ -324,6 +324,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
+	 * Returns true if a custom login page has been specified.
 	 * @return true if a custom login page has been specified, else false
 	 */
 	public final boolean isCustomLoginPage() {
@@ -331,7 +332,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
-	 * Gets the Authentication Filter
+	 * Gets the Authentication Filter.
 	 * @return the Authentication Filter
 	 */
 	protected final F getAuthenticationFilter() {
@@ -339,7 +340,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
-	 * Sets the Authentication Filter
+	 * Sets the Authentication Filter.
 	 * @param authFilter the Authentication Filter
 	 */
 	protected final void setAuthenticationFilter(F authFilter) {
@@ -347,7 +348,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
-	 * Gets the login page
+	 * Gets the login page.
 	 * @return the login page
 	 */
 	protected final String getLoginPage() {
@@ -355,7 +356,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
-	 * Gets the Authentication Entry Point
+	 * Gets the Authentication Entry Point.
 	 * @return the Authentication Entry Point
 	 */
 	protected final AuthenticationEntryPoint getAuthenticationEntryPoint() {
@@ -372,7 +373,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	}

 	/**
-	 * Gets the URL to send users to if authentication fails
+	 * Gets the URL to send users to if authentication fails.
 	 * @return the URL to send users if authentication fails (e.g. "/login?error").
 	 */
 	protected final String getFailureUrl() {
@@ -105,7 +105,7 @@ public abstract class AbstractConfigAttributeRequestMatcherRegistry<C> extends A

 	/**
 	 * Creates the mapping of {@link RequestMatcher} to {@link Collection} of
-	 * {@link ConfigAttribute} instances
+	 * {@link ConfigAttribute} instances.
 	 * @return the mapping of {@link RequestMatcher} to {@link Collection} of
 	 * {@link ConfigAttribute} instances. Cannot be null.
 	 */
@@ -123,7 +123,7 @@ public abstract class AbstractConfigAttributeRequestMatcherRegistry<C> extends A

 	/**
 	 * A mapping of {@link RequestMatcher} to {@link Collection} of
-	 * {@link ConfigAttribute} instances
+	 * {@link ConfigAttribute} instances.
 	 */
 	static final class UrlMapping {

@@ -58,7 +58,7 @@ public final class AnonymousConfigurer<H extends HttpSecurityBuilder<H>>
 	private String computedKey;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#anonymous(Customizer)
 	 */
 	public AnonymousConfigurer() {
@@ -78,7 +78,7 @@ public final class AnonymousConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
-	 * Sets the principal for {@link Authentication} objects of anonymous users
+	 * Sets the principal for {@link Authentication} objects of anonymous users.
 	 * @param principal used for the {@link Authentication} object of anonymous users
 	 * @return the {@link AnonymousConfigurer} for further customization of anonymous
 	 * authentication
@@ -90,7 +90,7 @@ public final class AnonymousConfigurer<H extends HttpSecurityBuilder<H>>

 	/**
 	 * Sets the {@link org.springframework.security.core.Authentication#getAuthorities()}
-	 * for anonymous users
+	 * for anonymous users.
 	 * @param authorities Sets the
 	 * {@link org.springframework.security.core.Authentication#getAuthorities()} for
 	 * anonymous users
@@ -104,7 +104,7 @@ public final class AnonymousConfigurer<H extends HttpSecurityBuilder<H>>

 	/**
 	 * Sets the {@link org.springframework.security.core.Authentication#getAuthorities()}
-	 * for anonymous users
+	 * for anonymous users.
 	 * @param authorities Sets the
 	 * {@link org.springframework.security.core.Authentication#getAuthorities()} for
 	 * anonymous users (i.e. "ROLE_ANONYMOUS")
@@ -414,7 +414,7 @@ public final class AuthorizeHttpRequestsConfigurer<H extends HttpSecurityBuilder

 		/**
 		 * An object that allows configuring {@link RequestMatcher}s with URI path
-		 * variables
+		 * variables.
 		 *
 		 * @author Taehong Kim
 		 * @since 6.3
@@ -433,7 +433,7 @@ public final class AuthorizeHttpRequestsConfigurer<H extends HttpSecurityBuilder
 			 * <p>
 			 * For example, <pre>
 			 * requestMatchers("/user/{username}").hasVariable("username").equalTo(Authentication::getName));
-			 * </pre>
+			 * </pre>.
 			 * @param function a function to get value from {@link Authentication}.
 			 * @return the {@link AuthorizationManagerRequestMatcherRegistry} for further
 			 * customization.
@@ -92,7 +92,7 @@ public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>>
 	private final ChannelRequestMatcherRegistry REGISTRY;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#requiresChannel(Customizer)
 	 */
 	public ChannelSecurityConfigurer(ApplicationContext context) {
@@ -147,6 +147,9 @@ public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
+	 * Allows registering {@link RequestMatcher}s that should be mapped to a channel
+	 * requirement.
+	 *
 	 * @deprecated no replacement planned
 	 */
 	@Deprecated
@@ -174,7 +177,7 @@ public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>>

 		/**
 		 * Sets the {@link ChannelProcessor} instances to use in
-		 * {@link ChannelDecisionManagerImpl}
+		 * {@link ChannelDecisionManagerImpl}.
 		 * @param channelProcessors
 		 * @return the {@link ChannelSecurityConfigurer} for further customizations
 		 */
@@ -185,7 +188,7 @@ public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>>

 		/**
 		 * Sets the {@link RedirectStrategy} instances to use in
-		 * {@link RetryWithHttpEntryPoint} and {@link RetryWithHttpsEntryPoint}
+		 * {@link RetryWithHttpEntryPoint} and {@link RetryWithHttpsEntryPoint}.
 		 * @param redirectStrategy
 		 * @return the {@link ChannelSecurityConfigurer} for further customizations
 		 */
@@ -197,6 +200,9 @@ public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
+	 * Allows registering a channel requirement for the previously specified
+	 * {@link RequestMatcher}s.
+	 *
 	 * @deprecated no replacement planned
 	 */
 	@Deprecated
@@ -49,7 +49,7 @@ public class CorsConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHt
 	private PreFlightRequestHandler preFlightRequestHandler;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 *
 	 * @see HttpSecurity#cors(Customizer)
 	 */
@@ -148,7 +148,7 @@ public class CorsConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHt

 		/**
 		 * This needs to be isolated into a separate class as Spring MVC is an optional
-		 * dependency and will potentially cause ClassLoading issues
+		 * dependency and will potentially cause ClassLoading issues.
 		 * @param context
 		 * @return
 		 */
@@ -103,7 +103,7 @@ public final class CsrfConfigurer<H extends HttpSecurityBuilder<H>>
 	private final ApplicationContext context;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#csrf(Customizer)
 	 */
 	public CsrfConfigurer(ApplicationContext context) {
@@ -83,7 +83,7 @@ public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>>
 	private DelegatingMissingAuthorityAccessDeniedHandler.@Nullable Builder missingAuthoritiesHandlerBuilder;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#exceptionHandling(Customizer)
 	 */
 	public ExceptionHandlingConfigurer() {
@@ -91,7 +91,7 @@ public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>>

 	/**
 	 * Shortcut to specify the {@link AccessDeniedHandler} to be used is a specific error
-	 * page
+	 * page.
 	 * @param accessDeniedUrl the URL to the access denied page (i.e. /errors/401)
 	 * @return the {@link ExceptionHandlingConfigurer} for further customization
 	 * @see AccessDeniedHandlerImpl
@@ -104,7 +104,7 @@ public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
-	 * Specifies the {@link AccessDeniedHandler} to be used
+	 * Specifies the {@link AccessDeniedHandler} to be used.
 	 * @param accessDeniedHandler the {@link AccessDeniedHandler} to be used
 	 * @return the {@link ExceptionHandlingConfigurer} for further customization
 	 */
@@ -213,7 +213,7 @@ public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
-	 * Gets any explicitly configured {@link AuthenticationEntryPoint}
+	 * Gets any explicitly configured {@link AuthenticationEntryPoint}.
 	 * @return
 	 */
 	AuthenticationEntryPoint getAuthenticationEntryPoint() {
@@ -242,7 +242,7 @@ public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>>

 	/**
 	 * Gets the {@link AccessDeniedHandler} according to the rules specified by
-	 * {@link #accessDeniedHandler(AccessDeniedHandler)}
+	 * {@link #accessDeniedHandler(AccessDeniedHandler)}.
 	 * @param http the {@link HttpSecurity} used to look up shared
 	 * {@link AccessDeniedHandler}
 	 * @return the {@link AccessDeniedHandler} to use
@@ -257,7 +257,7 @@ public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>>

 	/**
 	 * Gets the {@link AuthenticationEntryPoint} according to the rules specified by
-	 * {@link #authenticationEntryPoint(AuthenticationEntryPoint)}
+	 * {@link #authenticationEntryPoint(AuthenticationEntryPoint)}.
 	 * @param http the {@link HttpSecurity} used to look up shared
 	 * {@link AuthenticationEntryPoint}
 	 * @return the {@link AuthenticationEntryPoint} to use
@@ -74,7 +74,7 @@ public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>> extends
 		AbstractAuthenticationFilterConfigurer<H, FormLoginConfigurer<H>, UsernamePasswordAuthenticationFilter> {

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#formLogin(Customizer)
 	 */
 	public FormLoginConfigurer() {
@@ -209,7 +209,7 @@ public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>> extends
 	}

 	/**
-	 * Forward Authentication Failure Handler
+	 * Forward Authentication Failure Handler.
 	 * @param forwardUrl the target URL in case of failure
 	 * @return the {@link FormLoginConfigurer} for additional customization
 	 */
@@ -219,7 +219,7 @@ public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>> extends
 	}

 	/**
-	 * Forward Authentication Success Handler
+	 * Forward Authentication Success Handler.
 	 * @param forwardUrl the target URL in case of success
 	 * @return the {@link FormLoginConfigurer} for additional customization
 	 */
@@ -109,7 +109,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 	private final CrossOriginResourcePolicyConfig crossOriginResourcePolicy = new CrossOriginResourcePolicyConfig();

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 *
 	 * @see HttpSecurity#headers(Customizer)
 	 */
@@ -117,7 +117,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
-	 * Adds a {@link HeaderWriter} instance
+	 * Adds a {@link HeaderWriter} instance.
 	 * @param headerWriter the {@link HeaderWriter} instance to add
 	 * @return the {@link HeadersConfigurer} for additional customizations
 	 */
@@ -130,7 +130,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 	/**
 	 * Configures the {@link XContentTypeOptionsHeaderWriter} which inserts the
 	 * <a href= "https://msdn.microsoft.com/en-us/library/ie/gg622941(v=vs.85).aspx"
-	 * >X-Content-Type-Options</a>:
+	 * >X-Content-Type-Options</a>:.
 	 *
 	 * <pre>
 	 * X-Content-Type-Options: nosniff
@@ -145,7 +145,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
-	 * <strong>Note this is not comprehensive XSS protection!</strong>
+	 * <strong>Note this is not comprehensive XSS protection!</strong>.
 	 *
 	 * <p>
 	 * Allows customizing the {@link XXssProtectionHeaderWriter} which adds the <a href=
@@ -276,7 +276,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
-	 * Creates the {@link HeaderWriter}
+	 * Creates the {@link HeaderWriter}.
 	 * @return the {@link HeaderWriter}
 	 */
 	private HeaderWriterFilter createHeaderWriterFilter() {
@@ -504,7 +504,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Ensures that Content Type Options is enabled
+		 * Ensures that Content Type Options is enabled.
 		 * @return the {@link ContentTypeOptionsConfig} for additional customization
 		 */
 		private ContentTypeOptionsConfig enable() {
@@ -559,7 +559,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Disables X-XSS-Protection header (does not include it)
+		 * Disables X-XSS-Protection header (does not include it).
 		 * @return the {@link HeadersConfigurer} for additional configuration
 		 */
 		public HeadersConfigurer<H> disable() {
@@ -589,7 +589,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Disables Cache Control
+		 * Disables Cache Control.
 		 * @return the {@link HeadersConfigurer} for additional configuration
 		 */
 		public HeadersConfigurer<H> disable() {
@@ -686,7 +686,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Disables Strict Transport Security
+		 * Disables Strict Transport Security.
 		 * @return the {@link HeadersConfigurer} for additional configuration
 		 */
 		public HeadersConfigurer<H> disable() {
@@ -695,7 +695,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Ensures that Strict-Transport-Security is enabled if it is not already
+		 * Ensures that Strict-Transport-Security is enabled if it is not already.
 		 * @return the {@link HstsConfig} for additional customization
 		 */
 		private HstsConfig enable() {
@@ -761,6 +761,8 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 	}

 	/**
+	 * Configures the HTTP Public Key Pinning (HPKP) header.
+	 *
 	 * @deprecated see <a href=
 	 * "https://owasp.org/www-community/controls/Certificate_and_Public_Key_Pinning">Certificate
 	 * and Public Key Pinning</a> for more context
@@ -921,7 +923,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>

 		/**
 		 * Ensures that Public-Key-Pins or Public-Key-Pins-Report-Only is enabled if it is
-		 * not already
+		 * not already.
 		 * @return the {@link HstsConfig} for additional customization
 		 */
 		private HpkpConfig enable() {
@@ -1029,7 +1031,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Sets the policy to be used in the {@code Cross-Origin-Opener-Policy} header
+		 * Sets the policy to be used in the {@code Cross-Origin-Opener-Policy} header.
 		 * @param openerPolicy a {@code Cross-Origin-Opener-Policy}
 		 * @return the {@link CrossOriginOpenerPolicyConfig} for additional configuration
 		 * @throws IllegalArgumentException if openerPolicy is null
@@ -1050,7 +1052,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Sets the policy to be used in the {@code Cross-Origin-Embedder-Policy} header
+		 * Sets the policy to be used in the {@code Cross-Origin-Embedder-Policy} header.
 		 * @param embedderPolicy a {@code Cross-Origin-Embedder-Policy}
 		 * @return the {@link CrossOriginEmbedderPolicyConfig} for additional
 		 * configuration
@@ -1072,7 +1074,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
 		}

 		/**
-		 * Sets the policy to be used in the {@code Cross-Origin-Resource-Policy} header
+		 * Sets the policy to be used in the {@code Cross-Origin-Resource-Policy} header.
 		 * @param resourcePolicy a {@code Cross-Origin-Resource-Policy}
 		 * @return the {@link CrossOriginResourcePolicyConfig} for additional
 		 * configuration
@@ -98,7 +98,7 @@ public final class HttpBasicConfigurer<B extends HttpSecurityBuilder<B>>
 	private SecurityContextRepository securityContextRepository;

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#httpBasic(Customizer)
 	 */
 	public HttpBasicConfigurer() {
@@ -78,7 +78,7 @@ public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends Abstr
 	private Set<String> mappableRoles = new HashSet<>();

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#jee(Customizer)
 	 */
 	public JeeConfigurer() {
@@ -185,7 +185,7 @@ public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends Abstr
 	 * Populates a {@link PreAuthenticatedAuthenticationProvider} into
 	 * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
 	 * and a {@link Http403ForbiddenEntryPoint} into
-	 * {@link HttpSecurityBuilder#setSharedObject(Class, Object)}
+	 * {@link HttpSecurityBuilder#setSharedObject(Class, Object)}.
 	 *
 	 * @see SecurityConfigurer#init(org.springframework.security.config.annotation.SecurityBuilder)
 	 */
@@ -92,7 +92,7 @@ public final class LogoutConfigurer<H extends HttpSecurityBuilder<H>>
 	private LinkedHashMap<RequestMatcher, LogoutSuccessHandler> defaultLogoutSuccessHandlerMappings = new LinkedHashMap<>();

 	/**
-	 * Creates a new instance
+	 * Creates a new instance.
 	 * @see HttpSecurity#logout(Customizer)
 	 */
 	public LogoutConfigurer() {
@@ -24,7 +24,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;

 /**
- * Configures non-null URL's to grant access to every URL
+ * Configures non-null URL's to grant access to every URL.
 *
 * @author Rob Winch
 * @since 3.2
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Josh Cummings	7a37172964	Fix Formatting and Style Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>	2026-09-04 11:53:48 -06:00
Josh Cummings	fe125a4088	Merge branch '7.0.x' into dependabot/gradle/7.1.x/io-spring-javaformat-0.0.48 # Conflicts: # core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java # ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java # ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java # oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2TokenIntrospectionClaimAccessor.java # oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java # oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringOpaqueTokenIntrospector.java # oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringReactiveOpaqueTokenIntrospector.java # oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationEntryPoint.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/DefaultSaml2AuthenticatedPrincipalMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/Saml2AssertionAuthenticationMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/Saml2AuthenticationExceptionMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/Saml2AuthenticationMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/Saml2ErrorMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/Saml2LogoutRequestMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/Saml2PostAuthenticationRequestMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/Saml2RedirectAuthenticationRequestMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/SimpleSaml2ResponseAssertionAccessorMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/DefaultSaml2AuthenticatedPrincipalMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/Saml2AssertionAuthenticationMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationExceptionMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/Saml2ErrorMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/Saml2LogoutRequestMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/Saml2PostAuthenticationRequestMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/Saml2RedirectAuthenticationRequestMixin.java # saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson2/SimpleSaml2ResponseAssertionAccessorMixin.java # web/src/main/java/org/springframework/security/web/jackson/DefaultSavedRequestMixin.java	2026-09-04 10:42:43 -06:00
dependabot[bot]	a37c0ac9ce	Bump io-spring-javaformat from 0.0.47 to 0.0.48 Bumps `io-spring-javaformat` from 0.0.47 to 0.0.48. Updates `io.spring.javaformat:spring-javaformat-checkstyle` from 0.0.47 to 0.0.48 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.47...v0.0.48) Updates `io.spring.javaformat:spring-javaformat-gradle-plugin` from 0.0.47 to 0.0.48 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.47...v0.0.48) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.48 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.48 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-09-04 10:26:18 -06:00
Josh Cummings	a551be65eb	Update Formatting and Style Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>	2026-09-04 09:24:19 -07:00
dependabot[bot]	5449cca3e7	Bump io-spring-javaformat from 0.0.47 to 0.0.48 Bumps `io-spring-javaformat` from 0.0.47 to 0.0.48. Updates `io.spring.javaformat:spring-javaformat-checkstyle` from 0.0.47 to 0.0.48 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.47...v0.0.48) Updates `io.spring.javaformat:spring-javaformat-gradle-plugin` from 0.0.47 to 0.0.48 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.47...v0.0.48) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.48 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.48 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-09-04 09:24:19 -07:00