Fix Add @Configuration to @Enable*Security Usage

Issue gh-6613
This commit is contained in:
Rob Winch
2022-08-09 07:37:59 -05:00
parent 040111ae9e
commit a5069d7e35
16 changed files with 57 additions and 8 deletions

View File

@@ -39,9 +39,9 @@ import org.springframework.util.Assert;
* @author Rob Winch
*
*/
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
@Configuration
public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired

View File

@@ -531,8 +531,8 @@ public class GlobalMethodSecurityConfigurationTests {
}
@EnableGlobalMethodSecurity(prePostEnabled = true)
@Configuration
@EnableGlobalMethodSecurity(prePostEnabled = true)
public static class RoleHierarchyConfig {
@Bean
@@ -607,8 +607,8 @@ public class GlobalMethodSecurityConfigurationTests {
}
@EnableGlobalMethodSecurity(prePostEnabled = true)
@Configuration
@EnableGlobalMethodSecurity(prePostEnabled = true)
public static class CustomMetadataSourceBeanProxyEnabledConfig extends GlobalMethodSecurityConfiguration {
}

View File

@@ -316,8 +316,8 @@ public class NamespaceGlobalMethodSecurityTests {
}
@EnableGlobalMethodSecurity(jsr250Enabled = true)
@Configuration
@EnableGlobalMethodSecurity(jsr250Enabled = true)
public static class Jsr250Config {
}

View File

@@ -127,6 +127,7 @@ public class AnonymousConfigurerTests {
}
@Configuration
@EnableWebSecurity
static class AnonymousDisabledInLambdaConfig extends WebSecurityConfigurerAdapter {

View File

@@ -131,6 +131,7 @@ public class NamespaceHttpFormLoginTests {
}
@Configuration
@EnableWebSecurity
static class FormLoginCustomConfig extends WebSecurityConfigurerAdapter {

View File

@@ -26,6 +26,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.security.config.annotation.ObjectPostProcessor;
import org.springframework.security.config.annotation.SecurityContextChangedListenerConfig;
@@ -151,6 +152,7 @@ public class X509ConfigurerTests {
}
}
@Configuration
@EnableWebSecurity
static class ObjectPostProcessorConfig extends WebSecurityConfigurerAdapter {
@@ -180,6 +182,7 @@ public class X509ConfigurerTests {
}
@Configuration
@EnableWebSecurity
static class DuplicateDoesNotOverrideConfig extends WebSecurityConfigurerAdapter {
@@ -205,6 +208,7 @@ public class X509ConfigurerTests {
}
@Configuration
@EnableWebSecurity
static class DefaultsInLambdaConfig extends WebSecurityConfigurerAdapter {
@@ -227,6 +231,7 @@ public class X509ConfigurerTests {
}
@Configuration
@EnableWebSecurity
static class SubjectPrincipalRegexInLambdaConfig extends WebSecurityConfigurerAdapter {
@@ -252,6 +257,7 @@ public class X509ConfigurerTests {
}
@Configuration
@EnableWebSecurity
static class UserDetailsServiceBeanConfig {
@@ -279,6 +285,7 @@ public class X509ConfigurerTests {
}
@Configuration
@EnableWebSecurity
static class UserDetailsServiceAndBeanConfig {