Move concrete list and map handling logic.

gk-brown · gk-brown · commit 44aa747c462a · 2021-02-06T09:37:08.000-05:00
diff --git a/httprpc-server/src/main/java/org/httprpc/WebService.java b/httprpc-server/src/main/java/org/httprpc/WebService.java
@@ -773,9 +773,7 @@ private void describeResource(String path, Resource resource, XMLStreamWriter xm
     }
 
     private String describe(Type type) {
-        if (type instanceof Class<?>) {
-            return describe((Class<?>)type);
-        } else if (type instanceof WildcardType) {
+        if (type instanceof WildcardType) {
             return describe(((WildcardType)type).getUpperBounds()[0]);
         } else if (type instanceof ParameterizedType) {
             ParameterizedType parameterizedType = (ParameterizedType)type;
@@ -791,6 +789,44 @@ private String describe(Type type) {
             } else {
                 throw new IllegalArgumentException();
             }
+        } else if (type instanceof Class<?>) {
+            if (Iterable.class.isAssignableFrom((Class<?>)type)) {
+                return describe(new ParameterizedType() {
+                    @Override
+                    public Type[] getActualTypeArguments() {
+                        return new Type[] {Object.class};
+                    }
+
+                    @Override
+                    public Type getRawType() {
+                        return Iterable.class;
+                    }
+
+                    @Override
+                    public Type getOwnerType() {
+                        return null;
+                    }
+                });
+            } else if (Map.class.isAssignableFrom((Class<?>)type)) {
+                return describe(new ParameterizedType() {
+                    @Override
+                    public Type[] getActualTypeArguments() {
+                        return new Type[] {Object.class, Object.class};
+                    }
+
+                    @Override
+                    public Type getRawType() {
+                        return Map.class;
+                    }
+
+                    @Override
+                    public Type getOwnerType() {
+                        return null;
+                    }
+                });
+            } else {
+                return describe((Class<?>)type);
+            }
         } else {
             throw new IllegalArgumentException();
         }
@@ -837,40 +873,6 @@ private String describe(Class<?> type) {
             return "datetime-local";
         } else if (type == URL.class) {
             return "url";
-        } else if (Iterable.class.isAssignableFrom(type)) {
-            return describe(new ParameterizedType() {
-                @Override
-                public Type[] getActualTypeArguments() {
-                    return new Type[] {Object.class};
-                }
-
-                @Override
-                public Type getRawType() {
-                    return Iterable.class;
-                }
-
-                @Override
-                public Type getOwnerType() {
-                    return null;
-                }
-            });
-        } else if (Map.class.isAssignableFrom(type)) {
-            return describe(new ParameterizedType() {
-                @Override
-                public Type[] getActualTypeArguments() {
-                    return new Type[] {Object.class, Object.class};
-                }
-
-                @Override
-                public Type getRawType() {
-                    return Map.class;
-                }
-
-                @Override
-                public Type getOwnerType() {
-                    return null;
-                }
-            });
         } else {
             if (!structures.containsKey(type)) {
                 Map<String, Method> accessors = BeanAdapter.getAccessors(type);
