Merge pull request #100 from kpartlow/master

Added capability to reverse test, added URI, URL
jdereg · Feb 15, 2024 · c267b1a · c267b1a
2 parents 13c5f58 + 03d182a
commit c267b1a
Show file tree

Hide file tree

Showing 6 changed files with 377 additions and 128 deletions.
diff --git a/src/main/java/com/cedarsoftware/util/convert/Converter.java b/src/main/java/com/cedarsoftware/util/convert/Converter.java
@@ -28,6 +28,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.UUID;
@@ -39,6 +40,7 @@
 
 import com.cedarsoftware.util.ClassUtilities;
 
+
 /**
  * Instance conversion utility.  Convert from primitive to other primitives, plus support for Number, Date,
  * TimeStamp, SQL Date, LocalDate, LocalDateTime, ZonedDateTime, Calendar, Big*, Atomic*, Class, UUID,
@@ -685,7 +687,36 @@ private static void buildFactoryConversions() {
         CONVERSION_DB.put(pair(Locale.class, String.class), LocaleConversions::toString);
         CONVERSION_DB.put(pair(URL.class, String.class), StringConversions::toString);
         CONVERSION_DB.put(pair(URI.class, String.class), StringConversions::toString);
-
+        CONVERSION_DB.put(pair(TimeZone.class, String.class), TimeZoneConversions::toString);
+
+        try {
+            Class zoneInfoClass = Class.forName("sun.util.calendar.ZoneInfo");
+            CONVERSION_DB.put(pair(zoneInfoClass, String.class), TimeZoneConversions::toString);
+            CONVERSION_DB.put(pair(Void.class, zoneInfoClass), VoidConversions::toNull);
+            CONVERSION_DB.put(pair(String.class, zoneInfoClass), StringConversions::toTimeZone);
+            CONVERSION_DB.put(pair(Map.class, zoneInfoClass), MapConversions::toTimeZone);
+
+
+
+        } catch (Exception e) {
+            // ignore
+        }
+
+        // URL conversions
+        CONVERSION_DB.put(pair(Void.class, URL.class), VoidConversions::toNull);
+        CONVERSION_DB.put(pair(String.class, URL.class), StringConversions::toURL);
+        CONVERSION_DB.put(pair(Map.class, URL.class), MapConversions::toURL);
+
+        // URI Conversions
+        CONVERSION_DB.put(pair(Void.class, URI.class), VoidConversions::toNull);
+        CONVERSION_DB.put(pair(String.class, URI.class), StringConversions::toURI);
+        CONVERSION_DB.put(pair(Map.class, URI.class), MapConversions::toURI);
+
+        // TimeZone Conversions
+        CONVERSION_DB.put(pair(Void.class, TimeZone.class), VoidConversions::toNull);
+        CONVERSION_DB.put(pair(String.class, TimeZone.class), StringConversions::toTimeZone);
+        CONVERSION_DB.put(pair(Map.class, TimeZone.class), MapConversions::toTimeZone);
+
         // Duration conversions supported
         CONVERSION_DB.put(pair(Void.class, Duration.class), VoidConversions::toNull);
         CONVERSION_DB.put(pair(Duration.class, Duration.class), Converter::identity);

diff --git a/src/main/java/com/cedarsoftware/util/convert/MapConversions.java b/src/main/java/com/cedarsoftware/util/convert/MapConversions.java
@@ -2,6 +2,9 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
@@ -84,6 +87,13 @@ final class MapConversions {
     private static final String ID = "id";
     public static final String LANGUAGE = "language";
     public static final String VARIANT = "variant";
+    public static final String JAR = "jar";
+    public static final String AUTHORITY = "authority";
+    public static final String REF = "ref";
+    public static final String PORT = "port";
+    public static final String FILE = "file";
+    public static final String HOST = "host";
+    public static final String PROTOCOL = "protocol";
     private static String COUNTRY = "country";
 
     private MapConversions() {}
@@ -183,6 +193,18 @@ static Timestamp toTimestamp(Object from, Converter converter) {
         return fromValueForMultiKey(map, converter, Timestamp.class, TIMESTAMP_PARAMS);
     }
 
+    private static final String[] TIMEZONE_PARAMS = new String[] { ZONE };
+    static TimeZone toTimeZone(Object from, Converter converter) {
+        Map<?, ?> map = (Map<?, ?>) from;
+        ConverterOptions options = converter.getOptions();
+
+        if (map.containsKey(ZONE)) {
+            return converter.convert(map.get(ZONE), TimeZone.class);
+        } else {
+            return fromValueForMultiKey(map, converter, TimeZone.class, TIMEZONE_PARAMS);
+        }
+    }
+
     private static final String[] CALENDAR_PARAMS = new String[] { TIME, ZONE };
     static Calendar toCalendar(Object from, Converter converter) {
         Map<?, ?> map = (Map<?, ?>) from;
@@ -436,6 +458,54 @@ static Year toYear(Object from, Converter converter) {
         return fromSingleKey(from, converter, YEAR, Year.class);
     }
 
+    static URL toURL(Object from, Converter converter) {
+        Map<String, Object> map = (Map<String, Object>)from;
+        StringBuilder builder = new StringBuilder(20);
+
+        try {
+            if (map.containsKey(VALUE) || map.containsKey(V)) {
+                return fromValue(map, converter, URL.class);
+            }
+
+            String protocol = (String) map.get(PROTOCOL);
+            String host = (String) map.get(HOST);
+            String file = (String) map.get(FILE);
+            String authority = (String) map.get(AUTHORITY);
+            String ref = (String) map.get(REF);
+            Long port = (Long) map.get(PORT);
+
+            builder.append(protocol);
+            builder.append(':');
+            if (!protocol.equalsIgnoreCase(JAR)) {
+                builder.append("//");
+            }
+            if (authority != null && !authority.isEmpty()) {
+                builder.append(authority);
+            } else {
+                if (host != null && !host.isEmpty()) {
+                    builder.append(host);
+                }
+                if (!port.equals(-1L)) {
+                    builder.append(":" + port);
+                }
+            }
+            if (file != null && !file.isEmpty()) {
+                builder.append(file);
+            }
+            if (ref != null && !ref.isEmpty()) {
+                builder.append("#" + ref);
+            }
+            return URI.create(builder.toString()).toURL();
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException("Cannot convert Map to URL.  Malformed URL:  '" + builder + "'");
+        }
+    }
+
+    static URI toURI(Object from, Converter converter) {
+        Map<?, ?> map = asMap(from);
+        return fromValue(map, converter, URI.class);
+    }
+
     static Map<String, ?> initMap(Object from, Converter converter) {
         Map<String, Object> map = new CompactLinkedMap<>();
         map.put(V, from);

diff --git a/src/main/java/com/cedarsoftware/util/convert/StringConversions.java b/src/main/java/com/cedarsoftware/util/convert/StringConversions.java
@@ -3,6 +3,9 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.sql.Timestamp;
@@ -27,6 +30,7 @@
 import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.Optional;
+import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -241,6 +245,27 @@ static BigDecimal toBigDecimal(Object from, Converter converter) {
         }
     }
 
+    static URL toURL(Object from, Converter converter) {
+        String str = StringUtilities.trimToNull(asString(from));
+        if (str == null) {
+            return null;
+        }
+        try {
+            URI uri = URI.create((String) from);
+            return uri.toURL();
+        } catch (MalformedURLException mue) {
+            throw new IllegalArgumentException("Cannot convert String '" + str);
+        }
+    }
+
+    static URI toURI(Object from, Converter converter) {
+        String str = StringUtilities.trimToNull(asString(from));
+        if (str == null) {
+            return null;
+        }
+        return URI.create((String) from);
+    }
+
     static String enumToString(Object from, Converter converter) {
         return ((Enum<?>) from).name();
     }
@@ -327,6 +352,15 @@ static Timestamp toTimestamp(Object from, Converter converter) {
         return instant == null ? null : new Timestamp(instant.toEpochMilli());
     }
 
+    static TimeZone toTimeZone(Object from, Converter converter) {
+        String str = StringUtilities.trimToNull((String)from);
+        if (str == null) {
+            return null;
+        }
+
+        return TimeZone.getTimeZone(str);
+    }
+
     static Calendar toCalendar(Object from, Converter converter) {
         return parseDate(from, converter).map(GregorianCalendar::from).orElse(null);
     }

diff --git a/src/main/java/com/cedarsoftware/util/convert/TimeZoneConversions.java b/src/main/java/com/cedarsoftware/util/convert/TimeZoneConversions.java
@@ -0,0 +1,11 @@
+package com.cedarsoftware.util.convert;
+
+import java.util.TimeZone;
+
+public class TimeZoneConversions {
+    static String toString(Object from, Converter converter) {
+        TimeZone timezone = (TimeZone)from;
+        return timezone.getID();
+    }
+
+}