From 8142e4046f119c898de93a1c475de9c21db14fa6 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 24 Jul 2020 11:48:08 -0700 Subject: [PATCH] Use compact annotation style Always use compact annotations when possible. For example, replace `@Target(value = ElementType.TYPE)` with `@Target(ElementType.TYPE)`. Issue gh-8945 --- .../EnableGlobalAuthentication.java | 6 ++++-- .../EnableGlobalMethodSecurity.java | 6 ++++-- .../EnableReactiveMethodSecurity.java | 16 +++++++++------- .../web/configuration/EnableWebSecurity.java | 6 ++++-- .../reactive/WebFluxSecurityConfiguration.java | 2 +- .../configuration/EnableWebMvcSecurity.java | 6 ++++-- etc/checkstyle/checkstyle-suppressions.xml | 1 - 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java index 78f8b11757..4980e6459d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java @@ -16,7 +16,9 @@ package org.springframework.security.config.annotation.authentication.configuration; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.Configuration; @@ -81,8 +83,8 @@ import org.springframework.security.config.annotation.web.servlet.configuration. * @author Rob Winch * */ -@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@Target(value = { java.lang.annotation.ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) @Documented @Import(AuthenticationConfiguration.class) @Configuration diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java index 61d4f33609..cbc6734f28 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java @@ -16,7 +16,9 @@ package org.springframework.security.config.annotation.method.configuration; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.AdviceMode; @@ -41,8 +43,8 @@ import org.springframework.security.config.annotation.authentication.configurati * @author Rob Winch * @since 3.2 */ -@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@Target(value = { java.lang.annotation.ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) @Documented @Import({ GlobalMethodSecuritySelector.class }) @EnableGlobalAuthentication diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurity.java index 11fcf66e80..8e129695c4 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurity.java @@ -16,24 +16,26 @@ package org.springframework.security.config.annotation.method.configuration; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + import org.springframework.context.annotation.AdviceMode; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.Ordered; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - /** * * @author Rob Winch * @since 5.0 */ -@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@Target(value = { java.lang.annotation.ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) @Documented -@Import({ ReactiveMethodSecuritySelector.class }) +@Import(ReactiveMethodSecuritySelector.class) @Configuration public @interface EnableReactiveMethodSecurity { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java index 217ae581a3..679273093a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java @@ -16,7 +16,9 @@ package org.springframework.security.config.annotation.web.configuration; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.Configuration; @@ -69,8 +71,8 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer; * @author Rob Winch * @since 3.2 */ -@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@Target(value = { java.lang.annotation.ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) @Documented @Import({ WebSecurityConfiguration.class, SpringWebMvcImportSelector.class, OAuth2ImportSelector.class, HttpSecurityConfiguration.class }) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java index 559c38d578..39e160f19b 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java @@ -64,7 +64,7 @@ class WebFluxSecurityConfiguration { } @Bean(SPRING_SECURITY_WEBFILTERCHAINFILTER_BEAN_NAME) - @Order(value = WEB_FILTER_CHAIN_FILTER_ORDER) + @Order(WEB_FILTER_CHAIN_FILTER_ORDER) public WebFilterChainProxy springSecurityWebFilterChainFilter() { return new WebFilterChainProxy(getSecurityWebFilterChains()); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java index 3c0d11f58c..a6db2a84d8 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java @@ -16,7 +16,9 @@ package org.springframework.security.config.annotation.web.servlet.configuration; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.Configuration; @@ -31,8 +33,8 @@ import org.springframework.security.config.annotation.authentication.configurati * @author Rob Winch * @since 3.2 */ -@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@Target(value = { java.lang.annotation.ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) @Documented @Import(WebMvcSecurityConfiguration.class) @EnableGlobalAuthentication diff --git a/etc/checkstyle/checkstyle-suppressions.xml b/etc/checkstyle/checkstyle-suppressions.xml index ab8baf9d38..372ce7c509 100644 --- a/etc/checkstyle/checkstyle-suppressions.xml +++ b/etc/checkstyle/checkstyle-suppressions.xml @@ -3,7 +3,6 @@ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> -