Extract duration unit converter to util package. ref FasterXML#189

Author: obarcelonap

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/DurationDeserializer.java

@@ -36,6 +36,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.DecimalUtils;
+import com.fasterxml.jackson.datatype.jsr310.util.DurationUnitConverter;
 
 /**
  * Deserializer for Java 8 temporal {@link Duration}s.
@@ -90,8 +91,8 @@ protected DurationDeserializer withLeniency(Boolean leniency) {
         return new DurationDeserializer(this, leniency);
     }
 
-    protected DurationDeserializer withConverter(DurationUnitConverter pattern) {
-        return new DurationDeserializer(this, pattern);
+    protected DurationDeserializer withConverter(DurationUnitConverter converter) {
+        return new DurationDeserializer(this, converter);
     }
 
     @Override
@@ -113,8 +114,8 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
                 if (p == null) {
                     ctxt.reportBadDefinition(getValueType(ctxt),
                             String.format(
-"Bad 'pattern' definition (\"%s\") for `Duration`: expected one of [%s]",
-pattern, DurationUnitConverter.descForAllowed()));
+                                    "Bad 'pattern' definition (\"%s\") for `Duration`: expected one of [%s]",
+                                    pattern, DurationUnitConverter.descForAllowed()));
                 }
                 deser = deser.withConverter(p);
             }
@@ -185,49 +186,4 @@ protected Duration _fromTimestamp(DeserializationContext ctxt, long ts) {
         }
         return Duration.ofMillis(ts);
     }
-
-    protected static class DurationUnitConverter {
-        private final static Map<String, ChronoUnit> PARSEABLE_UNITS;
-        static {
-            Map<String, ChronoUnit> units = new LinkedHashMap<>();
-            for (ChronoUnit unit : new ChronoUnit[] {
-                ChronoUnit.NANOS,
-                ChronoUnit.MICROS,
-                ChronoUnit.MILLIS,
-                ChronoUnit.SECONDS,
-                ChronoUnit.MINUTES,
-                ChronoUnit.HOURS,
-                ChronoUnit.HALF_DAYS,
-                ChronoUnit.DAYS
-            }) {
-                units.put(unit.name(), unit);
-            }
-            PARSEABLE_UNITS = units;
-        }
-
-        final TemporalUnit unit;
-
-        DurationUnitConverter(TemporalUnit unit) {
-            this.unit = unit;
-        }
-
-        public Duration convert(long value) {
-            return Duration.of(value, unit);
-        }
-
-        /**
-         * @return Description of all allowed valued as a sequence of
-         *    double-quoted values separated by comma
-         */
-        public static String descForAllowed() {
-            return "\"" + PARSEABLE_UNITS.keySet().stream()
-                    .collect(Collectors.joining("\", \""))
-                    +"\"";
-        }
-
-        static DurationUnitConverter from(String unit) {
-            ChronoUnit chr = PARSEABLE_UNITS.get(unit);
-            return (chr == null) ? null : new DurationUnitConverter(chr);
-        }
-    }
 }

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/util/DurationUnitConverter.java

@@ -0,0 +1,76 @@
+package com.fasterxml.jackson.datatype.jsr310.util;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalUnit;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static com.fasterxml.jackson.datatype.jsr310.util.DurationUnitConverter.DurationSerialization.deserializer;
+
+
+public class DurationUnitConverter {
+
+    protected static class DurationSerialization {
+        final Function<Duration, Long> serializer;
+        final Function<Long, Duration> deserializer;
+
+        DurationSerialization(
+                Function<Duration, Long> serializer,
+                Function<Long, Duration> deserializer) {
+            this.serializer = serializer;
+            this.deserializer = deserializer;
+        }
+
+        static Function<Long, Duration> deserializer(TemporalUnit unit) {
+            return v -> Duration.of(v, unit);
+        }
+    }
+
+    private final static Map<String, DurationSerialization> UNITS;
+
+    static {
+        Map<String, DurationSerialization> units = new LinkedHashMap<>();
+        units.put(ChronoUnit.NANOS.name(), new DurationSerialization(Duration::toNanos, deserializer(ChronoUnit.NANOS)));
+        units.put(ChronoUnit.MICROS.name(), new DurationSerialization(d -> d.toNanos() / 1000, deserializer(ChronoUnit.MICROS)));
+        units.put(ChronoUnit.MILLIS.name(), new DurationSerialization(Duration::toMillis, deserializer(ChronoUnit.MILLIS)));
+        units.put(ChronoUnit.SECONDS.name(), new DurationSerialization(Duration::getSeconds, deserializer(ChronoUnit.SECONDS)));
+        units.put(ChronoUnit.MINUTES.name(), new DurationSerialization(Duration::toMinutes, deserializer(ChronoUnit.MINUTES)));
+        units.put(ChronoUnit.HOURS.name(), new DurationSerialization(Duration::toHours, deserializer(ChronoUnit.HOURS)));
+        units.put(ChronoUnit.HALF_DAYS.name(), new DurationSerialization(d -> d.toHours() / 12, deserializer(ChronoUnit.HALF_DAYS)));
+        units.put(ChronoUnit.DAYS.name(), new DurationSerialization(Duration::toDays, deserializer(ChronoUnit.DAYS)));
+        UNITS = units;
+    }
+
+
+    final DurationSerialization serialization;
+
+    DurationUnitConverter(DurationSerialization serialization) {
+        this.serialization = serialization;
+    }
+
+    public Duration convert(long value) {
+        return serialization.deserializer.apply(value);
+    }
+
+    public long convert(Duration duration) {
+        return serialization.serializer.apply(duration);
+    }
+
+    /**
+     * @return Description of all allowed valued as a sequence of
+     * double-quoted values separated by comma
+     */
+    public static String descForAllowed() {
+        return "\"" + UNITS.keySet().stream()
+                .collect(Collectors.joining("\", \""))
+                + "\"";
+    }
+
+    public static DurationUnitConverter from(String unit) {
+        DurationSerialization def = UNITS.get(unit);
+        return (def == null) ? null : new DurationUnitConverter(def);
+    }
+}

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/DurationUnitConverterTest.java renamed to datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/util/DurationUnitConverterTest.java

@@ -1,6 +1,5 @@
-package com.fasterxml.jackson.datatype.jsr310.deser;
+package com.fasterxml.jackson.datatype.jsr310.util;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
@@ -9,7 +8,6 @@
 import org.junit.Test;
 
 import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
-import com.fasterxml.jackson.datatype.jsr310.deser.DurationDeserializer.DurationUnitConverter;
 
 public class DurationUnitConverterTest
     extends ModuleTestBase
@@ -28,7 +26,6 @@ public void shouldMapToTemporalUnit() {
         }) {
             DurationUnitConverter conv = DurationUnitConverter.from(inputUnit.name());
             assertNotNull(conv);
-            assertEquals(inputUnit, conv.unit);
             // is case-sensitive:
             assertNull(DurationUnitConverter.from(inputUnit.name().toLowerCase()));
         }