Normalize ZoneId objects before serializing them

Signed-off-by: Gyúróczki Gergő <gergonoorbi@gmail.com>
eclipse-ee4j · Jun 15, 2020 · cbda513 · cbda513
1 parent b46af5e
commit cbda513
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/org/eclipse/yasson/internal/serializer/ZoneIdTypeSerializer.java b/src/main/java/org/eclipse/yasson/internal/serializer/ZoneIdTypeSerializer.java
@@ -35,6 +35,6 @@ public ZoneIdTypeSerializer(Customization customization) {
 
     @Override
     protected void serialize(ZoneId obj, JsonGenerator generator, Marshaller marshaller) {
-        generator.write(obj.getId());
+        generator.write(obj.normalized().getId());
     }
 }
diff --git a/src/test/java/org/eclipse/yasson/defaultmapping/dates/DatesTest.java b/src/test/java/org/eclipse/yasson/defaultmapping/dates/DatesTest.java
@@ -483,6 +483,7 @@ public void testZonedDateTime() {
     @Test
     public void testMarshalZoneId() {
         assertEquals("{\"value\":\"Europe/Prague\"}", bindingJsonb.toJson(new ScalarValueWrapper<>(ZoneId.of("Europe/Prague"))));
+        assertEquals("\"Z\"", bindingJsonb.toJson(ZoneId.of("UTC")));  // Issue #387
     }
 
     @Test