Merge pull request #1323 from NativeScript/vmutafov/sbg-refactoring-rel

Improve handling of nested Java class name writing

Author: vtrifonov

test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/generating/parsing/classes/hierarchy/generics/impl/GenericsAwareClassHierarchyParserImpl.java

@@ -276,7 +276,7 @@ private Pattern getNestedGenericArgumentRegexPattern(String providedFormalTypePa
         Pattern cachedPattern = NESTED_GENERICS_REGEX_CACHE.get(providedFormalTypeParameterKey);
 
         if (cachedPattern == null) {
-            Pattern pattern = Pattern.compile("([^\\w\\[]*)" + providedFormalTypeParameterKey + "([^\\w\\[]*)");
+            Pattern pattern = Pattern.compile("([^\\w\\.])" + providedFormalTypeParameterKey + "(\\W)");
             NESTED_GENERICS_REGEX_CACHE.put(providedFormalTypeParameterKey, pattern);
             return pattern;
         }

test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/generating/parsing/methods/impl/MethodSignatureReifier.java

@@ -4,6 +4,7 @@
 import org.nativescript.staticbindinggenerator.generating.parsing.classes.hierarchy.generics.GenericParameters;
 import org.nativescript.staticbindinggenerator.generating.parsing.methods.JavaMethod;
 import org.nativescript.staticbindinggenerator.generating.parsing.methods.ReifiedJavaMethod;
+import org.nativescript.staticbindinggenerator.naming.BcelNamingUtil;
 import org.nativescript.staticbindinggenerator.naming.JavaClassNames;
 import org.objectweb.asm.signature.SignatureReader;
 import org.objectweb.asm.util.TraceSignatureVisitor;
@@ -72,7 +73,7 @@ private GenericParameters getResolvedFormalTypeParametersFromDeclaringClass(Java
             return initialJavaClassGenericHierarchyView.getAllImplementedInterfaces().get(interfaceName);
         } else {
             String className = javaMethod.getDeclaringClassName();
-            if(initialJavaClassGenericHierarchyView.getInitialClassName().equals(className)){
+            if (initialJavaClassGenericHierarchyView.getInitialClassName().equals(className)) {
                 return initialJavaClassGenericHierarchyView.getInitialClassGenericParameters();
             }
             return initialJavaClassGenericHierarchyView.getAllParentClasses().get(className);
@@ -84,11 +85,12 @@ private String reifyArgumentsDeclarationIfNecessary(String declaration, GenericP
         String reifiedDeclaration = declaration;
 
         for (Map.Entry<String, String> resolvedFormalTypeParameter : resolvedFormalTypeParameters.getGenericParameters().entrySet()) {
-            Pattern pattern = Pattern.compile("(\\W)" + resolvedFormalTypeParameter.getKey() + "(\\W)");
+            Pattern pattern = Pattern.compile("([^\\w\\.])" + resolvedFormalTypeParameter.getKey() + "(\\W)");
 
             Matcher m = pattern.matcher(declaration);
             if (m.find()) {
-                reifiedDeclaration = m.replaceAll("$1" + resolvedFormalTypeParameter.getValue() + "$2");
+                String replacement = BcelNamingUtil.resolveClassName(resolvedFormalTypeParameter.getValue());
+                reifiedDeclaration = m.replaceAll("$1" + replacement + "$2");
             }
         }
 
@@ -102,15 +104,16 @@ private String reifyReturnTypeIfNecessary(String returnType, GenericParameters r
             if (returnType.equals(resolvedFormalTypeParameter.getKey())) {
                 return resolvedFormalTypeParameter.getValue();
             } else {
-                Pattern pattern = Pattern.compile("(\\W)" + resolvedFormalTypeParameter.getKey() + "(\\W)");
+                Pattern pattern = Pattern.compile("([^\\w\\.])" + resolvedFormalTypeParameter.getKey() + "(\\W)");
                 Matcher m = pattern.matcher(returnType);
                 if (m.find()) {
-                    reifiedReturnType = m.replaceAll("$1" + resolvedFormalTypeParameter.getValue() + "$2");
+                    String replacement = BcelNamingUtil.resolveClassName(resolvedFormalTypeParameter.getValue());
+                    reifiedReturnType = m.replaceAll("$1" + replacement + "$2");
                 }
             }
         }
 
-        return reifiedReturnType;
+        return reifiedReturnType.replaceAll("\\$", ".");
     }
 
     private List<String> getReifiedArgumentsFromReifiedDeclaration(String reifiedDeclaration) {
@@ -148,6 +151,8 @@ private List<String> getReifiedArgumentsFromReifiedDeclaration(String reifiedDec
                 } else {
                     reifiedArgumentBuffer.append(c);
                 }
+            } else if (c == '$') {
+                reifiedArgumentBuffer.append('.');
             } else {
                 reifiedArgumentBuffer.append(c);
             }

test-app/build-tools/static-binding-generator/src/test/java/org/nativescript/staticbindinggenerator/generating/parsing/classes/hierarchy/generics/impl/GenericsAwareClassHierarchyParserImplTest.java

@@ -1,7 +1,5 @@
 package org.nativescript.staticbindinggenerator.generating.parsing.classes.hierarchy.generics.impl;
 
-import com.google.gson.GsonBuilder;
-
 import org.apache.bcel.classfile.JavaClass;
 import org.junit.Before;
 import org.junit.Rule;
@@ -10,7 +8,6 @@
 import org.nativescript.staticbindinggenerator.files.FileSystemHelper;
 import org.nativescript.staticbindinggenerator.files.impl.FileSystemHelperImpl;
 import org.nativescript.staticbindinggenerator.generating.parsing.classes.hierarchy.generics.GenericHierarchyView;
-import org.nativescript.staticbindinggenerator.generating.parsing.classes.hierarchy.generics.GenericParameters;
 import java.util.Map;
 
 public class GenericsAwareClassHierarchyParserImplTest {