From a188138715c0e06a29f506092a35b8a47cda094a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Sier=C5=BC=C4=99ga?=
Date: Wed, 13 Oct 2021 22:00:42 +0200
Subject: [PATCH] Javadocs author tag doesn't work in methods
---
.../ldap/LdapAuthenticationProviderConfigurer.java | 2 +-
.../annotation/web/configurers/HeadersConfigurer.java | 2 +-
.../security/config/web/server/ServerHttpSecurity.java | 10 ++--------
.../AuthorityReactiveAuthorizationManager.java | 5 +----
.../security/web/header/HeaderWriterFilter.java | 1 -
.../security/web/header/writers/HstsHeaderWriter.java | 3 ---
...StrictTransportSecurityServerHttpHeadersWriter.java | 2 +-
7 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
index ac956837b7..b75b885978 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
@@ -55,6 +55,7 @@ import org.springframework.util.ClassUtils;
* @param the {@link ProviderManagerBuilder} type that this is configuring.
* @author Rob Winch
* @author Eddú Meléndez
+ * @author Tony Dalbrekt
* @since 3.2
*/
public class LdapAuthenticationProviderConfigurer>
@@ -150,7 +151,6 @@ public class LdapAuthenticationProviderConfigurer authoritiesMapper(
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
index 3eec2bf59e..cd177581b9 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
@@ -69,6 +69,7 @@ import org.springframework.util.Assert;
* @author Joe Grandja
* @author Eddú Meléndez
* @author Vedran Pavic
+ * @author Ankur Pathak
* @since 3.2
*/
public class HeadersConfigurer>
@@ -766,7 +767,6 @@ public class HeadersConfigurer>
*
* @param preload true to include preload, else false
* @since 5.2.0
- * @author Ankur Pathak
*/
public HstsConfig preload(boolean preload) {
this.writer.setPreload(preload);
diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
index fe7625995b..9d321cc84f 100644
--- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
@@ -242,6 +242,8 @@ import org.springframework.web.server.WebFilterChain;
* @author Eddú Meléndez
* @author Joe Grandja
* @author Parikshit Dutta
+ * @author Ankur Pathak
+ * @author Alexey Nesterov
* @since 5.0
*/
public class ServerHttpSecurity {
@@ -333,7 +335,6 @@ public class ServerHttpSecurity {
* @param order the place before which to insert the {@link WebFilter}
* @return the {@link ServerHttpSecurity} to continue configuring
* @since 5.2.0
- * @author Ankur Pathak
*/
public ServerHttpSecurity addFilterBefore(WebFilter webFilter, SecurityWebFiltersOrder order) {
this.webFilters.add(new OrderedWebFilter(webFilter, order.getOrder() - 1));
@@ -346,7 +347,6 @@ public class ServerHttpSecurity {
* @param order the place after which to insert the {@link WebFilter}
* @return the {@link ServerHttpSecurity} to continue configuring
* @since 5.2.0
- * @author Ankur Pathak
*/
public ServerHttpSecurity addFilterAfter(WebFilter webFilter, SecurityWebFiltersOrder order) {
this.webFilters.add(new OrderedWebFilter(webFilter, order.getOrder() + 1));
@@ -593,7 +593,6 @@ public class ServerHttpSecurity {
*
* @return the {@link AnonymousSpec} to customize
* @since 5.2.0
- * @author Ankur Pathak
*/
public AnonymousSpec anonymous() {
if (this.anonymous == null) {
@@ -817,7 +816,6 @@ public class ServerHttpSecurity {
* will be used. If authenticationManager is not specified,
* {@link ReactivePreAuthenticatedAuthenticationManager} will be used.
* @return the {@link X509Spec} to customize
- * @author Alexey Nesterov
* @since 5.2
*/
public X509Spec x509() {
@@ -2026,7 +2024,6 @@ public class ServerHttpSecurity {
* use
* @return {@link HttpBasicSpec} for additional customization
* @since 5.2.0
- * @author Ankur Pathak
*/
public HttpBasicSpec authenticationEntryPoint(ServerAuthenticationEntryPoint authenticationEntryPoint) {
Assert.notNull(authenticationEntryPoint, "authenticationEntryPoint cannot be null");
@@ -2456,7 +2453,6 @@ public class ServerHttpSecurity {
* custom headers writer
* @return the {@link HeaderSpec} to customize
* @since 5.3.0
- * @author Ankur Pathak
*/
public HeaderSpec writer(ServerHttpHeadersWriter serverHttpHeadersWriter) {
Assert.notNull(serverHttpHeadersWriter, "serverHttpHeadersWriter cannot be null");
@@ -2711,7 +2707,6 @@ public class ServerHttpSecurity {
* @param preload if subdomains should be included
* @return the {@link HstsSpec} to continue configuring
* @since 5.2.0
- * @author Ankur Pathak
*/
public HstsSpec preload(boolean preload) {
HeaderSpec.this.hsts.setPreload(preload);
@@ -4119,7 +4114,6 @@ public class ServerHttpSecurity {
/**
* Configures anonymous authentication
*
- * @author Ankur Pathak
* @since 5.2.0
*/
public final class AnonymousSpec {
diff --git a/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java
index a3de6cba76..5c98cf3061 100644
--- a/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java
+++ b/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java
@@ -31,6 +31,7 @@ import org.springframework.util.Assert;
*
* @param the type of object being authorized
* @author Rob Winch
+ * @author Robbie Martinus
* @since 5.0
*/
public class AuthorityReactiveAuthorizationManager implements ReactiveAuthorizationManager {
@@ -67,8 +68,6 @@ public class AuthorityReactiveAuthorizationManager implements ReactiveAuthori
/**
* Creates an instance of {@link AuthorityReactiveAuthorizationManager} with the
* provided authorities.
- *
- * @author Robbie Martinus
* @param authorities the authorities to check for
* @param the type of object being authorized
* @return the new instance
@@ -96,8 +95,6 @@ public class AuthorityReactiveAuthorizationManager implements ReactiveAuthori
/**
* Creates an instance of {@link AuthorityReactiveAuthorizationManager} with the
* provided authorities.
- *
- * @author Robbie Martinus
* @param roles the authorities to check for prefixed with "ROLE_"
* @param the type of object being authorized
* @return the new instance
diff --git a/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java b/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java
index 38529ecc86..2608431b3b 100644
--- a/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java
+++ b/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java
@@ -104,7 +104,6 @@ public class HeaderWriterFilter extends OncePerRequestFilter {
* Allow writing headers at the beginning of the request.
* @param shouldWriteHeadersEagerly boolean to allow writing headers at the beginning
* of the request.
- * @author Ankur Pathak
* @since 5.2
*/
public void setShouldWriteHeadersEagerly(boolean shouldWriteHeadersEagerly) {
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
index 127ea3527d..c4ee432a51 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
@@ -82,7 +82,6 @@ public final class HstsHeaderWriter implements HeaderWriter {
* @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
* @param preload maps to {@link #setPreload(boolean)}
* @since 5.2.0
- * @author Ankur Pathak
*/
public HstsHeaderWriter(RequestMatcher requestMatcher, long maxAgeInSeconds, boolean includeSubDomains,
boolean preload) {
@@ -109,7 +108,6 @@ public final class HstsHeaderWriter implements HeaderWriter {
* @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
* @param preload maps to {@link #setPreload(boolean)}
* @since 5.2.0
- * @author Ankur Pathak
*/
public HstsHeaderWriter(long maxAgeInSeconds, boolean includeSubDomains, boolean preload) {
this(new SecureRequestMatcher(), maxAgeInSeconds, includeSubDomains, preload);
@@ -222,7 +220,6 @@ public final class HstsHeaderWriter implements HeaderWriter {
*
* @param preload true to include preload, else false
* @since 5.2.0
- * @author Ankur Pathak
*/
public void setPreload(boolean preload) {
this.preload = preload;
diff --git a/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java
index f9452233e7..b51ae661ba 100644
--- a/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java
+++ b/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java
@@ -27,6 +27,7 @@ import org.springframework.web.server.ServerWebExchange;
* Writes the Strict-Transport-Security if the request is secure.
*
* @author Rob Winch
+ * @author Ankur Pathak
* @since 5.0
*/
public final class StrictTransportSecurityServerHttpHeadersWriter implements ServerHttpHeadersWriter {
@@ -73,7 +74,6 @@ public final class StrictTransportSecurityServerHttpHeadersWriter implements Ser
*
* @param preload if preload should be included
* @since 5.2.0
- * @author Ankur Pathak
*/
public void setPreload(boolean preload) {
this.preload = preload ? " ; preload" : "";