Add static and default interface methods support

Author: vmutafov

test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/Builder.java

@@ -12,6 +12,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.telerik.metadata.TreeNode.FieldInfo;
 import com.telerik.metadata.TreeNode.MethodInfo;
@@ -22,6 +23,7 @@
 import com.telerik.metadata.desc.MethodDescriptor;
 import com.telerik.metadata.desc.TypeDescriptor;
 import com.telerik.metadata.dx.DexFile;
+import com.telerik.metadata.parsing.ClassParser;
 
 public class Builder {
     private static class MethodNameComparator implements Comparator<MethodDescriptor> {
@@ -250,33 +252,14 @@ private static void getFieldsFromImplementedInterfaces(ClassDescriptor clazz, Tr
     }
 
     private static MethodDescriptor[] getDefaultMethodsFromImplementedInterfaces(ClassDescriptor clazz, MethodDescriptor[] originalClassMethodDescriptors) {
-        HashSet<MethodDescriptor> defaultMethods = getAllDefaultMethodsFromImplementedInterfaces(clazz);
-        HashSet<MethodDescriptor> classMethods = new HashSet<MethodDescriptor>(Arrays.asList(originalClassMethodDescriptors));
-        defaultMethods.removeAll(classMethods);
-
-        return defaultMethods.toArray(new MethodDescriptor[0]);
-    }
-
-    private static HashSet<MethodDescriptor> getAllDefaultMethodsFromImplementedInterfaces(ClassDescriptor clazz) {
-        return getAllDefaultMethodsFromImplementedInterfacesRecursively(clazz, new HashSet<MethodDescriptor>());
-    }
-
-    private static HashSet<MethodDescriptor> getAllDefaultMethodsFromImplementedInterfacesRecursively(ClassDescriptor clazz, HashSet<MethodDescriptor> collectedDefaultMethods) {
-        String[] implementedInterfacesNames = clazz.getInterfaceNames();
-
-        for (String implementedInterfaceName : implementedInterfacesNames) {
-            ClassDescriptor interfaceClass = ClassRepo.findClass(implementedInterfaceName);
+        ClassParser parser = ClassParser.forClassDescriptor(clazz);
 
-            for (MethodDescriptor md : interfaceClass.getMethods()) {
-                if (!md.isStatic() && !md.isAbstract()) {
-                    collectedDefaultMethods.add(md);
-                }
-            }
+        Set<MethodDescriptor> defaultMethods = parser.getAllDefaultMethodsFromImplementedInterfaces();
+        Set<MethodDescriptor> classMethods = new HashSet<MethodDescriptor>(Arrays.asList(originalClassMethodDescriptors));
 
-            collectedDefaultMethods.addAll(getAllDefaultMethodsFromImplementedInterfacesRecursively(interfaceClass, new HashSet<MethodDescriptor>()));
-        }
+        defaultMethods.removeAll(classMethods);
 
-        return collectedDefaultMethods;
+        return defaultMethods.toArray(new MethodDescriptor[0]);
     }
 
     private static TreeNode getOrCreateNode(TreeNode root, TypeDescriptor type)

test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/ClassParser.java

@@ -0,0 +1,43 @@
+package com.telerik.metadata.parsing;
+
+import com.telerik.metadata.ClassRepo;
+import com.telerik.metadata.desc.ClassDescriptor;
+import com.telerik.metadata.desc.MethodDescriptor;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public final class ClassParser {
+
+    private final ClassDescriptor clazz;
+
+    private ClassParser(ClassDescriptor clazz) {
+        this.clazz = clazz;
+    }
+
+    public static ClassParser forClassDescriptor(ClassDescriptor clazz) {
+        return new ClassParser(clazz);
+    }
+
+    public Set<MethodDescriptor> getAllDefaultMethodsFromImplementedInterfaces() {
+        return getAllDefaultMethodsFromImplementedInterfacesRecursively(clazz, new HashSet<MethodDescriptor>());
+    }
+
+    private HashSet<MethodDescriptor> getAllDefaultMethodsFromImplementedInterfacesRecursively(ClassDescriptor clazz, HashSet<MethodDescriptor> collectedDefaultMethods) {
+        String[] implementedInterfacesNames = clazz.getInterfaceNames();
+
+        for (String implementedInterfaceName : implementedInterfacesNames) {
+            ClassDescriptor interfaceClass = ClassRepo.findClass(implementedInterfaceName);
+
+            for (MethodDescriptor md : interfaceClass.getMethods()) {
+                if (!md.isStatic() && !md.isAbstract()) {
+                    collectedDefaultMethods.add(md);
+                }
+            }
+
+            collectedDefaultMethods.addAll(getAllDefaultMethodsFromImplementedInterfacesRecursively(interfaceClass, new HashSet<MethodDescriptor>()));
+        }
+
+        return collectedDefaultMethods;
+    }
+}