Update BeanAdapter.

Author: gk-brown

build.gradle

@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'
-    version = '5.7'
+    version = '5.7.1'
 
     repositories {
         mavenCentral()

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

@@ -914,27 +914,31 @@ private static Object toEnum(String value, Class<?> type) {
     }
 
     private static Object toRecord(Map<?, ?> map, Class<?> type) {
-        var recordComponents = type.getRecordComponents();
+        var properties = getProperties(type);
 
-        var parameterTypes = new Class<?>[recordComponents.length];
-        var arguments = new Object[recordComponents.length];
+        var n = properties.size();
 
-        for (var i = 0; i < recordComponents.length; i++) {
-            var recordComponent = recordComponents[i];
+        var parameterTypes = new Class<?>[n];
+        var arguments = new Object[n];
 
-            parameterTypes[i] = recordComponent.getType();
+        var i = 0;
 
-            var accessor = recordComponent.getAccessor();
+        for (var entry : properties.entrySet()) {
+            var key = entry.getKey();
 
-            var key = getKey(accessor, recordComponent.getName());
+            var accessor = entry.getValue().accessor;
 
             var value = map.get(key);
 
             if (accessor.getAnnotation(Required.class) != null && value == null) {
                 throw new RequiredValueException(key, type);
             }
 
-            arguments[i] = coerceGeneric(value, recordComponent.getGenericType());
+            parameterTypes[i] = accessor.getReturnType();
+
+            arguments[i] = coerceGeneric(value, accessor.getGenericReturnType());
+
+            i++;
         }
 
         Constructor<?> constructor;
@@ -970,14 +974,14 @@ private static Object toBean(Map<?, ?> map, Class<?> type) {
             }
 
             for (var entry : getProperties(type).entrySet()) {
+                var key = entry.getKey();
+
                 var property = entry.getValue();
 
                 if (property.mutator == null) {
                     continue;
                 }
 
-                var key = entry.getKey();
-
                 var value = map.get(key);
 
                 if (property.accessor.getAnnotation(Required.class) != null && value == null) {
@@ -996,7 +1000,7 @@ private static Object toBean(Map<?, ?> map, Class<?> type) {
     }
 
     /**
-     * Returns the properties for a given type, sorted by name.
+     * Returns the properties for a given type.
      *
      * @param type
      * The bean type.
@@ -1009,18 +1013,23 @@ public static Map<String, Property> getProperties(Class<?> type) {
     }
 
     private static Map<String, Property> computeProperties(Class<?> type) {
-        var accessors = new HashMap<String, Method>();
-        var mutatorMap = new HashMap<String, List<Method>>();
-
+        Map<String, Property> properties;
         if (type.isRecord()) {
+            properties = new LinkedHashMap<>();
+
             var recordComponents = type.getRecordComponents();
 
             for (var i = 0; i < recordComponents.length; i++) {
                 var recordComponent = recordComponents[i];
 
-                accessors.put(recordComponent.getName(), recordComponent.getAccessor());
+                var accessor = recordComponent.getAccessor();
+
+                properties.put(getKey(accessor, recordComponent.getName()), new Property(accessor, null));
             }
         } else {
+            var accessors = new HashMap<String, Method>();
+            var mutatorLists = new HashMap<String, List<Method>>();
+
             var methods = type.getMethods();
 
             for (var i = 0; i < methods.length; i++) {
@@ -1039,24 +1048,26 @@ private static Map<String, Property> computeProperties(Class<?> type) {
                 if (method.getParameterCount() == 0) {
                     accessors.put(propertyName, method);
                 } else {
-                    mutatorMap.computeIfAbsent(propertyName, key -> new LinkedList<>()).add(method);
+                    mutatorLists.computeIfAbsent(propertyName, key -> new LinkedList<>()).add(method);
                 }
             }
-        }
 
-        return immutableMapOf(sortedMapOf(mapAll(accessors.entrySet(), entry -> {
-            var propertyName = entry.getKey();
+            properties = sortedMapOf(mapAll(accessors.entrySet(), entry -> {
+                var propertyName = entry.getKey();
+
+                var accessor = entry.getValue();
 
-            var accessor = entry.getValue();
+                var propertyType = accessor.getReturnType();
 
-            var propertyType = accessor.getReturnType();
+                var mutatorList = coalesce(mutatorLists.get(propertyName), () -> emptyListOf(Method.class));
 
-            var mutatorList = coalesce(mutatorMap.get(propertyName), () -> emptyListOf(Method.class));
+                var mutator = firstOf(filter(mutatorList, method -> method.getParameterTypes()[0] == propertyType));
 
-            var mutator = firstOf(filter(mutatorList, method -> method.getParameterTypes()[0] == propertyType));
+                return entry(getKey(accessor, propertyName), new Property(accessor, mutator));
+            }));
+        }
 
-            return entry(getKey(accessor, propertyName), new Property(accessor, mutator));
-        })));
+        return immutableMapOf(properties);
     }
 
     private static String getPropertyName(Method method) {

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

@@ -740,7 +740,7 @@ private enum Verb {
 
     private static class Resource {
         Map<String, Resource> resources = new TreeMap<>();
-        Map<Verb, List<Method>> handlers = new TreeMap<>();
+        Map<Verb, List<Method>> handlerLists = new TreeMap<>();
     }
 
     private Resource root = null;
@@ -885,7 +885,7 @@ public void init() throws ServletException {
                 }
             }
 
-            resource.handlers.computeIfAbsent(verb, key -> new LinkedList<>()).add(handler);
+            resource.handlerLists.computeIfAbsent(verb, key -> new LinkedList<>()).add(handler);
         }
 
         sort(root);
@@ -900,8 +900,8 @@ public void init() throws ServletException {
     }
 
     private static void sort(Resource root) {
-        for (var handlers : root.handlers.values()) {
-            handlers.sort(handlerComparator);
+        for (var handlerList : root.handlerLists.values()) {
+            handlerList.sort(handlerComparator);
         }
 
         for (var resource : root.resources.values()) {
@@ -1070,7 +1070,7 @@ private void invoke(HttpServletRequest request, HttpServletResponse response) th
             return;
         }
 
-        var handlerList = resource.handlers.get(verb);
+        var handlerList = resource.handlerLists.get(verb);
 
         if (handlerList == null) {
             response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
@@ -1487,7 +1487,7 @@ public ServiceDescriptor getServiceDescriptor() {
     }
 
     private void describeResource(String path, Resource resource) {
-        if (!resource.handlers.isEmpty()) {
+        if (!resource.handlerLists.isEmpty()) {
             var endpoint = new EndpointDescriptor(path);
 
             var keyCount = 0;
@@ -1500,7 +1500,7 @@ private void describeResource(String path, Resource resource) {
                 }
             }
 
-            for (var entry : resource.handlers.entrySet()) {
+            for (var entry : resource.handlerLists.entrySet()) {
                 for (var handler : entry.getValue()) {
                     var operation = new OperationDescriptor(entry.getKey().toString(), handler);