@

services/pcp-route-processing-service/src/test/kotlin/space/nstart/pcp/routepassportconsumer/service/RoutePassportIngestionServiceTest.kt

@@ -21,6 +21,7 @@ import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxEntity
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxStatus
 import space.nstart.pcp.routepassportconsumer.repository.RoutePassportOutboxRepository
 import space.nstart.pcp.routepassportconsumer.repository.RoutePassportRepository
+import com.fasterxml.jackson.databind.ObjectMapper as JpaJsonObjectMapper
 import tools.jackson.databind.ObjectMapper
 import tools.jackson.databind.json.JsonMapper
 import tools.jackson.module.kotlin.KotlinModule
@@ -33,6 +34,7 @@ class RoutePassportIngestionServiceTest {
     private val objectMapper: ObjectMapper = JsonMapper.builder()
         .addModule(KotlinModule.Builder().build())
         .build()
+    private val jpaJsonObjectMapper = JpaJsonObjectMapper().findAndRegisterModules()
 
     private val kafkaTopicsProperties = KafkaTopicsProperties(
         input = "pcp.request.survey-georeference.v1",
@@ -137,7 +139,7 @@ class RoutePassportIngestionServiceTest {
         assertEquals(3, routeEntity.sourcePartition)
         assertEquals(42L, routeEntity.sourceOffset)
         assertEquals("source-key-1", routeEntity.sourceKey)
-        assertEquals(objectMapper.readTree(fixture.rawPayload), routeEntity.rawPayload)
+        assertEquals(jpaJsonObjectMapper.readTree(fixture.rawPayload), routeEntity.rawPayload)
         assertEquals("trace-1", routeEntity.traceId)
         assertEquals("corr-1", routeEntity.correlationId)
     }
@@ -160,14 +162,14 @@ class RoutePassportIngestionServiceTest {
 
         val modeStatusPayload = savedOutbox.first().payload
         assertTrue(modeStatusPayload.isObject)
-        assertEquals(PcpKafkaEvent.ModeStatusChangedEvent.name, modeStatusPayload.path("type").stringValue())
-        assertEquals("trace-1", modeStatusPayload.path("traceId").stringValue())
-        assertEquals("corr-1", modeStatusPayload.path("correlationId").stringValue())
-        assertEquals("route-processing", modeStatusPayload.path("source").stringValue())
-        assertEquals("pcp", modeStatusPayload.path("group").stringValue())
+        assertEquals(PcpKafkaEvent.ModeStatusChangedEvent.name, modeStatusPayload.path("type").asText())
+        assertEquals("trace-1", modeStatusPayload.path("traceId").asText())
+        assertEquals("corr-1", modeStatusPayload.path("correlationId").asText())
+        assertEquals("route-processing", modeStatusPayload.path("source").asText())
+        assertEquals("pcp", modeStatusPayload.path("group").asText())
         assertTrue(modeStatusPayload.path("data").isObject)
-        assertEquals(fixture.routeId.toString(), modeStatusPayload.path("data").path("routeId").stringValue())
-        assertEquals("ROUTE-001", modeStatusPayload.path("data").path("routeNameFull").stringValue())
+        assertEquals(fixture.routeId.toString(), modeStatusPayload.path("data").path("routeId").asText())
+        assertEquals("ROUTE-001", modeStatusPayload.path("data").path("routeNameFull").asText())
     }
 
     private fun service(
@@ -213,7 +215,7 @@ class RoutePassportIngestionServiceTest {
             eventType = PcpKafkaEvent.ModeStatusChangedEvent.name,
             topic = "topic",
             messageKey = "key",
-            payload = objectMapper.readTree("{}"),
+            payload = jpaJsonObjectMapper.readTree("{}"),
             status = RoutePassportOutboxStatus.PENDING,
             attempts = 0,
             maxAttempts = 10,
@@ -285,7 +287,7 @@ class RoutePassportIngestionServiceTest {
             visirAngleMax = BigDecimal.ONE,
             resolutionRange = BigDecimal.TEN,
             resolutionAzimuth = BigDecimal.TEN,
-            polarisation = objectMapper.readTree("""["VH"]"""),
+            polarisation = jpaJsonObjectMapper.readTree("""["VH"]"""),
             processingLevel = "GRD",
             geometryWkt = "POLYGON((0 0, 1 0, 1 1, 0 0))",
             routeStatus = "PROCESSED",

services/pcp-route-processing-service/src/test/kotlin/space/nstart/pcp/routepassportconsumer/service/RoutePassportKafkaPublisherServiceTest.kt

@@ -16,9 +16,7 @@ import org.springframework.kafka.support.SendResult
 import space.nstart.pcp.pcp_types_lib.message.PcpKafkaEvent
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxEntity
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxStatus
-import tools.jackson.databind.ObjectMapper
-import tools.jackson.databind.json.JsonMapper
-import tools.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.databind.ObjectMapper
 import java.nio.charset.StandardCharsets
 import java.time.LocalDateTime
 import java.util.UUID
@@ -31,9 +29,7 @@ import kotlin.test.assertFailsWith
 
 class RoutePassportKafkaPublisherServiceTest {
 
-    private val objectMapper: ObjectMapper = JsonMapper.builder()
-        .addModule(KotlinModule.Builder().build())
-        .build()
+    private val objectMapper = ObjectMapper().findAndRegisterModules()
 
     @Test
     fun `successful publish sends one outbox record with topic key payload and type header`() {
@@ -101,7 +97,7 @@ class RoutePassportKafkaPublisherServiceTest {
         assertTrue(objectMapper.readTree(sentPayload).isObject)
         assertEquals(
             PcpKafkaEvent.ModeStatusChangedEvent.name,
-            objectMapper.readTree(sentPayload).path("type").stringValue(),
+            objectMapper.readTree(sentPayload).path("type").asText(),
         )
     }
 
@@ -109,7 +105,6 @@ class RoutePassportKafkaPublisherServiceTest {
         kafkaTemplate: KafkaTemplate<String, String>,
     ): RoutePassportKafkaPublisherService =
         RoutePassportKafkaPublisherService(
-            objectMapper = objectMapper,
             kafkaTemplate = kafkaTemplate,
         )
 

services/pcp-route-processing-service/src/test/kotlin/space/nstart/pcp/routepassportconsumer/service/RoutePassportOutboxServiceTest.kt

@@ -14,9 +14,7 @@ import space.nstart.pcp.routepassportconsumer.config.RoutePassportOutboxProperti
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxEntity
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxStatus
 import space.nstart.pcp.routepassportconsumer.repository.RoutePassportOutboxRepository
-import tools.jackson.databind.ObjectMapper
-import tools.jackson.databind.json.JsonMapper
-import tools.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.databind.ObjectMapper
 import java.time.Duration
 import java.time.LocalDateTime
 import java.util.Optional
@@ -28,9 +26,7 @@ import kotlin.test.assertTrue
 
 class RoutePassportOutboxServiceTest {
 
-    private val objectMapper: ObjectMapper = JsonMapper.builder()
-        .addModule(KotlinModule.Builder().build())
-        .build()
+    private val objectMapper = ObjectMapper().findAndRegisterModules()
 
     @Test
     fun `claimDueBatch returns empty when outbox is disabled`() {

services/pcp-route-processing-service/src/test/kotlin/space/nstart/pcp/routepassportconsumer/service/RoutePassportOutboxWorkerTest.kt

@@ -10,17 +10,13 @@ import space.nstart.pcp.pcp_types_lib.message.PcpKafkaEvent
 import space.nstart.pcp.routepassportconsumer.config.RoutePassportOutboxProperties
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxEntity
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxStatus
-import tools.jackson.databind.ObjectMapper
-import tools.jackson.databind.json.JsonMapper
-import tools.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.databind.ObjectMapper
 import java.time.LocalDateTime
 import java.util.UUID
 
 class RoutePassportOutboxWorkerTest {
 
-    private val objectMapper: ObjectMapper = JsonMapper.builder()
-        .addModule(KotlinModule.Builder().build())
-        .build()
+    private val objectMapper = ObjectMapper().findAndRegisterModules()
 
     @Test
     fun `when disabled no claim or publish happens`() {