fix for #502

Author: Mihail Slavchev

binding-generator/src/main/java/com/tns/bindings/Dump.java

@@ -363,7 +363,7 @@ public void generateProxy(ApplicationWriter aw, String proxyName, Class<?> class
 		ClassVisitor cv = generateClass(aw, classTo, classSignature, tnsClassSignature);
 		Method[] methods = getSupportedMethods(classTo, methodOverrides);
 
-		methods = groupMethodsByName(methods);
+		methods = groupMethodsByNameAndSignature(methods);
 
 		generateFields(cv);
 
@@ -376,7 +376,7 @@ public void generateProxy(ApplicationWriter aw, String proxyName, Class<?> class
 		cv.visitEnd();
 	}
 
-	private Method[] groupMethodsByName(Method[] methods)
+	private Method[] groupMethodsByNameAndSignature(Method[] methods)
 	{
 		HashMap<String, Method> result = new HashMap<String, Method>();
 		for (int i = 0; i < methods.length; i++)
@@ -404,50 +404,29 @@ private String getMethodSignature(Method m)
 		return m.getName() + sig.substring(nameIdx, endSigIdx);
 	}
 
-	private Method[] getSupportedMethods(Class<?> clazz, HashSet<String> methodOverrides)
-	{
-		ArrayList<Method> result = new ArrayList<Method>();
-
-		if (clazz.isInterface())
+	private void collectInterfaceMethods(Class<?> clazz, HashSet<String> methodOverrides, List<Method> result) {
+		Set<String> objectMethods = new HashSet<String>();
+		for (Method objMethod: java.lang.Object.class.getDeclaredMethods())
 		{
-			Set<String> objectMethods = new HashSet<String>();
-			for (Method objMethod: java.lang.Object.class.getDeclaredMethods())
+			if (!Modifier.isStatic(objMethod.getModifiers()))
 			{
-				if (!Modifier.isStatic(objMethod.getModifiers()))
-				{
-					String sig = getMethodSignature(objMethod);
-					objectMethods.add(sig);
-				}
+				String sig = getMethodSignature(objMethod);
+				objectMethods.add(sig);
 			}
+		}
 
-			Set<Method> notImplementedObjectMethods = new HashSet<Method>();
-
-			Class[] extendedInterfaces = clazz.getInterfaces();
+		Deque<Class<?>> extendedInterfaces = new ArrayDeque<Class<?>>();
+		if (clazz.isInterface()) {
+			extendedInterfaces.add(clazz);
+		} else {
+			extendedInterfaces.addAll(Arrays.asList(clazz.getInterfaces()));
+		}
 
-			for(Class extendedInterface : extendedInterfaces) {
-				Method[] ifaceMethods = extendedInterface.getDeclaredMethods();
-				for (Method ifaceMethod: ifaceMethods)
-				{
-					if (!Modifier.isStatic(ifaceMethod.getModifiers()))
-					{
-						String sig = getMethodSignature(ifaceMethod);
-						if (objectMethods.contains(sig) && !methodOverrides.contains(ifaceMethod.getName()))
-						{
-							notImplementedObjectMethods.add(ifaceMethod);
-						}
-					}
-				}
+		Set<Method> notImplementedObjectMethods = new HashSet<Method>();
 
-				for (Method ifaceMethod: ifaceMethods)
-				{
-					if (!notImplementedObjectMethods.contains(ifaceMethod))
-					{
-						result.add(ifaceMethod);
-					}
-				}
-			}
-
-			Method[] ifaceMethods = clazz.getDeclaredMethods();
+		while (!extendedInterfaces.isEmpty()) {
+			Class<?> currentInterface = extendedInterfaces.pollFirst();
+			Method[] ifaceMethods = currentInterface.getDeclaredMethods();
 			for (Method ifaceMethod: ifaceMethods)
 			{
 				if (!Modifier.isStatic(ifaceMethod.getModifiers()))
@@ -467,11 +446,22 @@ private Method[] getSupportedMethods(Class<?> clazz, HashSet<String> methodOverr
 					result.add(ifaceMethod);
 				}
 			}
+
+			for (Class<?> iface: currentInterface.getInterfaces()) {
+				extendedInterfaces.add(iface);
+			}
 		}
-		else
+	}
+
+	private Method[] getSupportedMethods(Class<?> clazz, HashSet<String> methodOverrides)
+	{
+		ArrayList<Method> result = new ArrayList<Method>();
+
+		collectInterfaceMethods(clazz, methodOverrides, result);
+
+		if (!clazz.isInterface())
 		{
 			HashMap<String, Method> finalMethods = new HashMap<String, Method>();
-			ArrayList<Class<?>> implementedInterfaces = new ArrayList<Class<?>>();
 			while (clazz != null)
 			{
 				Method[] methods = clazz.getDeclaredMethods();
@@ -489,12 +479,6 @@ private Method[] getSupportedMethods(Class<?> clazz, HashSet<String> methodOverr
 					methodz.add(methods[i]);
 				}
 
-				Class<?>[] interfaces = clazz.getInterfaces();
-				for (int i = 0; i < interfaces.length; i++)
-				{
-					implementedInterfaces.add(interfaces[i]);
-				}
-
 				for (int i = 0; i < methodz.size(); i++)
 				{
 					Method method = methodz.get(i);
@@ -507,47 +491,6 @@ private Method[] getSupportedMethods(Class<?> clazz, HashSet<String> methodOverr
 
 				clazz = clazz.getSuperclass();
 			}
-
-			for (int i = 0; i < implementedInterfaces.size(); i++)
-			{
-				Class<?> implementedInterface = implementedInterfaces.get(i);
-
-				Class[] extendedInterfaces = implementedInterface.getInterfaces();
-
-				for(Class extendedInterface : extendedInterfaces) {
-					Method[] interfaceMethods = extendedInterface.getMethods();
-					for (int j = 0; j < interfaceMethods.length; j++)
-					{
-						Method method = interfaceMethods[j];
-
-						if (methodOverrides != null && !methodOverrides.contains(method.getName()))
-						{
-							continue;
-						}
-
-						if (!isMethodMarkedAsFinalInClassHierarchy(method, finalMethods))
-						{
-							result.add(method);
-						}
-					}
-				}
-
-				Method[] interfaceMethods = implementedInterface.getMethods();
-				for (int j = 0; j < interfaceMethods.length; j++)
-				{
-					Method method = interfaceMethods[j];
-
-					if (methodOverrides != null && !methodOverrides.contains(method.getName()))
-					{
-						continue;
-					}
-
-					if (!isMethodMarkedAsFinalInClassHierarchy(method, finalMethods))
-					{
-						result.add(method);
-					}
-				}
-			}
 		}
 
 		return result.toArray(new Method[result.size()]);

test-app/app/src/main/assets/app/mainpage.js

@@ -44,3 +44,4 @@ require("./tests/java-array-test");
 require("./tests/field-access-test");
 require("./tests/byte-buffer-test");
 require("./tests/dex-interface-implementation");
+require("./tests/testInterfaceImplementation");

test-app/app/src/main/assets/app/tests/testInterfaceImplementation.js

@@ -0,0 +1,30 @@
+describe("Tests Java interfaces are implemented correctly", function () {
+
+	it("should implement all methods when an interface extends other interfaces", function () {
+        var callF = false;
+        var callG = false;
+
+        var i3 = new com.tns.tests.ImplementInterfaceTest.I3({
+            f: function() { callF = true; },
+            g: function() { callG = true; }
+        })
+
+        com.tns.tests.ImplementInterfaceTest.triggerF(i3);
+        com.tns.tests.ImplementInterfaceTest.triggerG(i3);
+
+		expect(callF).toBe(true);
+		expect(callG).toBe(true);
+	});
+
+	it("should call overridden interface method", function () {
+        var callClose = false;
+
+        var c = new java.io.Closeable({
+            close: function() { callClose = true; }
+        })
+
+        com.tns.tests.ImplementInterfaceTest.triggerClose(c);
+
+		expect(callClose).toBe(true);
+	});
+});

test-app/app/src/main/assets/metadata/treeNodeStream.dat

@@ -0,0 +1,29 @@
+package com.tns.tests;
+
+import java.io.IOException;
+
+public class ImplementInterfaceTest {
+    public interface I1 {
+        void f();
+    }
+
+    public interface I2 extends I1 {
+        void g();
+    }
+
+    public interface I3 extends I2 {
+    }
+
+    public static void triggerF(I3 i3) {
+        i3.f();
+    }
+
+    public static void triggerG(I3 i3) {
+        i3.g();
+    }
+
+    public static void triggerClose(java.io.Closeable c) throws IOException {
+        c.close();
+    }
+
+}