Add enum and URL support to JSONEncoder.

gk-brown · gk-brown · commit bb35f6301f28 · 2021-03-02T16:58:59.000-05:00
diff --git a/README.md b/README.md
@@ -100,8 +100,8 @@ Method arguments may be any of the following types:
 * `java.time.LocalDate` ("yyyy-mm-dd")
 * `java.time.LocalTime` ("hh:mm")
 * `java.time.LocalDateTime` ("yyyy-mm-ddThh:mm")
-* `java.util.List`
 * `java.net.URL`
+* `java.util.List`
 
 Missing or `null` values are automatically converted to `0` or `false` for primitive types.
 
@@ -206,8 +206,10 @@ Return values are converted to their JSON equivalents as follows:
 * `CharSequence`: string
 * `Number`: number
 * `Boolean`: true/false
-* `java.util.Date`: long value representing epoch time in milliseconds
+* `Enum`: string
+* `java.util.Date`: number representing epoch time in milliseconds
 * `java.time.TemporalAccessor`: string
+* `java.net.URL`: string
 * `Iterable`: array
 * `java.util.Map` or Java bean: object
 
@@ -660,7 +662,10 @@ If the value is already an instance of the requested type, it is returned as is.
 * If the target type is a number or boolean, the value is parsed or coerced using the appropriate conversion method (e.g. `Integer#valueOf()`). Missing or `null` values are automatically converted to `0` or `false` for primitive types.
 * If the target type is a `String`, the value is adapted via its `toString()` method.
 * If the target type is `java.util.Date`, the value is parsed or coerced to a long value representing epoch time in milliseconds and then converted to a `Date`. 
-* If the target type is `java.time.Instant`, `java.time.LocalDate`, `java.time.LocalTime`, or `java.time.LocalDateTime`, the value is converted to a string and parsed using the appropriate `parse()` method.
+* If the target type is `java.time.Instant` and the value is an instance of `Date`, the value is adapted via `Date#toInstant()`. Otherwise, the value's string representation is parsed using `Instant#parse(CharSequence)`.
+* If the target type is `java.time.LocalDate`, the value's string representation is parsed using `LocalDate#parse()`.
+* If the target type is `java.time.LocalTime`, the value's string representation is parsed using `LocalTime#parse()`.
+* If the target type is `java.time.LocalDateTime`, the value's string representation is parsed using `LocalDateTime#parse()`.
 * If the target type is `java.util.List` or `java.util.Map`, the value is wrapped in an adapter of the same type that automatically adapts its sub-elements.
 
 Otherwise, the target is assumed to be a bean, and the value is assumed to be a map:
diff --git a/httprpc-client/src/main/java/org/httprpc/beans/BeanAdapter.java b/httprpc-client/src/main/java/org/httprpc/beans/BeanAdapter.java
@@ -443,13 +443,10 @@ private static Object adapt(Object value, Map<Class<?>, Map<String, Property>> p
      * representation is parsed using {@link LocalTime#parse(CharSequence)}.</li>
      * <li>If the target type is {@link LocalDateTime}, the value's string
      * representation is parsed using {@link LocalDateTime#parse(CharSequence)}.</li>
+     * <li>If the target type is {@link List} or {@link Map}, the value is wrapped
+     * in an adapter of the same type that automatically adapts its sub-elements.</li>
      * </ul>
      *
-     * If the target type is a {@link List}, the value is wrapped in an adapter
-     * that will recursively adapt the list's elements. If the target type is a
-     * {@link Map}, the value is wrapped in an adapter that will recursively adapt
-     * the map's values.
-     *
      * Otherwise, the target is assumed to be a bean, and the value is assumed to
      * be a map:
      *
diff --git a/httprpc-client/src/main/java/org/httprpc/io/JSONEncoder.java b/httprpc-client/src/main/java/org/httprpc/io/JSONEncoder.java
@@ -16,6 +16,7 @@
 
 import java.io.IOException;
 import java.io.Writer;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.temporal.TemporalAccessor;
 import java.util.Date;
@@ -87,9 +88,11 @@ private void encode(Object value, Writer writer) throws IOException {
             writer.write("\"");
         } else if (value instanceof Number || value instanceof Boolean) {
             writer.write(value.toString());
+        } else if (value instanceof Enum<?>) {
+            encode(value.toString(), writer);
         } else if (value instanceof Date) {
             encode(((Date)value).getTime(), writer);
-        } else if (value instanceof TemporalAccessor) {
+        } else if (value instanceof TemporalAccessor || value instanceof URL) {
             encode(value.toString(), writer);
         } else if (value instanceof Iterable<?>) {
             writer.write("[");
diff --git a/httprpc-client/src/test/java/org/httprpc/beans/BeanAdapterTest.java b/httprpc-client/src/test/java/org/httprpc/beans/BeanAdapterTest.java
@@ -144,11 +144,7 @@ public void testPrimitiveCoercion() {
 
     @Test
     public void testInstantCoercion() {
-        Date date = new Date(1);
-
-        Instant instant = BeanAdapter.adapt(date, Instant.class);
-
-        assertEquals(Instant.ofEpochMilli(1), instant);
+        assertEquals(Instant.ofEpochMilli(1), BeanAdapter.adapt(new Date(1), Instant.class));
     }
 
     @Test
diff --git a/httprpc-client/src/test/java/org/httprpc/io/JSONEncoderTest.java b/httprpc-client/src/test/java/org/httprpc/io/JSONEncoderTest.java
@@ -18,6 +18,8 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.net.URL;
+import java.time.DayOfWeek;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
@@ -50,6 +52,11 @@ public void testBoolean() throws IOException {
         assertEquals("false", encode(false));
     }
 
+    @Test
+    public void testEnum() throws Exception {
+        assertEquals("\"MONDAY\"", encode(DayOfWeek.MONDAY));
+    }
+
     @Test
     public void testDate() throws IOException {
         assertEquals("0", encode(new Date(0)));
@@ -60,6 +67,11 @@ public void testInstant() throws IOException {
         assertEquals("\"1970-01-01T00:00:00.001Z\"", encode(Instant.ofEpochMilli(1)));
     }
 
+    @Test
+    public void testURL() throws Exception {
+        assertEquals("\"http://localhost:8080\"", encode(new URL("http://localhost:8080")));
+    }
+
     @Test
     public void testArray() throws IOException {
         String expected = "[\n"
diff --git a/httprpc-server/src/main/java/org/httprpc/WebService.java b/httprpc-server/src/main/java/org/httprpc/WebService.java
@@ -895,7 +895,7 @@ private void describeType(Type type, XMLStreamWriter xmlStreamWriter) throws XML
     }
 
     private void describeType(Class<?> type, XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
-        if (type.isArray() || Enum.class.isAssignableFrom(type)) {
+        if (type.isArray() || type.isEnum()) {
             throw new IllegalArgumentException();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ private void describeType(Type type, XMLStreamWriter xmlStreamWriter) throws XML`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`private void describeType(Class<?> type, XMLStreamWriter xmlStreamWriter) throws XMLStreamException {`
`898`		`- if (type.isArray() \|\| Enum.class.isAssignableFrom(type)) {`
	`898`	`+ if (type.isArray() \|\| type.isEnum()) {`
`899`	`899`	`throw new IllegalArgumentException();`
`900`	`900`	`}`
`901`	`901`