[1.2.0-SNAPSHOT]

GsonConfiguration#forceResolverStrict and GsonConfiguration#forceIsoChronology properties support and tests added
GoodforGod · Jan 18, 2022 · 207e44b · 207e44b
1 parent e1363ea
commit 207e44b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/io/goodforgod/gson/configuration/GsonConfiguration.java b/src/main/java/io/goodforgod/gson/configuration/GsonConfiguration.java
@@ -153,6 +153,9 @@ private static GsonConfiguration ofProperties(GsonConfiguration configuration, P
         final String formatMonthDay = properties.getProperty(GsonProperties.FORMAT_MONTH_DAY);
         final String formatDate = properties.getProperty(GsonProperties.FORMAT_DATE);
 
+        final String forceIsoChronologyProp = properties.getProperty(GsonProperties.FORCE_ISO_CHRONOLOGY);
+        final String forceResolverStrictProp = properties.getProperty(GsonProperties.FORCE_RESOLVER_STRICT);
+
         final String fieldNamingPolicy = properties.getProperty(GsonProperties.POLICY_FIELD_NAMING);
         final String longSerializationPolicy = properties.getProperty(GsonProperties.POLICY_LONG_SERIALIZATION);
 
@@ -188,6 +191,11 @@ private static GsonConfiguration ofProperties(GsonConfiguration configuration, P
         if (formatDate != null)
             configuration.setDateFormat(formatDate);
 
+        if (forceIsoChronologyProp != null)
+            configuration.setForceIsoChronology(Boolean.parseBoolean(forceIsoChronologyProp));
+        if (forceResolverStrictProp != null)
+            configuration.setForceResolverStrict(Boolean.parseBoolean(forceResolverStrictProp));
+
         if (fieldNamingPolicy != null)
             configuration.setFieldNamingPolicy(FieldNamingPolicy.valueOf(fieldNamingPolicy));
         if (longSerializationPolicy != null)

diff --git a/src/main/java/io/goodforgod/gson/configuration/GsonProperties.java b/src/main/java/io/goodforgod/gson/configuration/GsonProperties.java
@@ -22,6 +22,9 @@ private GsonProperties() {}
     public static final String FORMAT_MONTH_DAY = PREFIX + "format.monthDay";
     public static final String FORMAT_DATE = PREFIX + "format.date";
 
+    public static final String FORCE_ISO_CHRONOLOGY = PREFIX + "forceIsoChronology";
+    public static final String FORCE_RESOLVER_STRICT = PREFIX + "forceResolverStrict";
+
     public static final String LENIENT = PREFIX + "lenient";
     public static final String SERIALIZE_NULLS = PREFIX + "serializeNulls";
     public static final String PRETTY_PRINTING = PREFIX + "prettyPrinting";

diff --git a/src/test/java/io/goodforgod/gson/configuration/GsonConfigurationFromPropertiesTests.java b/src/test/java/io/goodforgod/gson/configuration/GsonConfigurationFromPropertiesTests.java
@@ -31,6 +31,9 @@ void configurationPropertiesApplied() throws Exception {
             assertNotNull(configuration.getOffsetTimeFormat());
             assertNotNull(configuration.getOffsetDateTimeFormat());
 
+            assertTrue(configuration.isForceIsoChronology());
+            assertTrue(configuration.isForceResolverStrict());
+
             assertTrue(configuration.isLenient());
             assertTrue(configuration.isComplexMapKeySerialization());
             assertTrue(configuration.isPrettyPrinting());

diff --git a/src/test/resources/gson.properties b/src/test/resources/gson.properties
@@ -10,6 +10,9 @@ gson.format.yearMonth=uuuu-MM
 gson.format.monthDay=MM-dd
 gson.format.date=uuuu-MM-dd'T'HH:mm:ss.SSSXXX
 
+gson.forceIsoChronology=true
+gson.forceResolverStrict=true
+
 gson.lenient=true
 gson.serializeNulls=true
 gson.prettyPrinting=true