|
@@ -1,5 +1,5 @@
|
|
|
/*
|
|
|
- * Copyright 2002-2022 the original author or authors.
|
|
|
+ * Copyright 2002-2025 the original author or authors.
|
|
|
*
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
* you may not use this file except in compliance with the License.
|
|
@@ -22,7 +22,6 @@ import java.util.Map;
|
|
|
|
|
|
import jakarta.servlet.Filter;
|
|
|
|
|
|
-import org.springframework.beans.factory.BeanClassLoaderAware;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
|
|
|
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
|
@@ -65,20 +64,16 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
|
|
|
* @see WebSecurity
|
|
|
*/
|
|
|
@Configuration(proxyBeanMethods = false)
|
|
|
-public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAware {
|
|
|
+public class WebSecurityConfiguration implements ImportAware {
|
|
|
|
|
|
private WebSecurity webSecurity;
|
|
|
|
|
|
private Boolean debugEnabled;
|
|
|
|
|
|
- private List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers;
|
|
|
-
|
|
|
private List<SecurityFilterChain> securityFilterChains = Collections.emptyList();
|
|
|
|
|
|
private List<WebSecurityCustomizer> webSecurityCustomizers = Collections.emptyList();
|
|
|
|
|
|
- private ClassLoader beanClassLoader;
|
|
|
-
|
|
|
@Autowired(required = false)
|
|
|
private HttpSecurity httpSecurity;
|
|
|
|
|
@@ -164,7 +159,6 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa
|
|
|
for (SecurityConfigurer<Filter, WebSecurity> webSecurityConfigurer : webSecurityConfigurers) {
|
|
|
this.webSecurity.apply(webSecurityConfigurer);
|
|
|
}
|
|
|
- this.webSecurityConfigurers = webSecurityConfigurers;
|
|
|
}
|
|
|
|
|
|
@Autowired(required = false)
|
|
@@ -193,11 +187,6 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public void setBeanClassLoader(ClassLoader classLoader) {
|
|
|
- this.beanClassLoader = classLoader;
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* A custom version of the Spring provided AnnotationAwareOrderComparator that uses
|
|
|
* {@link AnnotationUtils#findAnnotation(Class, Class)} to look on super class
|