refactor google private api name checking

Author: petekanev

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

@@ -445,7 +445,7 @@ private Set<Field> getAllInterfacesFields(List<JavaClass> interfaces) {
     private void processMethod(Method m, JavaClass clazz, boolean isInterface, Set<String> methodsSet) {
         String name = m.getName();
 
-        if (name.startsWith("zz")) return;
+        if (isPrivateGoogleApiMember(name)) return;
 
         if (m.isSynthetic() || (!m.isPublic() && !m.isProtected())) {
             return;
@@ -504,9 +504,9 @@ private void writeMethods(Set<String> methodsSet) {
     }
 
     private void cacheMethodBySignature(Method m) {
-        String currMethodSig = m.getName();//getMethodFullSignature(m);
-        if (!mapNameMethod.containsKey(currMethodSig)) {
-            mapNameMethod.put(currMethodSig, m);
+        String methodName = m.getName();
+        if (!mapNameMethod.containsKey(methodName)) {
+            mapNameMethod.put(methodName, m);
         }
     }
 
@@ -620,7 +620,7 @@ private String getMethodParamSignature(JavaClass clazz, Method m) {
     private void processField(Field f, JavaClass clazz) {
         String fieldName = f.getName();
 
-        if (fieldName.startsWith("zz")) return;
+        if (isPrivateGoogleApiMember(fieldName)) return;
 
         String tabs = getTabs(this.indent + 1);
         sbContent.append(tabs + "public ");
@@ -661,7 +661,7 @@ private String getTypeScriptTypeFromJavaType(JavaClass clazz, Type type) {
                 convertToTypeScriptType(type, sb);
                 tsType = sb.toString();
 
-                if (tsType.startsWith("java.util.function") || tsType.contains("zz")) {
+                if (tsType.startsWith("java.util.function") || isPrivateGoogleApiClass(tsType)) {
                     tsType = "any /* " + tsType + "*/";
                 }
         }
@@ -700,7 +700,7 @@ private void convertToTypeScriptType(Type type, StringBuilder tsType) {
                 typeName = typeName.replaceAll("\\$", "\\.");
             }
 
-            if (!typeBelongsInCurrentTopLevelNamespace(typeName) && !typeName.startsWith("java.util.function.") && !typeName.contains("zz")) {
+            if (!typeBelongsInCurrentTopLevelNamespace(typeName) && !typeName.startsWith("java.util.function.") && !isPrivateGoogleApiClass(typeName)) {
                 tsType.append(getAliasedClassName(typeName));
             } else {
                 tsType.append(typeName);
@@ -772,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();