diff options
Diffstat (limited to 'src/main/kotlin/dev')
| -rw-r--r-- | src/main/kotlin/dev/dnpm/etl/processor/config/JacksonConfig.kt | 7 | ||||
| -rw-r--r-- | src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/JacksonConfig.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/JacksonConfig.kt index 2ba81b5..282f69e 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/JacksonConfig.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/JacksonConfig.kt @@ -6,6 +6,7 @@ import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule @Configuration @@ -22,8 +23,12 @@ class JacksonConfig { @Bean fun objectMapper(): ObjectMapper = ObjectMapper().registerModule(FhirResourceModule()) - .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).registerModule( + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .registerModule( JavaTimeModule() ) + .registerModule( + Jdk8Module() + ) .setSerializationInclusion(JsonInclude.Include.NON_NULL) } diff --git a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt index e9ea489..dd5c44a 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt @@ -21,13 +21,14 @@ package dev.dnpm.etl.processor.monitoring import com.fasterxml.jackson.annotation.JsonAlias import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.core.JsonParseException import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper import dev.dnpm.etl.processor.monitoring.ReportService.Issue import dev.dnpm.etl.processor.monitoring.ReportService.Severity -import java.util.Optional +import java.util.* class ReportService( private val objectMapper: ObjectMapper @@ -55,12 +56,19 @@ class ReportService( @JsonIgnoreProperties(ignoreUnknown = true) - private data class DataQualityReport(val issues: List<Issue>) + private data class DataQualityReport( + @param:JsonProperty(value = "issues") + val issues: List<Issue> + ) @JsonIgnoreProperties(ignoreUnknown = true) data class Issue( + @param:JsonProperty(value = "severity") val severity: Severity, - @JsonAlias("details") val message: String, + @param:JsonProperty(value = "message") + @param:JsonAlias("details") + val message: String, + @param:JsonProperty(value = "path") val path: Optional<String> = Optional.empty() ) |
