Value API: replace hardcoded string -> type conversion with ValueConverter

jknack · jknack · commit b0f5678e1c5a · 2019-09-08T16:30:49.000-03:00
diff --git a/jooby/src/main/java/io/jooby/converter/BigDecimalConverter.java b/jooby/src/main/java/io/jooby/converter/BigDecimalConverter.java
@@ -0,0 +1,13 @@
+package io.jooby.converter;
+
+import java.math.BigDecimal;
+
+public class BigDecimalConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == BigDecimal.class;
+  }
+
+  @Override public BigDecimal convert(Class type, String value) {
+    return new BigDecimal(value);
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/BigIntegerConverter.java b/jooby/src/main/java/io/jooby/converter/BigIntegerConverter.java
@@ -0,0 +1,13 @@
+package io.jooby.converter;
+
+import java.math.BigInteger;
+
+public class BigIntegerConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == BigInteger.class;
+  }
+
+  @Override public BigInteger convert(Class type, String value) {
+    return new BigInteger(value);
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/CharsetConverter.java b/jooby/src/main/java/io/jooby/converter/CharsetConverter.java
@@ -0,0 +1,29 @@
+package io.jooby.converter;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+public class CharsetConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == Charset.class;
+  }
+
+  @Override public Charset convert(Class type, String value) {
+    switch (value.toLowerCase()) {
+      case "utf-8":
+        return StandardCharsets.UTF_8;
+      case "us-ascii":
+        return StandardCharsets.US_ASCII;
+      case "iso-8859-1":
+        return StandardCharsets.ISO_8859_1;
+      case "utf-16":
+        return StandardCharsets.UTF_16;
+      case "utf-16be":
+        return StandardCharsets.UTF_16BE;
+      case "utf-16le":
+        return StandardCharsets.UTF_16LE;
+      default:
+        return Charset.forName(value);
+    }
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/DateConverter.java b/jooby/src/main/java/io/jooby/converter/DateConverter.java
@@ -0,0 +1,23 @@
+package io.jooby.converter;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+public class DateConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == Date.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    try {
+      // must be millis
+      return new Date(Long.parseLong(value));
+    } catch (NumberFormatException x) {
+      // must be YYYY-MM-dd
+      LocalDate date = LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE);
+      return Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/DurationConverter.java b/jooby/src/main/java/io/jooby/converter/DurationConverter.java
@@ -0,0 +1,29 @@
+package io.jooby.converter;
+
+import com.typesafe.config.ConfigException;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+import java.time.Duration;
+import java.time.format.DateTimeParseException;
+import java.util.concurrent.TimeUnit;
+
+public class DurationConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == Duration.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    try {
+      return Duration.parse(value);
+    } catch (DateTimeParseException x) {
+      try {
+        long duration = ConfigFactory.empty().withValue("d", ConfigValueFactory.fromAnyRef(value))
+            .getDuration("d", TimeUnit.MILLISECONDS);
+        return Duration.ofMillis(duration);
+      } catch (ConfigException ignored) {
+        throw x;
+      }
+    }
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/EnumConverter.java b/jooby/src/main/java/io/jooby/converter/EnumConverter.java
@@ -0,0 +1,19 @@
+package io.jooby.converter;
+
+public class EnumConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type.isEnum();
+  }
+
+  @Override public Enum convert(Class type, String value) {
+    try {
+      return Enum.valueOf(type, value);
+    } catch (IllegalArgumentException x) {
+      try {
+        return Enum.valueOf(type, value.toUpperCase());
+      } catch (IllegalArgumentException x1) {
+        throw x;
+      }
+    }
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/InstantConverter.java b/jooby/src/main/java/io/jooby/converter/InstantConverter.java
@@ -0,0 +1,13 @@
+package io.jooby.converter;
+
+import java.time.Instant;
+
+public class InstantConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == Instant.class;
+  }
+
+  @Override public Instant convert(Class type, String value) {
+    return Instant.ofEpochMilli(Long.parseLong(value));
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/LocalDateConverter.java b/jooby/src/main/java/io/jooby/converter/LocalDateConverter.java
@@ -0,0 +1,23 @@
+package io.jooby.converter;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+public class LocalDateConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == LocalDate.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    try {
+      // must be millis
+      Instant instant = Instant.ofEpochMilli(Long.parseLong(value));
+      return instant.atZone(ZoneId.systemDefault()).toLocalDate();
+    } catch (NumberFormatException x) {
+      // must be YYYY-MM-dd
+      return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE);
+    }
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/LocalDateTimeConverter.java b/jooby/src/main/java/io/jooby/converter/LocalDateTimeConverter.java
@@ -0,0 +1,22 @@
+package io.jooby.converter;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+public class LocalDateTimeConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == LocalDateTime.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    try {
+      // must be millis
+      Instant instant = Instant.ofEpochMilli(Long.parseLong(value));
+      return instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
+    } catch (NumberFormatException x) {
+      return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+    }
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/PeriodConverter.java b/jooby/src/main/java/io/jooby/converter/PeriodConverter.java
@@ -0,0 +1,16 @@
+package io.jooby.converter;
+
+import java.time.Duration;
+import java.time.Period;
+
+public class PeriodConverter implements ValueConverter {
+  private final DurationConverter converter = new DurationConverter();
+
+  @Override public boolean supports(Class type) {
+    return type == Period.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    return Period.from((Duration) converter.convert(type, value));
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/StatusCodeConverter.java b/jooby/src/main/java/io/jooby/converter/StatusCodeConverter.java
@@ -0,0 +1,13 @@
+package io.jooby.converter;
+
+import io.jooby.StatusCode;
+
+public class StatusCodeConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == StatusCode.class;
+  }
+
+  @Override public StatusCode convert(Class type, String value) {
+    return StatusCode.valueOf(Integer.parseInt(value));
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/TimeZoneConverter.java b/jooby/src/main/java/io/jooby/converter/TimeZoneConverter.java
@@ -0,0 +1,13 @@
+package io.jooby.converter;
+
+import java.util.TimeZone;
+
+public class TimeZoneConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == TimeZone.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    return TimeZone.getTimeZone(value);
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/URIConverter.java b/jooby/src/main/java/io/jooby/converter/URIConverter.java
@@ -0,0 +1,25 @@
+package io.jooby.converter;
+
+import io.jooby.SneakyThrows;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+
+public class URIConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == URI.class || type == URL.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    try {
+      URI uri = URI.create(value);
+      if (type == URL.class) {
+        return uri.toURL();
+      }
+      return uri;
+    } catch (MalformedURLException x) {
+      throw SneakyThrows.propagate(x);
+    }
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/UUIDConverter.java b/jooby/src/main/java/io/jooby/converter/UUIDConverter.java
@@ -0,0 +1,13 @@
+package io.jooby.converter;
+
+import java.util.UUID;
+
+public class UUIDConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == UUID.class;
+  }
+
+  @Override public UUID convert(Class type, String value) {
+    return UUID.fromString(value);
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/ValueConverter.java b/jooby/src/main/java/io/jooby/converter/ValueConverter.java
@@ -0,0 +1,7 @@
+package io.jooby.converter;
+
+public interface ValueConverter {
+  boolean supports(Class type);
+
+  Object convert(Class type, String value);
+}
diff --git a/jooby/src/main/java/io/jooby/converter/ValueOfConverter.java b/jooby/src/main/java/io/jooby/converter/ValueOfConverter.java
@@ -0,0 +1,45 @@
+package io.jooby.converter;
+
+import io.jooby.SneakyThrows;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiFunction;
+
+public class ValueOfConverter implements ValueConverter, BiFunction<Class, Method, Method> {
+
+  private Map<Class, Method> cache = new ConcurrentHashMap<>();
+
+  @Override public boolean supports(Class type) {
+    return cache.compute(type, this) != null;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    try {
+      return cache.compute(type, this).invoke(null, value);
+    } catch (InvocationTargetException x) {
+      throw SneakyThrows.propagate(x.getTargetException());
+    } catch (IllegalAccessException x) {
+      throw SneakyThrows.propagate(x);
+    }
+  }
+
+  @Override public Method apply(Class type, Method method) {
+    if (method == null) {
+      try {
+        Method valueOf = type.getDeclaredMethod("valueOf", String.class);
+        if (Modifier.isStatic(valueOf.getModifiers()) && Modifier
+            .isPublic(valueOf.getModifiers())) {
+          return valueOf;
+        }
+        return null;
+      } catch (NoSuchMethodException x) {
+        return null;
+      }
+    }
+    return method;
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/converter/ZoneIdConverter.java b/jooby/src/main/java/io/jooby/converter/ZoneIdConverter.java
@@ -0,0 +1,13 @@
+package io.jooby.converter;
+
+import java.time.ZoneId;
+
+public class ZoneIdConverter implements ValueConverter {
+  @Override public boolean supports(Class type) {
+    return type == ZoneId.class;
+  }
+
+  @Override public Object convert(Class type, String value) {
+    return ZoneId.of(value);
+  }
+}
diff --git a/jooby/src/main/java/io/jooby/internal/ValueInjector.java b/jooby/src/main/java/io/jooby/internal/ValueInjector.java
diff --git a/jooby/src/main/resources/META-INF/services/io.jooby.converter.ValueConverter b/jooby/src/main/resources/META-INF/services/io.jooby.converter.ValueConverter
diff --git a/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java b/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java
