mocode-software/meldestelle
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore(gateway, ping-service, security): streamline configurations, remove redundancies, and improve resilience

Browse Source 
- Removed `MdcCorrelationFilter` and simplified correlation ID management using Micrometer Tracing.
- Updated `SecurityConfig` in `gateway` with enhanced role-based access and standardized JWT validation.
- Added new `@Profile` annotations in `ping-service` to exclude certain components during testing.
- Refactored and removed legacy `application-keycloak.yaml` and consolidated settings into the primary `application.yaml`.
- Adjusted Gradle scripts to clean up dependency declarations and improve modularity.
- Simplified CORS and Gateway route configurations for better maintainability.
This commit is contained in:
Stefan Mogeritsch
2026-01-16 21:31:56 +01:00
parent 05962487e7
commit 18f7794a90
19 changed files with 282 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/services/ping/ping-service/src/test/kotlin/at/mocode/ping/service/PingControllerIntegrationTest.kt
+24 -11
View File
@@ -2,16 +2,22 @@ package at.mocode.ping.service
import at.mocode.ping.application.PingUseCase
import at.mocode.ping.domain.Ping
import at.mocode.ping.infrastructure.persistence.PingRepositoryAdapter
import at.mocode.ping.infrastructure.web.PingController
import at.mocode.ping.test.TestPingServiceApplication
import io.mockk.every
import io.mockk.mockk
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
import org.springframework.boot.test.context.TestConfiguration
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Import
import org.springframework.context.annotation.Primary
import org.springframework.test.context.ActiveProfiles
import org.springframework.test.context.ContextConfiguration
import org.springframework.test.web.servlet.MockMvc
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
@@ -22,21 +28,29 @@ import java.time.Instant
*/
@WebMvcTest(
controllers = [PingController::class],
excludeAutoConfiguration = [
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration::class,
org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration::class
]
properties = ["spring.aop.proxy-target-class=true"]
)
@Import(PingControllerIntegrationTest.TestConfig::class)
@ContextConfiguration(classes = [TestPingServiceApplication::class])
@ActiveProfiles("test")
@Import(PingControllerIntegrationTest.PingControllerIntegrationTestConfig::class)
class PingControllerIntegrationTest {
@Autowired
private lateinit var mockMvc: MockMvc
@TestConfiguration
class TestConfig {
@Bean
@Autowired
@Qualifier("pingUseCaseIntegrationMock")
private lateinit var pingUseCase: PingUseCase
@Configuration
class PingControllerIntegrationTestConfig {
@Bean("pingUseCaseIntegrationMock")
@Primary
fun pingUseCase(): PingUseCase = mockk(relaxed = true)
@Bean
@Primary
fun pingRepositoryAdapter(): PingRepositoryAdapter = mockk(relaxed = true)
}
@Test
@@ -46,8 +60,7 @@ class PingControllerIntegrationTest {
// For endpoints that require the use-case, the relaxed mock is sufficient,
// but we still provide deterministic ping data.
val useCase = TestConfig().pingUseCase()
every { useCase.executePing(any()) } returns Ping(
every { pingUseCase.executePing(any()) } returns Ping(
message = "Simple Ping",
timestamp = Instant.parse("2023-10-01T10:00:00Z")
)
backend/services/ping/ping-service/src/test/kotlin/at/mocode/ping/service/PingControllerTest.kt
+23 -17
View File
@@ -1,8 +1,10 @@
package at.mocode.ping.service
import at.mocode.ping.domain.Ping
import at.mocode.ping.infrastructure.web.PingController
import at.mocode.ping.application.PingUseCase
import at.mocode.ping.domain.Ping
import at.mocode.ping.infrastructure.persistence.PingRepositoryAdapter
import at.mocode.ping.infrastructure.web.PingController
import at.mocode.ping.test.TestPingServiceApplication
import com.fasterxml.jackson.databind.ObjectMapper
import io.mockk.every
import io.mockk.mockk
@@ -10,12 +12,16 @@ import io.mockk.verify
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
import org.springframework.boot.test.context.TestConfiguration
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Import
import org.springframework.context.annotation.Primary
import org.springframework.test.context.ActiveProfiles
import org.springframework.test.context.ContextConfiguration
import org.springframework.test.web.servlet.MockMvc
import org.springframework.test.web.servlet.MvcResult
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch
@@ -30,12 +36,11 @@ import java.time.Instant
*/
@WebMvcTest(
controllers = [PingController::class],
excludeAutoConfiguration = [
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration::class,
org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration::class
]
properties = ["spring.aop.proxy-target-class=true"]
)
@Import(PingControllerTest.TestConfig::class)
@ContextConfiguration(classes = [TestPingServiceApplication::class])
@ActiveProfiles("test")
@Import(PingControllerTest.PingControllerTestConfig::class)
@AutoConfigureMockMvc
class PingControllerTest {
@@ -43,15 +48,21 @@ class PingControllerTest {
private lateinit var mockMvc: MockMvc
@Autowired
@Qualifier("pingUseCaseMock")
private lateinit var pingUseCase: PingUseCase
@Autowired
private lateinit var objectMapper: ObjectMapper
@TestConfiguration
class TestConfig {
@Bean
@Configuration
class PingControllerTestConfig {
@Bean("pingUseCaseMock")
@Primary
fun pingUseCase(): PingUseCase = mockk(relaxed = true)
@Bean
@Primary
fun pingRepositoryAdapter(): PingRepositoryAdapter = mockk(relaxed = true)
}
@BeforeEach
@@ -77,10 +88,7 @@ class PingControllerTest {
.andExpect(status().isOk)
.andReturn()
// In some environments the JSONPath matcher fails to parse the response body.
// We still validate the serialized output contains the expected fields.
val body = result.response.contentAsString
System.out.println("[DEBUG_LOG] /ping/simple response status=${result.response.status} contentType=${result.response.contentType} body=$body")
val json = objectMapper.readTree(body)
assertThat(json.has("status")).isTrue
assertThat(json["status"].asText()).isEqualTo("pong")
@@ -107,7 +115,6 @@ class PingControllerTest {
.andReturn()
val body = result.response.contentAsString
System.out.println("[DEBUG_LOG] /ping/enhanced response status=${result.response.status} contentType=${result.response.contentType} body=$body")
val json = objectMapper.readTree(body)
assertThat(json.has("status")).isTrue
assertThat(json["status"].asText()).isEqualTo("pong")
@@ -128,7 +135,6 @@ class PingControllerTest {
.andReturn()
val body = result.response.contentAsString
System.out.println("[DEBUG_LOG] /ping/health response status=${result.response.status} contentType=${result.response.contentType} body=$body")
val json = objectMapper.readTree(body)
assertThat(json.has("status")).isTrue
assertThat(json["status"].asText()).isEqualTo("up")
backend/services/ping/ping-service/src/test/kotlin/at/mocode/ping/test/TestPingServiceApplication.kt
+26
View File
@@ -0,0 +1,26 @@
package at.mocode.ping.test
import at.mocode.ping.infrastructure.web.PingController
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.context.annotation.ComponentScan
import org.springframework.context.annotation.EnableAspectJAutoProxy
import org.springframework.context.annotation.Import
/**
* Eine spezielle Application-Klasse für Tests.
* Sie liegt in einem separaten Package, damit sie nicht automatisch von @WebMvcTest gefunden wird,
* sondern explizit importiert werden muss.
*
* WICHTIG: Wir scannen HIER NICHT das 'at.mocode.ping' Package!
* Das verhindert, dass echte Services und Repositories geladen werden.
* Wir scannen nur die Security-Infrastruktur.
*
* Den Controller importieren wir explizit, damit er verfügbar ist.
*/
@SpringBootApplication
@ComponentScan(
basePackages = ["at.mocode.infrastructure.security"]
)
@Import(PingController::class)
@EnableAspectJAutoProxy(proxyTargetClass = true) // Erzwingt CGLIB Proxies für Controller
class TestPingServiceApplication
backend/services/ping/ping-service/src/test/resources/application-test.yaml
+2
View File
@@ -1,6 +1,8 @@
spring:
application:
name: ping-service-test
main:
allow-bean-definition-overriding: true
cloud:
consul:
enabled: false