fiks implementasjonsbug i konvertering av gyldige xml-datetimes uten …

…offset + ikke endre tidssone for innsendte data. + lag ZonedDateTimes som er XML datetime-identiske i unmarshall, dropp java-sone-greier i eksmepler for å få testene til å funke igjen
digipost · Mar 25, 2020 · 4b20f27 · 4b20f27
1 parent b8c762a
commit 4b20f27
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 18 deletions.
diff --git a/src/main/java/no/digipost/api/datatypes/marshalling/DataTypesJsonMapper.java b/src/main/java/no/digipost/api/datatypes/marshalling/DataTypesJsonMapper.java
@@ -16,7 +16,7 @@ private static ObjectMapper initMapper() {
         ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JavaTimeModule());
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-        mapper.setTimeZone(TimeZone.getDefault());
+        mapper.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         mapper.setPropertyNamingStrategy(PropertyNamingStrategy.LOWER_CAMEL_CASE);
         return mapper;

diff --git a/src/main/java/no/digipost/api/datatypes/marshalling/ZonedDateTimeXmlAdapter.java b/src/main/java/no/digipost/api/datatypes/marshalling/ZonedDateTimeXmlAdapter.java
@@ -2,9 +2,12 @@
 
 import javax.xml.bind.DatatypeConverter;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
-import java.time.ZoneId;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
 import java.util.GregorianCalendar;
 
 public class ZonedDateTimeXmlAdapter extends XmlAdapter<String, ZonedDateTime> {
@@ -21,7 +24,12 @@ public ZonedDateTime unmarshal(final String s) {
         if (s == null) {
             return null;
         }
-        return ZonedDateTime.from(DateTimeFormatter.ISO_DATE_TIME.parse(s)).withZoneSameInstant(ZoneId.systemDefault());
+        final TemporalAccessor parsed = DateTimeFormatter.ISO_DATE_TIME.parse(s);
+        if (parsed.isSupported(ChronoField.OFFSET_SECONDS)) {
+            return ZonedDateTime.from(parsed);
+        } else {
+            return LocalDateTime.from(parsed).atZone(ZoneOffset.UTC);
+        }
     }
 
 }
diff --git a/src/main/java/no/digipost/api/datatypes/types/Appointment.java b/src/main/java/no/digipost/api/datatypes/types/Appointment.java
@@ -72,8 +72,8 @@ public Appointment withDefaultsForMissingOptionalValues() {
     }
 
     public static Appointment EXAMPLE = new Appointment(
-            ZonedDateTime.of(2017, 6, 27, 10, 0, 0, 0, ZoneId.systemDefault())
-            , ZonedDateTime.of(2017, 6, 27, 11, 0, 0, 0, ZoneId.systemDefault())
+            ZonedDateTime.of(2017, 6, 27, 10, 0, 0, 0, ZoneId.of("+02:00"))
+            , ZonedDateTime.of(2017, 6, 27, 11, 0, 0, 0, ZoneId.of("+02:00"))
             , "Oppmøte senest 15 minutter før timen"
             , "Oslo City Røntgen"
             , Address.EXAMPLE

diff --git a/src/main/java/no/digipost/api/datatypes/types/Boligdetaljer.java b/src/main/java/no/digipost/api/datatypes/types/Boligdetaljer.java
@@ -94,7 +94,7 @@ public Boligdetaljer(Residence residence, List<Hjemmelshaver> hjemmelshavere, In
             Residence.EXAMPLE
             , Collections.singletonList(new Hjemmelshaver("Gunnar Gunnersen", "[email protected]"))
             , 59, 3, 4
-            , Collections.singletonList(new Omsetningshistorikk(ZonedDateTime.of(2017, 7, 27, 10, 0, 0, 0, ZoneId.systemDefault())
+            , Collections.singletonList(new Omsetningshistorikk(ZonedDateTime.of(2017, 7, 27, 10, 0, 0, 0, ZoneId.of("+02:00"))
             , "Privat salg av sekundærbolig"
             , "Bill Isalg"
             , "Cooper Coopersen"

diff --git a/src/main/java/no/digipost/api/datatypes/types/ExternalLink.java b/src/main/java/no/digipost/api/datatypes/types/ExternalLink.java
@@ -57,7 +57,7 @@ public ExternalLink(final URI url) {
     String buttonText;
 
     public static ExternalLink EXAMPLE = new ExternalLink(URI.create("https://www.oslo.kommune.no/barnehage/svar-pa-tilbud-om-plass/"),
-            ZonedDateTime.of(2017, 9, 30, 13, 37, 0, 0, ZoneId.systemDefault()),
+            ZonedDateTime.of(2017, 9, 30, 13, 37, 0, 0, ZoneId.of("+02:00")),
             "Oslo Kommune ber deg akseptere eller avslå tilbudet om barnehageplass.", "Svar på barnehageplass");
 
     public static ExternalLink EXAMPLE_NO_DEADLINE = new ExternalLink(URI.create("https://www.example.com"),

diff --git a/src/main/java/no/digipost/api/datatypes/types/Inkasso.java b/src/main/java/no/digipost/api/datatypes/types/Inkasso.java
@@ -42,7 +42,7 @@ public class Inkasso implements DataType {
 
     public static Inkasso EXAMPLE = new Inkasso(
             ExternalLink.EXAMPLE_NO_DEADLINE
-            , ZonedDateTime.of(2019, 12, 10, 0, 0, 0, 0, ZoneId.systemDefault())
+            , ZonedDateTime.of(2019, 12, 10, 0, 0, 0, 0, ZoneId.of("+01:00"))
             , BigDecimal.valueOf(42), "01235424320", "1435025439583420243982723"
     );
 

diff --git a/src/main/java/no/digipost/api/datatypes/types/SignedDocument.java b/src/main/java/no/digipost/api/datatypes/types/SignedDocument.java
@@ -39,7 +39,7 @@ public class SignedDocument implements DataType {
     public static SignedDocument EXAMPLE = new SignedDocument(
             "Bedrift AS",
             "Ansettelseskontrakt",
-            ZonedDateTime.of(2018, 7, 11, 10, 0, 0, 0, ZoneId.systemDefault())
+            ZonedDateTime.of(2018, 7, 11, 10, 0, 0, 0, ZoneId.of("+02:00"))
     );
 }
 

diff --git a/src/main/java/no/digipost/api/datatypes/types/TimeInterval.java b/src/main/java/no/digipost/api/datatypes/types/TimeInterval.java
@@ -30,7 +30,7 @@ public class TimeInterval {
     ZonedDateTime endTime;
 
     public static TimeInterval EXAMPLE = new TimeInterval(
-            ZonedDateTime.of(2019, 5, 23, 10, 0, 0, 0, ZoneId.systemDefault())
-            , ZonedDateTime.of(2019, 5, 23, 16, 0, 0, 0, ZoneId.systemDefault())
+            ZonedDateTime.of(2019, 5, 23, 10, 0, 0, 0, ZoneId.of("+02:00"))
+            , ZonedDateTime.of(2019, 5, 23, 16, 0, 0, 0, ZoneId.of("+02:00"))
     );
 }
diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java b/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java
@@ -111,8 +111,8 @@ public PickupNotice withDefaultsForMissingOptionalValues() {
             , "70300492517312675"
             , Barcode.EXAMPLE.withBarcodeType("CODE_128")
             , "Klimanøytral Servicepakke"
-            , ZonedDateTime.of(2018, 9, 10, 10, 0, 0, 0, ZoneId.systemDefault())
-            , ZonedDateTime.of(2018, 9, 24, 10, 0, 0, 0, ZoneId.systemDefault())
+            , ZonedDateTime.of(2018, 9, 10, 10, 0, 0, 0, ZoneId.of("+02:00"))
+            , ZonedDateTime.of(2018, 9, 24, 10, 0, 0, 0, ZoneId.of("+02:00"))
             , Recipient.EXAMPLE
             , Sender.EXAMPLE
             , PickupPlace.EXAMPLE

diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNoticeStatus.java b/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNoticeStatus.java
@@ -37,6 +37,6 @@ public class PickupNoticeStatus implements DataType {
 
     public static PickupNoticeStatus EXAMPLE = new PickupNoticeStatus(
             Status.READY_FOR_PICKUP
-            , ZonedDateTime.of(2019, 1, 10, 10, 10, 0, 0, ZoneId.systemDefault())
+            , ZonedDateTime.of(2019, 1, 10, 10, 10, 0, 0, ZoneId.of("+01:00"))
     );
 }
diff --git a/src/main/java/no/digipost/api/datatypes/types/proof/Proof.java b/src/main/java/no/digipost/api/datatypes/types/proof/Proof.java
@@ -88,7 +88,7 @@ public class Proof implements DataType {
             new Proof(
                     "Bekkestua Bibliotek",
                     "#e1e1e1",
-                    ZonedDateTime.of(2019, 5, 23, 10, 0, 0, 0, ZoneId.systemDefault()),
+                    ZonedDateTime.of(2019, 5, 23, 10, 0, 0, 0, ZoneId.of("+02:00")),
                     ValidPeriod.EXAMPLE,
                     ProofHolder.EXAMPLE,
                     "Lånekort",

diff --git a/src/main/java/no/digipost/api/datatypes/types/receipt/Receipt.java b/src/main/java/no/digipost/api/datatypes/types/receipt/Receipt.java
@@ -135,7 +135,7 @@ public class Receipt implements DataType {
     public static Receipt EXAMPLE = new Receipt(
             "F96B6805-2453-478A-B58B-CCDFA07E21ED"
             , "364567"
-            , ZonedDateTime.of(2018, 5, 27, 10, 0, 0, 0, ZoneId.systemDefault())
+            , ZonedDateTime.of(2018, 5, 27, 10, 0, 0, 0, ZoneId.of("+02:00"))
             , ReceiptLine.EXAMPLE.getTotalPrice()
             , ReceiptLine.EXAMPLE.getTotalVat()
             , "NOK"

diff --git a/src/main/java/no/digipost/api/datatypes/types/receipt/TaxiDetails.java b/src/main/java/no/digipost/api/datatypes/types/receipt/TaxiDetails.java
@@ -53,8 +53,8 @@ public class TaxiDetails {
 
     public static final TaxiDetails EXAMPLE = new TaxiDetails(
             "EK99999", "12341ASDF", "123456789",
-            ZonedDateTime.of(2018, 6, 5, 10, 0, 0, 0, ZoneId.systemDefault()),
-            ZonedDateTime.of(2018, 6, 5, 10, 30, 0, 0, ZoneId.systemDefault()),
+            ZonedDateTime.of(2018, 6, 5, 10, 0, 0, 0, ZoneId.of("+02:00")),
+            ZonedDateTime.of(2018, 6, 5, 10, 30, 0, 0, ZoneId.of("+02:00")),
             new BigDecimal("8.00"), new BigDecimal("438.50"), 2000, 8500,
             6500, 320, 1220, 900,
             VatDetails.EXAMPLE);