Merge pull request #23 from NativeScript/pete/blacklist-gps-internals

Blacklist Google Play Services internal members

Author: petekanev

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

@@ -60,6 +60,8 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
                 JavaClass currClass = javaClasses.get(i);
                 currentFileClassname = currClass.getClassName();
 
+                String simpleClassName = getSimpleClassname(currClass);
+
                 if (currentFileClassname.startsWith("java.util.function") ||
                         currentFileClassname.startsWith("android.support.v4.media.routing.MediaRouterJellybeanMr1") ||
                         currentFileClassname.startsWith("android.support.v4.media.routing.MediaRouterJellybeanMr2") ||
@@ -84,13 +86,15 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
                 List<JavaClass> interfaces = getInterfaces(currClass);
                 String extendsLine = getExtendsLine(superClass, interfaces);
 
-                if (getSimpleClassname(currClass).equals("AccessibilityDelegate")) {
+                if (simpleClassName.equals("AccessibilityDelegate")) {
                     sbContent.appendln(tabs + "export class " + getFullClassNameConcatenated(currClass) + extendsLine + " {");
                 } else {
-                    sbContent.appendln(tabs + "export" + (isAbstract && !isInterface ? " abstract " : " ") + "class " + getSimpleClassname(currClass) + extendsLine + " {");
+                    sbContent.appendln(tabs + "export" + (isAbstract && !isInterface ? " abstract " : " ") + "class " + simpleClassName + extendsLine + " {");
                 }
                 // process member scope
 
+                mapNameMethod = new HashMap<String, Method>();
+
                 // process constructors for interfaces
                 if (isInterface) {
                     List<JavaClass> allInterfaces = getAllInterfaces(currClass);
@@ -175,7 +179,7 @@ private String getExtendsLine(JavaClass superClass, List<JavaClass> interfaces)
 
             for (JavaClass clazz : interfaces) {
                 String implementedInterface = clazz.getClassName().replaceAll("\\$", "\\.");
-                if(!typeBelongsInCurrentTopLevelNamespace(implementedInterface)) {
+                if (!typeBelongsInCurrentTopLevelNamespace(implementedInterface)) {
                     implementedInterface = getAliasedClassName(implementedInterface);
                 }
 
@@ -187,7 +191,7 @@ private String getExtendsLine(JavaClass superClass, List<JavaClass> interfaces)
         }
 
         String extendedClass = superClass.getClassName().replaceAll("\\$", "\\.");
-        if(!typeBelongsInCurrentTopLevelNamespace(extendedClass)) {
+        if (!typeBelongsInCurrentTopLevelNamespace(extendedClass)) {
             extendedClass = getAliasedClassName(extendedClass);
         }
 
@@ -441,6 +445,8 @@ private Set<Field> getAllInterfacesFields(List<JavaClass> interfaces) {
     private void processMethod(Method m, JavaClass clazz, boolean isInterface, Set<String> methodsSet) {
         String name = m.getName();
 
+        if (isPrivateGoogleApiMember(name)) return;
+
         if (m.isSynthetic() || (!m.isPublic() && !m.isProtected())) {
             return;
         }
@@ -498,10 +504,9 @@ private void writeMethods(Set<String> methodsSet) {
     }
 
     private void cacheMethodBySignature(Method m) {
-        mapNameMethod = new HashMap<String, Method>();
-        String currMethodSig = getMethodFullSignature(m);
-        if (!mapNameMethod.containsKey(currMethodSig)) {
-            mapNameMethod.put(currMethodSig, m);
+        String methodName = m.getName();
+        if (!mapNameMethod.containsKey(methodName)) {
+            mapNameMethod.put(methodName, m);
         }
     }
 
@@ -613,6 +618,10 @@ private String getMethodParamSignature(JavaClass clazz, Method m) {
 
     //field related
     private void processField(Field f, JavaClass clazz) {
+        String fieldName = f.getName();
+
+        if (isPrivateGoogleApiMember(fieldName)) return;
+
         String tabs = getTabs(this.indent + 1);
         sbContent.append(tabs + "public ");
         if (f.isStatic()) {
@@ -652,7 +661,7 @@ private String getTypeScriptTypeFromJavaType(JavaClass clazz, Type type) {
                 convertToTypeScriptType(type, sb);
                 tsType = sb.toString();
 
-                if (tsType.startsWith("java.util.function")) {
+                if (tsType.startsWith("java.util.function") || isPrivateGoogleApiClass(tsType)) {
                     tsType = "any /* " + tsType + "*/";
                 }
         }
@@ -691,7 +700,7 @@ private void convertToTypeScriptType(Type type, StringBuilder tsType) {
                 typeName = typeName.replaceAll("\\$", "\\.");
             }
 
-            if (!typeBelongsInCurrentTopLevelNamespace(typeName) && !typeName.startsWith("java.util.function.")) {
+            if (!typeBelongsInCurrentTopLevelNamespace(typeName) && !typeName.startsWith("java.util.function.") && !isPrivateGoogleApiClass(typeName)) {
                 tsType.append(getAliasedClassName(typeName));
             } else {
                 tsType.append(typeName);
@@ -763,6 +772,15 @@ private String getTabs(int count) {
         return tabs;
     }
 
+    private boolean isPrivateGoogleApiMember(String memberName) {
+        return memberName.startsWith("zz");
+    }
+
+    private boolean isPrivateGoogleApiClass(String name) {
+        String[] classNameParts = name.replace('$', '.').split("\\.");
+        return classNameParts.length > 0 && classNameParts[classNameParts.length - 1].startsWith("zz");
+    }
+
     private void overrideFieldComparator() {
         BCELComparator cmp = Field.getComparator();
 

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

@@ -22,7 +22,7 @@ public class FileWriter {
 
     public FileWriter(File outDir, boolean writeMultipleFiles) {
         this.writeMultipleFiles = writeMultipleFiles;
-        this.defaultDtsFileName = DEFAULT_DTS_FILE_NAME;
+        this.defaultDtsFileName = DEFAULT_DTS_FILE_NAME + java.util.UUID.randomUUID().toString();
         this.outDir = outDir;
     }
 
@@ -37,7 +37,7 @@ public void write(String content, String fileName) {
                 String outFile = this.outDir.getAbsolutePath() + File.separator + this.defaultDtsFileName + ".d.ts";
                 this.ps = new PrintStream(new FileOutputStream(outFile, /*append*/true));
 
-                //add helpers reference to the top of the file
+                // add helpers reference to the top of the file
                 if(this.isFirstRun) {
                     ps.println("/// <reference path=\"./_helpers.d.ts\" />");
                     this.isFirstRun = false;

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

@@ -49,7 +49,7 @@ private void writeHelperTypings() {
                 "}\n");
 
         boolean append = false;
-        
+
         for (String helper : helperTypings) {
             this.fw.writeHelperTypings(helper, append);
             append = true;