Merge pull request #94 from statisticsnorway/serialization-bugfix

more serialization changes to sid types
statisticsnorway · Feb 29, 2024 · c410af7 · c410af7
2 parents e3d2421 + f76f11b
commit c410af7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/no/ssb/dlp/pseudo/service/sid/MultiSidLookupResponse.java b/src/main/java/no/ssb/dlp/pseudo/service/sid/MultiSidLookupResponse.java
@@ -1,5 +1,6 @@
 package no.ssb.dlp.pseudo.service.sid;
 
+import io.micronaut.core.annotation.Introspected;
 import io.micronaut.serde.annotation.Serdeable;
 import lombok.Builder;
 import lombok.extern.jackson.Jacksonized;
@@ -8,5 +9,6 @@
 
 @Builder
 @Jacksonized
+@Introspected
 @Serdeable
 public record MultiSidLookupResponse (List<String> missing, String datasetExtractionSnapshotTime) {}
diff --git a/src/main/java/no/ssb/dlp/pseudo/service/sid/MultiSidResponse.java b/src/main/java/no/ssb/dlp/pseudo/service/sid/MultiSidResponse.java
@@ -25,6 +25,7 @@ public class MultiSidResponse {
     @Builder
     @Jacksonized
     @Introspected
+    @Serdeable
     public record Mapping (List<String> fnrList, List<String> snr, List<String> fnr) { }
 
     public Map<String, SidInfo> toMap() {

diff --git a/src/main/java/no/ssb/dlp/pseudo/service/sid/SidInfo.java b/src/main/java/no/ssb/dlp/pseudo/service/sid/SidInfo.java
@@ -1,10 +1,12 @@
 package no.ssb.dlp.pseudo.service.sid;
 
+import io.micronaut.core.annotation.Introspected;
 import io.micronaut.serde.annotation.Serdeable;
 import lombok.Builder;
 import lombok.extern.jackson.Jacksonized;
 
 @Builder
 @Jacksonized
+@Introspected
 @Serdeable
 public record SidInfo (String fnr, String snr, String datasetExtractionSnapshotTime) {}
diff --git a/src/main/java/no/ssb/dlp/pseudo/service/sid/SidMapper.java b/src/main/java/no/ssb/dlp/pseudo/service/sid/SidMapper.java
@@ -132,9 +132,9 @@ public void setConfig(Map<String, Object> config) {
                         parse(config.get(MapFuncConfig.Param.SNAPSHOT_DATE).toString()));
             } catch (DateTimeParseException e) {
                 throw new InvalidSidSnapshotDateException(String.format("Invalid snapshot date format. Valid dates are: %s",
-                        String.join(", ", availableSnapshots.getItems())));
+                        String.join(", ", availableSnapshots.items())));
             }
-            List<LocalDate> availableSnapshotDates = availableSnapshots.getItems().stream()
+            List<LocalDate> availableSnapshotDates = availableSnapshots.items().stream()
                     .map(snapshot -> {
                         try {
                             return LocalDate.from(formatter.parse(snapshot));
@@ -144,7 +144,7 @@ public void setConfig(Map<String, Object> config) {
                     }).toList();
             if(availableSnapshotDates.stream().allMatch(requestedSnapshotDate::isBefore)){
                 throw new InvalidSidSnapshotDateException(String.format("Requested date is of an earlier date than all available SID dates. Valid dates are: %s",
-                        String.join(", ", availableSnapshots.getItems())));
+                        String.join(", ", availableSnapshots.items())));
             }
         }
         this.config = config;

diff --git a/src/main/java/no/ssb/dlp/pseudo/service/sid/SnapshotInfo.java b/src/main/java/no/ssb/dlp/pseudo/service/sid/SnapshotInfo.java
@@ -1,14 +1,15 @@
 package no.ssb.dlp.pseudo.service.sid;
 
+import io.micronaut.core.annotation.Introspected;
+import io.micronaut.serde.annotation.Serdeable;
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.jackson.Jacksonized;
 
 import java.util.List;
 
-@Data
 @Builder
 @Jacksonized
-public class SnapshotInfo {
-    private final List<String> items;
-}
+@Introspected
+@Serdeable
+public record SnapshotInfo(List<String> items) {}