Be more tolerant with Map/Iterable type sample data generating

greenlaw110 · greenlaw110 · commit cb2bf5a3cd86 · 2017-08-28T08:54:08.000+10:00
diff --git a/src/main/java/act/apidoc/Endpoint.java b/src/main/java/act/apidoc/Endpoint.java
@@ -24,7 +24,6 @@
 import act.app.DevModeClassLoader;
 import act.app.Source;
 import act.app.data.StringValueResolverManager;
-import act.db.DbBind;
 import act.handler.RequestHandler;
 import act.handler.builtin.controller.RequestHandlerProxy;
 import act.handler.builtin.controller.impl.ReflectedHandlerInvoker;
@@ -40,6 +39,7 @@
 import org.osgl.mvc.result.Result;
 import org.osgl.storage.ISObject;
 import org.osgl.util.C;
+import org.osgl.util.Generics;
 import org.osgl.util.N;
 import org.osgl.util.StringValueResolver;
 import org.rythmengine.utils.S;
@@ -339,10 +339,10 @@ private ParamInfo paramInfo(Type type, Annotation[] annos, DependencyInjector in
         if (ParamValueLoaderService.providedButNotDbBind(spec, injector)) {
             return null;
         }
-        if (spec.hasAnnotation(DbBind.class)) {
+        if (ParamValueLoaderService.hasDbBind(spec.allAnnotations())) {
             return new ParamInfo(name, BeanSpec.of(String.class, Act.injector()), name + " id");
         }
-        String description = spec.toString();
+        String description = spec.rawType().getSimpleName();
         Description descAnno = spec.getAnnotation(Description.class);
         if (null != descAnno) {
             description = descAnno.value();
@@ -462,19 +462,36 @@ private static Object generateSampleData(BeanSpec spec, Set<Class<?>> typeChain)
                     return null;
                 } else if (Map.class.isAssignableFrom(type)) {
                     Map map = $.cast(Act.getInstance(type));
-                    Type keyType = spec.typeParams().get(0);
-                    Type valType = spec.typeParams().get(1);
-                    map.put(
-                            generateSampleData(BeanSpec.of(keyType, null, Act.injector()), typeChain),
-                            generateSampleData(BeanSpec.of(valType, null, Act.injector()), typeChain));
-                    map.put(
-                            generateSampleData(BeanSpec.of(keyType, null, Act.injector()), typeChain),
-                            generateSampleData(BeanSpec.of(valType, null, Act.injector()), typeChain));
+                    List<Type> typeParams = spec.typeParams();
+                    if (typeParams.isEmpty()) {
+                        typeParams = Generics.typeParamImplementations(type, Map.class);
+                    }
+                    if (typeParams.size() < 2) {
+                        map.put(S.random(), S.random());
+                        map.put(S.random(), S.random());
+                    } else {
+                        Type keyType = typeParams.get(0);
+                        Type valType = typeParams.get(1);
+                        map.put(
+                                generateSampleData(BeanSpec.of(keyType, null, Act.injector()), typeChain),
+                                generateSampleData(BeanSpec.of(valType, null, Act.injector()), typeChain));
+                        map.put(
+                                generateSampleData(BeanSpec.of(keyType, null, Act.injector()), typeChain),
+                                generateSampleData(BeanSpec.of(valType, null, Act.injector()), typeChain));
+                    }
                 } else if (Iterable.class.isAssignableFrom(type)) {
                     Collection col = $.cast(Act.getInstance(type));
-                    Type componentType = spec.typeParams().get(0);
-                    col.add(generateSampleData(BeanSpec.of(componentType, null, Act.injector()), typeChain));
-                    col.add(generateSampleData(BeanSpec.of(componentType, null, Act.injector()), typeChain));
+                    List<Type> typeParams = spec.typeParams();
+                    if (typeParams.isEmpty()) {
+                        typeParams = Generics.typeParamImplementations(type, Map.class);
+                    }
+                    if (typeParams.isEmpty()) {
+                        col.add(S.random());
+                    } else {
+                        Type componentType = typeParams.get(0);
+                        col.add(generateSampleData(BeanSpec.of(componentType, null, Act.injector()), typeChain));
+                        col.add(generateSampleData(BeanSpec.of(componentType, null, Act.injector()), typeChain));
+                    }
                     return col;
                 }
 
diff --git a/src/main/java/act/inject/param/ParamValueLoaderService.java b/src/main/java/act/inject/param/ParamValueLoaderService.java
@@ -785,12 +785,17 @@ public static boolean providedButNotDbBind(BeanSpec beanSpec, DependencyInjector
             return false;
         }
         Annotation[] aa = beanSpec.allAnnotations();
-        for (Annotation a : aa) {
+        return !hasDbBind(aa);
+    }
+
+    // DbBind is special: it's class loader is AppClassLoader
+    public static boolean hasDbBind(Annotation[] annotations) {
+        for (Annotation a : annotations) {
             if (a.annotationType().getName().equals(DbBind.class.getName())) {
-                return false;
+                return true;
             }
         }
-        return true;
+        return false;
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -785,12 +785,17 @@ public static boolean providedButNotDbBind(BeanSpec beanSpec, DependencyInjector`
`785`	`785`	`return false;`
`786`	`786`	`}`
`787`	`787`	`Annotation[] aa = beanSpec.allAnnotations();`
`788`		`- for (Annotation a : aa) {`
	`788`	`+ return !hasDbBind(aa);`
	`789`	`+ }`
	`790`	`+`
	`791`	`+ // DbBind is special: it's class loader is AppClassLoader`
	`792`	`+ public static boolean hasDbBind(Annotation[] annotations) {`
	`793`	`+ for (Annotation a : annotations) {`
`789`	`794`	`if (a.annotationType().getName().equals(DbBind.class.getName())) {`
`790`		`- return false;`
	`795`	`+ return true;`
`791`	`796`	`}`
`792`	`797`	`}`
`793`		`- return true;`
	`798`	`+ return false;`
`794`	`799`	`}`
`795`	`800`
`796`	`801`	`}`