fix: make filters a configuration so they are auto-injected by Spring

TelenorNorway · May 27, 2024 · 04ad7bb · 04ad7bb
1 parent 9e1a0e9
commit 04ad7bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/main/kotlin/no/telenor/kt/boot3/configurable/mdc/MdcAppenderFilter.kt b/src/main/kotlin/no/telenor/kt/boot3/configurable/mdc/MdcAppenderFilter.kt
@@ -4,14 +4,20 @@ import jakarta.servlet.FilterChain
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
 import no.telenor.kt.MDCTransaction
+import org.springframework.context.annotation.Configuration
 import org.springframework.core.Ordered
 import org.springframework.core.annotation.Order
 import org.springframework.stereotype.Component
 import org.springframework.web.filter.OncePerRequestFilter
 
-@Component
-@Order(Ordered.LOWEST_PRECEDENCE)
-class MdcAppenderFilter(private val keyRegistry: KeyRegistry) : OncePerRequestFilter() {
+@Configuration
+@Order(Ordered.HIGHEST_PRECEDENCE)
+class MdcAppenderFilter(
+	private val keyRegistry: KeyRegistry,
+	// ensure that this filter is loaded after the request context
+	// filter
+	@Suppress("UNUSED_PARAMETER") `_`: MdcRequestContextFilter,
+) : OncePerRequestFilter() {
 	override fun doFilterInternal(
 		request: HttpServletRequest,
 		response: HttpServletResponse,

diff --git a/src/main/kotlin/no/telenor/kt/boot3/configurable/mdc/MdcRequestContextFilter.kt b/src/main/kotlin/no/telenor/kt/boot3/configurable/mdc/MdcRequestContextFilter.kt
@@ -4,12 +4,13 @@ import jakarta.servlet.FilterChain
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
 import org.springframework.beans.factory.BeanFactory
+import org.springframework.context.annotation.Configuration
 import org.springframework.core.Ordered
 import org.springframework.core.annotation.Order
 import org.springframework.stereotype.Component
 import org.springframework.web.filter.OncePerRequestFilter
 
-@Component
+@Configuration
 @Order(Ordered.HIGHEST_PRECEDENCE)
 class MdcRequestContextFilter(private val beanFactory: BeanFactory) : OncePerRequestFilter() {
 	override fun doFilterInternal(