Merge pull request #1239 from NativeScript/vmutafov/sbg-interfaces-handling-fix

Fix handling of user implemented interfaces

Author: vtrifonov

test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java

@@ -40,14 +40,14 @@ public class Generator {
     private static final String LINE_SEPARATOR = System.getProperty("line.separator");
 
     private static final String AUTO_GENERATED_FILE_PROLOGUE =
-        "/* AUTO-GENERATED FILE. DO NOT MODIFY." + LINE_SEPARATOR +
-        " * This class was automatically generated by the" + LINE_SEPARATOR +
-        " * static binding generator from the resources it found." + LINE_SEPARATOR +
-        " * Please do not modify by hand." + LINE_SEPARATOR +
-        " */" + LINE_SEPARATOR;
+            "/* AUTO-GENERATED FILE. DO NOT MODIFY." + LINE_SEPARATOR +
+                    " * This class was automatically generated by the" + LINE_SEPARATOR +
+                    " * static binding generator from the resources it found." + LINE_SEPARATOR +
+                    " * Please do not modify by hand." + LINE_SEPARATOR +
+                    " */" + LINE_SEPARATOR;
 
     private final File outputDir;
-    private final List<DataRow>  libs;
+    private final List<DataRow> libs;
     private final Map<String, JavaClass> classes;
     private final boolean suppressCallJSMethodExceptions;
 
@@ -213,7 +213,7 @@ private String getNormalizedName(String filename) {
         return sb.toString();
     }
 
-    private Map<String, MethodGroup> getPublicApi(JavaClass clazz) throws ClassNotFoundException {
+    private Map<String, MethodGroup> getPublicApi(JavaClass clazz, List<String> userImplementedInterfacesNames) throws ClassNotFoundException {
         Map<String, MethodGroup> api = new HashMap<String, MethodGroup>();
         JavaClass currentClass = clazz;
         String clazzName = clazz.getClassName();
@@ -225,7 +225,7 @@ private Map<String, MethodGroup> getPublicApi(JavaClass clazz) throws ClassNotFo
                 methods.add(m);
             }
 
-            collectInterfaceMethods(clazz, methods);
+            collectInterfaceMethods(clazz, userImplementedInterfacesNames, methods);
             for (Method m : methods) {
                 if (!m.isSynthetic() && (m.isPublic() || m.isProtected()) && !m.isStatic()) {
                     String name = m.getName();
@@ -303,7 +303,7 @@ private Map<String, JavaClass> readDir(String path, boolean throwOnError) throws
         while (!d.isEmpty()) {
             File cur = d.pollFirst();
             File[] files = cur.listFiles();
-            for (File f: files) {
+            for (File f : files) {
                 if (f.isFile() && f.getName().endsWith(CLASS_EXT)) {
                     ClassParser cp = new ClassParser(f.getAbsolutePath());
                     JavaClass clazz = cp.parse();
@@ -338,9 +338,8 @@ private String getFullMethodSignature(Method m) {
 
     private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String packageName, String name) throws ClassNotFoundException {
         String[] implInterfaces = dataRow.getInterfaces();
-        collectImplementedInterfaces(implInterfaces, clazz);
 
-        Map<String, MethodGroup> api = getPublicApi(clazz);
+        Map<String, MethodGroup> api = getPublicApi(clazz, Arrays.asList(dataRow.getInterfaces()));
 
         w.writeln("package " + packageName + ";");
         w.writeln();
@@ -404,7 +403,7 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
             }
             Set<Method> notImplementedObjectMethods = new HashSet<Method>();
             Method[] currentIfaceMethods = clazz.getMethods();
-            ArrayList<Method> ifaceMethods = new ArrayList<Method>();
+            Set<Method> ifaceMethods = new HashSet<>();
             for (Method m : currentIfaceMethods) {
                 if (!m.getName().equals("<clinit>")) {
                     ifaceMethods.add(m);
@@ -446,7 +445,7 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
             }
         } else {
             List<Method> interfaceMethods = new ArrayList<Method>();
-            collectInterfaceMethods(clazz, interfaceMethods);
+            collectInterfaceMethods(clazz, Arrays.asList(dataRow.getInterfaces()), interfaceMethods);
             for (String methodName : dataRow.getMethods()) {
                 if (api.containsKey(methodName)) {
                     List<Method> methodGroup = api.get(methodName).getList();
@@ -481,8 +480,8 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
     private boolean isClassApplication(JavaClass clazz) {
         String className = clazz.getClassName();
         return className.equals("android.app.Application") ||
-               className.equals("android.support.multidex.MultiDexApplication") ||
-               className.equals("android.test.mock.MockApplication");
+                className.equals("android.support.multidex.MultiDexApplication") ||
+                className.equals("android.test.mock.MockApplication");
     }
 
     private void writeMethodBody(Method m, Writer w, boolean isApplicationClass, boolean isActivityClass, boolean isInterfaceMethod) {
@@ -643,7 +642,7 @@ private void writeMethodBody(Method m, boolean isConstructor, boolean isApplicat
         w.write("\t\t");
         Type ret = m.getReturnType();
 
-        if(this.suppressCallJSMethodExceptions) {
+        if (this.suppressCallJSMethodExceptions) {
             w.writeln("try {");
             w.write("\t\t\t");
         }
@@ -659,7 +658,7 @@ private void writeMethodBody(Method m, boolean isConstructor, boolean isApplicat
         writeType(ret, w);
         w.writeln(".class, args);");
 
-        if(this.suppressCallJSMethodExceptions) {
+        if (this.suppressCallJSMethodExceptions) {
             w.writeln("\t\t} catch (Throwable t) {");
             w.writeln("\t\t\tcom.tns.Runtime.passSuppressedExceptionToJs(t, \"" + m.getName() + "\");");
             w.writeln("\t\t\tandroid.util.Log.w(\"Warning\", \"NativeScript discarding uncaught JS exception!\");");
@@ -689,7 +688,7 @@ private void writeType(Type t, Writer w) {
         w.write(type);
     }
 
-    private void collectInterfaceMethods(JavaClass clazz, List<Method> methods) throws ClassNotFoundException {
+    private void collectInterfaceMethods(JavaClass clazz, List<String> userImplementedInterfacesNames, List<Method> methods) throws ClassNotFoundException {
         JavaClass currentClass = clazz;
 
         while (true) {
@@ -700,6 +699,12 @@ private void collectInterfaceMethods(JavaClass clazz, List<Method> methods) thro
                 queue.add(name);
             }
 
+            for (String userImplementedInterfaceName : userImplementedInterfacesNames) {
+                if (userImplementedInterfaceName != null && !userImplementedInterfaceName.equals("")) {
+                    queue.add(userImplementedInterfaceName);
+                }
+            }
+
             while (!queue.isEmpty()) {
                 String ifaceName = queue.poll();
                 JavaClass currentInterface = getClass(ifaceName);
@@ -755,7 +760,7 @@ private boolean isActivityClass(JavaClass clazz, Map<String, JavaClass> classes)
         while (true) {
             String currentClassname = currentClass.getClassName();
 
-            for (String activityClassName: activityClassNames) {
+            for (String activityClassName : activityClassNames) {
                 isActivityClass = currentClassname.equals(activityClassName);
                 if (isActivityClass) {
                     return true;
@@ -826,7 +831,7 @@ private void cleanPreviouslyAutoGeneratedFiles(File folder) {
         // some javascript files containing native extends are removed,
         // their corresponding java classes will also be removed.
         File[] files = folder.listFiles();
-        for (File file: files) {
+        for (File file : files) {
             if (file.isDirectory()) {
                 this.cleanPreviouslyAutoGeneratedFiles(file);
             } else if ("java".equalsIgnoreCase(this.getFileExtension(file.toString()))) {
@@ -869,4 +874,4 @@ private String readFile(File file) {
             }
         }
     }
-}
+}