bug fix, created script for generating android sdk 21 to 24 defs

Author: petekanev

dts-generator/.gitignore

@@ -3,4 +3,6 @@ local.properties
 .idea/gradle.xml
 .idea/modules.xml
 /out
-*.jar
+*.jar
+/**/*.d.ts
+/jars/**/*.jar

dts-generator/generate.win.bat

@@ -0,0 +1,19 @@
+rmdir /s /q output
+
+mkdir output\android-21
+mkdir output\android-22
+mkdir output\android-23
+mkdir output\android-24
+
+java -jar build\libs\dts-generator.jar -input %ANDROID_HOME%\platforms\android-21\android.jar jars\21.0.3\internal-v4.jar jars\21.0.3\v4.jar jars\21.0.3\v7.jar -output output\android-21
+
+java -jar build\libs\dts-generator.jar -input %ANDROID_HOME%\platforms\android-22\android.jar jars\22.2.0\internal-v4.jar jars\22.2.0\v4.jar jars\22.2.0\v7.jar -output output\android-22
+
+java -jar build\libs\dts-generator.jar -input %ANDROID_HOME%\platforms\android-23\android.jar jars\23.3.0\internal-v4.jar jars\23.3.0\v4.jar jars\23.3.0\v7.jar -output output\android-23
+
+java -jar build\libs\dts-generator.jar -input %ANDROID_HOME%\platforms\android-24\android.jar jars\24.1.0\internal-v4.jar jars\24.1.0\v4.jar jars\24.1.0\v7.jar -output output\android-24
+
+xcopy /f /y _helpers.d.ts output\android-21
+xcopy /f /y _helpers.d.ts output\android-22
+xcopy /f /y _helpers.d.ts output\android-23
+xcopy /f /y _helpers.d.ts output\android-24

dts-generator/src/main/java/com/telerik/dts/DtsApi.java

@@ -99,7 +99,7 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
                         processField(f, currClass);
                     }
                 } else {
-                    List<FieldOrMethod> foms = getMembers(currClass);
+                    List<FieldOrMethod> foms = getMembers(currClass, getAllInterfaces(currClass));
                     for (FieldOrMethod fom : foms) {
                         if (fom instanceof Field) {
                             processField((Field) fom, currClass);
@@ -320,7 +320,8 @@ private List<JavaClass> getInterfaces(JavaClass classInterface) {
             // TODO: Pete: Hardcoded until we figure out how to go around the 'type incompatible with Object' issue
             if (className.equals("java.util.Iterator") ||
                     className.equals("android.animation.TypeEvaluator") ||
-                    className.equals("java.lang.Comparable")) {
+                    className.equals("java.lang.Comparable") ||
+                    className.startsWith("java.util.function")) {
                 continue;
             }
 
@@ -491,9 +492,16 @@ private String getMethodParamSignature(JavaClass clazz, Method m) {
             sb.append("param");
             sb.append(idx++);
             sb.append(": ");
-            addReference(type);
+
             String paramTypeName = getTypeScriptTypeFromJavaType(clazz, type);
-            sb.append(paramTypeName);
+
+            // TODO: Pete:
+            if(paramTypeName.startsWith("java.util.function")) {
+                sb.append("any /* " + paramTypeName + "*/");
+            } else {
+                addReference(type);
+                sb.append(paramTypeName);
+            }
         }
         sb.append(")");
         String sig = sb.toString();
@@ -590,8 +598,14 @@ else if (isObjectType)
             {
                 typeName = typeName.replaceAll("\\$", "\\.");
             }
-            tsType.append(typeName);
-            addReference(type);
+
+            // TODO: Pete:
+            if(typeName.startsWith("java.util.function")) {
+                tsType.append("any /*" + typeName + "*/");
+            } else {
+                tsType.append(typeName);
+                addReference(type);
+            }
         }
         else
         {
@@ -613,10 +627,16 @@ private void addReference(Type type) {
         }
     }
 
-    private List<FieldOrMethod> getMembers(JavaClass javaClass) {
+    private List<FieldOrMethod> getMembers(JavaClass javaClass, List<JavaClass> interfaces) {
         Set<String> methodNames = new HashSet<String>();
         ArrayList<FieldOrMethod> members = new ArrayList<FieldOrMethod>();
-        for (Method m: javaClass.getMethods()) {
+
+        List<Method> allInterfacesMethods = getAllInterfacesMethods(interfaces);
+        List<Method> methods = new ArrayList<>();
+        methods.addAll(Arrays.asList(javaClass.getMethods()));
+        methods.addAll(allInterfacesMethods);
+
+        for (Method m: methods) {
             if ((m.isPublic() || m.isProtected()) && !m.isSynthetic()) {
                 members.add(m);
                 methodNames.add(m.getName());
@@ -627,6 +647,7 @@ private List<FieldOrMethod> getMembers(JavaClass javaClass) {
                 members.add(f);
             }
         }
+
         return members;
     }