Drop URL support in typed adapter.

gk-brown · gk-brown · commit f864e1d2c272 · 2019-10-09T16:54:41.000-04:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ The HTTP-RPC framework includes the following classes:
     * `TemplateEncoder` - class that encodes an object hierarchy using a template document
     * `XMLEncoder` - class that encodes an object hierarchy to XML
 * `org.httprpc.beans`
-    * `BeanAdapter` - class that presents the properties of a Java bean object as a map
+    * `BeanAdapter` - class that presents the properties of a Java bean object as a map and vice versa
     * `Ignore` - annotation indicating that a bean property should be ignored
     * `Key` - annotation that associates a custom key with a bean property
 * `org.httprpc.sql`
@@ -786,7 +786,6 @@ If the value is already an instance of the requested type, it is returned as is.
 * 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.util.time.LocalDate`, `java.util.time.LocalTime`, or `java.util.time.LocalDateTime`, the value is converted to a string and parsed using the appropriate `parse()` method.
-* If the target type is `java.net.URL`, the value is first converted to a string and then to a URL.
 * 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 interface, and the value is assumed to be a map. The return value is an implementation of the given interface that maps accessor methods to entries in the map. Property values are adapted as described above.
diff --git a/httprpc/build.gradle b/httprpc/build.gradle
@@ -25,7 +25,7 @@ repositories {
 dependencies {
     compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
 
-    testCompile("org.junit.jupiter:junit-jupiter-api:5.4.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.2")
     testRuntime("org.junit.jupiter:junit-jupiter-engine:5.4.2")
 }
 
diff --git a/httprpc/src/main/java/org/httprpc/beans/BeanAdapter.java b/httprpc/src/main/java/org/httprpc/beans/BeanAdapter.java
@@ -376,8 +376,6 @@ private static Object adapt(Object value, HashMap<Class<?>, HashMap<String, Meth
      * 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 URL}, the value's string representation
-     * is adapted via {@link URL#URL(String)}.
      * </ul>
      *
      * If the target type is a {@link List}, the value is wrapped in an adapter
@@ -505,12 +503,6 @@ private static Object adapt(Object value, Class<?> type) {
                 return LocalTime.parse(value.toString());
             } else if (type == LocalDateTime.class) {
                 return LocalDateTime.parse(value.toString());
-            } else if (type == URL.class) {
-                try {
-                    return new URL(value.toString());
-                } catch (MalformedURLException exception) {
-                    throw new IllegalArgumentException(exception);
-                }
             } else if (value instanceof Map<?, ?>) {
                 return adaptBean((Map<?, ?>)value, type);
             } else {
@@ -526,16 +518,15 @@ private static Object adaptBean(Map<?, ?> map, Class<?> type) {
             throw new IllegalArgumentException("Type is not an interface.");
         }
 
-        return type.cast(Proxy.newProxyInstance(type.getClassLoader(),
-            new Class[] {type}, (proxy, method, arguments) -> {
-                String key = getKey(method);
+        return type.cast(Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, (proxy, method, arguments) -> {
+            String key = getKey(method);
 
-                if (key == null) {
-                    throw new UnsupportedOperationException();
-                }
+            if (key == null) {
+                throw new UnsupportedOperationException();
+            }
 
-                return adapt(map.get(key), method.getGenericReturnType());
-            }));
+            return adapt(map.get(key), method.getGenericReturnType());
+        }));
     }
 
     /**
diff --git a/httprpc/src/test/java/org/httprpc/beans/BeanAdapterTest.java b/httprpc/src/test/java/org/httprpc/beans/BeanAdapterTest.java
@@ -124,8 +124,6 @@ public void testBeanAdapter2() throws IOException {
         Assertions.assertEquals(LocalTime.parse("10:45"), result.getLocalTime());
         Assertions.assertEquals(LocalDateTime.parse("2018-06-28T10:45"), result.getLocalDateTime());
 
-        Assertions.assertEquals(new URL("http://localhost:8080"), result.getURL());
-
         Assertions.assertTrue(result.getNestedBean().getFlag());
 
         Assertions.assertEquals(2L, ((Number)result.getList().get(0)).longValue());
diff --git a/httprpc/src/test/java/org/httprpc/beans/TestBean.java b/httprpc/src/test/java/org/httprpc/beans/TestBean.java
@@ -98,7 +98,6 @@ public LocalDateTime getLocalDateTime() {
         return LocalDateTime.parse("2018-06-28T10:45");
     }
 
-    @Override
     public URL getURL() {
         try {
             return new URL("http://localhost:8080");
diff --git a/httprpc/src/test/java/org/httprpc/beans/TestInterface.java b/httprpc/src/test/java/org/httprpc/beans/TestInterface.java
@@ -36,7 +36,6 @@ public interface NestedInterface {
     public LocalDate getLocalDate();
     public LocalTime getLocalTime();
     public LocalDateTime getLocalDateTime();
-    public URL getURL();
     public NestedInterface getNestedBean();
     public List<?> getList();
     public List<? extends NestedInterface> getNestedBeanList();
diff --git a/httprpc/src/test/resources/org/httprpc/beans/test.json b/httprpc/src/test/resources/org/httprpc/beans/test.json
@@ -8,7 +8,6 @@
     "localDate": "2018-06-28",
     "localTime": "10:45",
     "localDateTime": "2018-06-28T10:45",
-    "URL": "http://localhost:8080",
     "nestedBean": {
         "flag": true
     },

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ repositories {`
`25`	`25`	`dependencies {`
`26`	`26`	`compileOnly 'javax.servlet:javax.servlet-api:3.1.0'`
`27`	`27`
`28`		`- testCompile("org.junit.jupiter:junit-jupiter-api:5.4.2")`
	`28`	`+ testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.2")`
`29`	`29`	`testRuntime("org.junit.jupiter:junit-jupiter-engine:5.4.2")`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ public LocalDateTime getLocalDateTime() {`
`98`	`98`	`return LocalDateTime.parse("2018-06-28T10:45");`
`99`	`99`	`}`
`100`	`100`
`101`		`- @Override`
`102`	`101`	`public URL getURL() {`
`103`	`102`	`try {`
`104`	`103`	`return new URL("http://localhost:8080");`