Update BeanAdapter.

Author: gk-brown

kilo-client/src/main/java/org/httprpc/kilo/beans/BeanAdapter.java

@@ -44,9 +44,8 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -684,7 +683,7 @@ public static <T> T coerce(Object value, Class<T> type) {
      * The coerced list.
      *
      * @deprecated
-     * This method will be removed in a future release. Use streams instead.
+     * This method will be removed in a future release.
      */
     @Deprecated
     @SuppressWarnings("unchecked")
@@ -729,7 +728,7 @@ public Type getOwnerType() {
      * The coerced map.
      *
      * @deprecated
-     * This method will be removed in a future release. Use streams instead.
+     * This method will be removed in a future release.
      */
     @Deprecated
     @SuppressWarnings("unchecked")
@@ -768,7 +767,7 @@ public Type getOwnerType() {
      * The coerced set.
      *
      * @deprecated
-     * This method will be removed in a future release. Use streams instead.
+     * This method will be removed in a future release.
      */
     @Deprecated
     @SuppressWarnings("unchecked")
@@ -806,8 +805,8 @@ public Type getOwnerType() {
     public static Object toGenericType(Object value, Type type) {
         if (type instanceof Class<?> rawType) {
             return toRawType(value, rawType);
-        } else if (type instanceof ParameterizedType parameterizedType) {
-            var rawType = parameterizedType.getRawType();
+        } else if (type instanceof ParameterizedType parameterizedType
+            && parameterizedType.getRawType() instanceof Class<?> rawType) {
             var actualTypeArguments = parameterizedType.getActualTypeArguments();
 
             if (rawType == List.class) {
@@ -833,7 +832,7 @@ public static Object toGenericType(Object value, Type type) {
                     var keyType = actualTypeArguments[0];
                     var valueType = actualTypeArguments[1];
 
-                    var genericMap = new LinkedHashMap<>();
+                    var genericMap = new HashMap<>(map.size());
 
                     for (var entry : map.entrySet()) {
                         genericMap.put(toGenericType(entry.getKey(), keyType), toGenericType(entry.getValue(), valueType));
@@ -849,7 +848,7 @@ public static Object toGenericType(Object value, Type type) {
                 } else if (value instanceof Collection<?> collection) {
                     var elementType = actualTypeArguments[0];
 
-                    var genericSet = new LinkedHashSet<>(collection.size());
+                    var genericSet = new HashSet<>(collection.size());
 
                     for (var element : collection) {
                         genericSet.add(toGenericType(element, elementType));

kilo-client/src/test/java/org/httprpc/kilo/io/JSONDecoderTest.java

@@ -14,7 +14,6 @@
 
 package org.httprpc.kilo.io;
 
-import org.httprpc.kilo.beans.BeanAdapter;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -28,10 +27,11 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 public class JSONDecoderTest {
-    public interface Row {
-        String getA();
-        int getB();
-        boolean isC();
+    public record Row (
+        String a,
+        int b,
+        boolean c
+    ) {
     }
 
     private static class ListType implements ParameterizedType {
@@ -115,18 +115,10 @@ public void testArray() throws IOException {
 
     @Test
     public void testRowArray() throws IOException {
-        var expected = BeanAdapter.coerceList(listOf(
-            mapOf(
-                entry("a", "hello"),
-                entry("b", 123),
-                entry("c", true)
-            ),
-            mapOf(
-                entry("a", "goodbye"),
-                entry("b", 456),
-                entry("c", false)
-            )
-        ), Row.class);
+        var expected = listOf(
+            new Row("hello", 123, true),
+            new Row("goodbye", 456, false)
+        );
 
         var text = "[{\"a\": \"hello\", \"b\": 123, \"c\": true}, {\"a\": \"goodbye\", \"b\": 456, \"c\": false}]";
 

kilo-client/src/test/java/org/httprpc/kilo/util/CollectionsTest.java

@@ -93,7 +93,7 @@ public void testSortedMapOf() {
 
     @Test
     public void testSetOf() {
-        var expected = new HashSet<Integer>(3);
+        var expected = new HashSet<Integer>();
 
         expected.add(1);
         expected.add(2);

kilo-server/src/main/java/org/httprpc/kilo/WebService.java

@@ -1259,27 +1259,25 @@ private Object[] getArguments(Parameter[] parameters, List<String> keys, Map<Str
                         argument = Array.newInstance(componentType, 0);
                     }
                 } else if (Collection.class.isAssignableFrom(type)) {
-                    var elementType = ((ParameterizedType)parameter.getParameterizedType()).getActualTypeArguments()[0];
-
-                    if (elementType instanceof Class<?>) {
-                        if (type == List.class) {
-                            if (values == null) {
-                                argument = listOf();
-                            } else {
-                                argument = BeanAdapter.coerceList(values, (Class<?>)elementType);
-                            }
-                        } else if (type == Set.class) {
-                            if (values == null) {
-                                argument = setOf();
-                            } else {
-                                argument = BeanAdapter.coerceSet(values, (Class<?>)elementType);
-                            }
-                        } else {
-                            throw new UnsupportedOperationException("Unsupported collection type.");
-                        }
+                    var parameterizedType = (ParameterizedType)parameter.getParameterizedType();
+                    var elementType = (Class<?>)parameterizedType.getActualTypeArguments()[0];
+
+                    Collection<Object> collection;
+                    if (type == List.class) {
+                        collection = listOf();
+                    } else if (type == Set.class) {
+                        collection = setOf();
                     } else {
-                        throw new UnsupportedOperationException("Unsupported element type.");
+                        throw new UnsupportedOperationException("Unsupported collection type.");
                     }
+
+                    if (values != null) {
+                        for (var element : values) {
+                            collection.add(BeanAdapter.coerce(element, elementType));
+                        }
+                    }
+
+                    argument = collection;
                 } else {
                     Object value;
                     if (values != null) {

kilo-test/src/test/java/org/httprpc/kilo/test/WebServiceProxyTest.java

@@ -256,9 +256,11 @@ public void testListPost() throws IOException {
 
         webServiceProxy.setBody(body);
 
-        var result = webServiceProxy.invoke();
+        var result = ((List<?>)webServiceProxy.invoke()).stream()
+            .map(element -> BeanAdapter.coerce(element, Integer.class))
+            .toList();
 
-        assertEquals(body, BeanAdapter.coerceList((List<?>)result, Integer.class));
+        assertEquals(body, result);
     }
 
     @Test