@

services/pcp-route-processing-service/src/main/kotlin/space/nstart/pcp/routepassportconsumer/entity/RoutePassportEntity.kt

@@ -5,9 +5,9 @@ import jakarta.persistence.Entity
 import jakarta.persistence.Id
 import jakarta.persistence.Table
 import jakarta.persistence.Version
+import com.fasterxml.jackson.databind.JsonNode
 import org.hibernate.annotations.JdbcTypeCode
 import org.hibernate.type.SqlTypes
-import tools.jackson.databind.JsonNode
 import java.math.BigDecimal
 import java.time.LocalDateTime
 import java.util.UUID

services/pcp-route-processing-service/src/main/kotlin/space/nstart/pcp/routepassportconsumer/entity/RoutePassportOutboxEntity.kt

@@ -6,9 +6,9 @@ import jakarta.persistence.EnumType
 import jakarta.persistence.Enumerated
 import jakarta.persistence.Id
 import jakarta.persistence.Table
+import com.fasterxml.jackson.databind.JsonNode
 import org.hibernate.annotations.JdbcTypeCode
 import org.hibernate.type.SqlTypes
-import tools.jackson.databind.JsonNode
 import java.time.LocalDateTime
 import java.util.UUID
 

services/pcp-route-processing-service/src/main/kotlin/space/nstart/pcp/routepassportconsumer/service/RoutePassportIngestionService.kt

@@ -13,7 +13,8 @@ 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 tools.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper as JpaJsonObjectMapper
 import tools.jackson.databind.ObjectMapper
 import java.time.LocalDateTime
 import java.util.UUID
@@ -29,6 +30,7 @@ class RoutePassportIngestionService(
     private val kafkaTopicsProperties: KafkaTopicsProperties,
 ) {
     private val log = LoggerFactory.getLogger(this::class.java)
+    private val jpaJsonObjectMapper = JpaJsonObjectMapper().findAndRegisterModules()
 
     @Transactional
     fun ingest(
@@ -164,9 +166,12 @@ class RoutePassportIngestionService(
             source = "route-processing"
         }
 
-        return objectMapper.valueToTree(message)
+        return toJpaJsonNode(message)
     }
 
+    private fun toJpaJsonNode(value: Any): JsonNode =
+        jpaJsonObjectMapper.readTree(objectMapper.writeValueAsString(value))
+
     private fun RoutePassportEntity.applyRoutePassport(
         routePassportDto: RoutePassportDto,
         parsedMessage: ParsedRoutePassportMessage,
@@ -188,7 +193,7 @@ class RoutePassportIngestionService(
         visirAngleMax = routePassportDto.visirAngle.max
         resolutionRange = routePassportDto.resolutionRange
         resolutionAzimuth = routePassportDto.resolutionAzimuth
-        polarisation = objectMapper.valueToTree(routePassportDto.polarisation)
+        polarisation = toJpaJsonNode(routePassportDto.polarisation)
         processingLevel = routePassportDto.processingLevel
         geometryWkt = routePassportDto.geometry
         routeStatus = routePassportDto.routeStatus.name
@@ -198,7 +203,7 @@ class RoutePassportIngestionService(
         sourcePartition = sourceRecord.partition
         sourceOffset = sourceRecord.offset
         sourceKey = sourceRecord.key
-        this.rawPayload = objectMapper.readTree(rawPayload)
+        this.rawPayload = jpaJsonObjectMapper.readTree(rawPayload)
         this.updatedAt = updatedAt
 
         return this
@@ -226,7 +231,7 @@ class RoutePassportIngestionService(
             visirAngleMax = visirAngle.max,
             resolutionRange = resolutionRange,
             resolutionAzimuth = resolutionAzimuth,
-            polarisation = objectMapper.valueToTree(polarisation),
+            polarisation = toJpaJsonNode(polarisation),
             processingLevel = processingLevel,
             geometryWkt = geometry,
             routeStatus = routeStatus.name,
@@ -236,7 +241,7 @@ class RoutePassportIngestionService(
             sourcePartition = sourceRecord.partition,
             sourceOffset = sourceRecord.offset,
             sourceKey = sourceRecord.key,
-            rawPayload = objectMapper.readTree(rawPayload),
+            rawPayload = jpaJsonObjectMapper.readTree(rawPayload),
             createdAt = now,
             updatedAt = now,
         )

services/pcp-route-processing-service/src/main/kotlin/space/nstart/pcp/routepassportconsumer/service/RoutePassportKafkaPublisherService.kt

@@ -5,7 +5,6 @@ import org.slf4j.LoggerFactory
 import org.springframework.kafka.core.KafkaTemplate
 import org.springframework.stereotype.Service
 import space.nstart.pcp.routepassportconsumer.entity.RoutePassportOutboxEntity
-import tools.jackson.databind.ObjectMapper
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
@@ -16,9 +15,6 @@ import kotlin.time.Duration.Companion.nanoseconds
  */
 @Service
 class RoutePassportKafkaPublisherService(
-    /** ObjectMapper сериализует сохранённый JsonNode payload в JSON object string перед отправкой. */
-    private val objectMapper: ObjectMapper,
-
     /** KafkaTemplate отправляет готовую outbox-запись в её целевой topic. */
     private val kafkaTemplate: KafkaTemplate<String, String>,
 ) {
@@ -28,7 +24,7 @@ class RoutePassportKafkaPublisherService(
      * Публикует ровно одну outbox-запись и пробрасывает ошибку отправки вызывающему коду.
      */
     fun publish(outbox: RoutePassportOutboxEntity) {
-        val payload = objectMapper.writeValueAsString(outbox.payload)
+        val payload = outbox.payload.toString()
         val record = ProducerRecord(outbox.topic, outbox.messageKey, payload)
         record.headers().add(TYPE_HEADER, outbox.eventType.toByteArray(StandardCharsets.UTF_8))
         val startedAt = System.nanoTime()

services/pcp-route-processing-service/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
     import: "configserver:"
   cloud:
     config:
-      uri: ${CONFIG_SERVER_URI:http://192.168.100.160:38888}
+      uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888}
       fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
       profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
       label: ${SPRING_CLOUD_CONFIG_LABEL:master}