Skip to content

Commit 68c142e

Browse files
committed
fix: resolve merge conflict
2 parents 290376a + dfa3eba commit 68c142e

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

DuDoong-Api/src/main/kotlin/band/gosrock/api/config/ServletFilterConfig.kt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package band.gosrock.api.config
22

3-
import org.springframework.beans.factory.annotation.Qualifier
43
import org.springframework.boot.web.servlet.FilterRegistrationBean
54
import org.springframework.context.annotation.Bean
65
import org.springframework.context.annotation.Configuration
76
import org.springframework.context.annotation.Profile
8-
import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer
97
import org.springframework.web.filter.ForwardedHeaderFilter
108
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
119
import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter
12-
import jakarta.servlet.Filter
1310

1411
@Configuration
1512
@Profile("prod", "staging", "dev")
@@ -18,17 +15,6 @@ class ServletFilterConfig(
1815
private val forwardedHeaderFilter: ForwardedHeaderFilter,
1916
) : WebMvcConfigurer {
2017

21-
@Bean
22-
fun securityFilterRegistration(
23-
@Qualifier(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
24-
securityFilter: Filter,
25-
): FilterRegistrationBean<Filter> {
26-
val registration = FilterRegistrationBean(securityFilter)
27-
registration.order = Int.MAX_VALUE - 3
28-
registration.setName(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
29-
return registration
30-
}
31-
3218
@Bean
3319
fun setResourceUrlEncodingFilter(): FilterRegistrationBean<ResourceUrlEncodingFilter> {
3420
val registrationBean = FilterRegistrationBean<ResourceUrlEncodingFilter>()

0 commit comments

Comments
 (0)