| commit | f8b9c00e7faba2a4a50af2899553c0fd96327d31 | [log] [tgz] |
|---|---|---|
| author | Andrew Guibert <andy.guibert@gmail.com> | Mon Jul 06 10:56:00 2020 -0500 |
| committer | Andrew Guibert <andy.guibert@gmail.com> | Mon Jul 06 23:54:42 2020 -0500 |
| tree | 0469ce5de8d98c738eb9b0ca492138bdce1ddf0a | |
| parent | 09989552a436597fe353e0cc5e9d9da6a5a029ad [diff] |
Revert "Normalize ZoneId objects before serializing them" Undo this bug fix for 1.X because the 1.0 TCK requires the opposite behavior currently. This reverts commit edbcff85962ef43ac0293ba7fef154843f46ffb7.
diff --git a/src/main/java/org/eclipse/yasson/internal/serializer/ZoneIdTypeSerializer.java b/src/main/java/org/eclipse/yasson/internal/serializer/ZoneIdTypeSerializer.java index 7443d5a..1d4ba39 100644 --- 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 @@ @Override protected void serialize(ZoneId obj, JsonGenerator generator, Marshaller marshaller) { - generator.write(obj.normalized().getId()); + generator.write(obj.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 index 6cdca20..9a2211a 100644 --- a/src/test/java/org/eclipse/yasson/defaultmapping/dates/DatesTest.java +++ b/src/test/java/org/eclipse/yasson/defaultmapping/dates/DatesTest.java
@@ -416,7 +416,6 @@ @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