Fix immutability for ZoneOffset and ZoneRegion.

paul-hammant · Feb 13, 2017 · 994e569 · 994e569
1 parent 6030856
commit 994e569
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/xstream/src/java/com/thoughtworks/xstream/XStream.java b/xstream/src/java/com/thoughtworks/xstream/XStream.java
@@ -994,7 +994,9 @@ protected void setupImmutableTypes() {
             addImmutableTypeDynamically("java.time.Year", false);
             addImmutableTypeDynamically("java.time.YearMonth", false);
             addImmutableTypeDynamically("java.time.ZonedDateTime", false);
-            addImmutableTypeDynamically("java.time.ZonedId", false);
+            addImmutableTypeDynamically("java.time.ZoneId", false);
+            addImmutableTypeDynamically("java.time.ZoneOffset", false);
+            addImmutableTypeDynamically("java.time.ZoneRegion", false);
         }
     }
 

diff --git a/xstream/src/test/com/thoughtworks/acceptance/Time18TypesTest.java b/xstream/src/test/com/thoughtworks/acceptance/Time18TypesTest.java
@@ -49,6 +49,16 @@ public void testZoneOffestWithOldFormat() {
             + "</java.time.ZoneOffset>"));
     }
 
+    public void testZoneOffestIsImmutable() {
+        final ZoneOffset[] array = new ZoneOffset[2];
+        array[0] = array[1] = ZoneOffset.of("Z");
+        assertBothWays(array, "" //
+            + "<zone-id-array>\n" //
+            + "  <zone-id>Z</zone-id>\n" //
+            + "  <zone-id>Z</zone-id>\n" //
+            + "</zone-id-array>");
+    }
+
     public void testZoneRegion() {
         assertBothWays(ZoneId.of("America/Caracas"), "<zone-id>America/Caracas</zone-id>");
         assertBothWays(ZoneId.of("Europe/Berlin"), "<zone-id>Europe/Berlin</zone-id>");
@@ -62,6 +72,16 @@ public void testZoneRegionWithOldFormat() {
             + "</java.time.ZoneRegion>"));
     }
 
+    public void testZoneRegionIsImmutable() {
+        final ZoneId[] array = new ZoneId[2];
+        array[0] = array[1] = ZoneId.of("Europe/Rome");
+        assertBothWays(array, "" //
+            + "<zone-id-array>\n" //
+            + "  <zone-id>Europe/Rome</zone-id>\n" //
+            + "  <zone-id>Europe/Rome</zone-id>\n" //
+            + "</zone-id-array>");
+    }
+
     public void testDuration() {
         assertBothWays(Duration.ofDays(1000), "<duration>PT24000H</duration>");
         assertBothWays(Duration.ofHours(50), "<duration>PT50H</duration>");