Use canonical names instead of literal strings

Author: Fabrice-TIERCELIN

plugin/src/main/java/org/autorefactor/jdt/internal/corext/dom/ASTNodeFactory.java

@@ -1014,9 +1014,16 @@ public Name name(String... names) {
         if (names.length == 0) {
             throw new IllegalArgumentException(null, "Expected at least one name, but was given 0 names"); //$NON-NLS-1$
         }
+
         if (names.length == 1) {
-            return simpleName(names[0]);
+            String[] simpleNames= names[0].split("\\.");
+            if (simpleNames.length == 1) {
+                return simpleName(simpleNames[0]);
+            }
+
+            return ast.newName(simpleNames);
         }
+
         return ast.newName(names);
     }
 

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/AbstractUnitTestCleanUp.java

@@ -341,7 +341,7 @@ private MethodInvocation invokeMethod(final ASTNodeFactory b, final MethodInvoca
         Expression qualifiedMethod;
         if (originalMethod.getExpression() == null && !staticImports.contains(qualifiedMethodName + "." + methodName) //$NON-NLS-1$
                 && !staticImports.contains(qualifiedMethodName + ".*")) { //$NON-NLS-1$
-            qualifiedMethod= b.name(qualifiedMethodName.split("\\.")); //$NON-NLS-1$
+            qualifiedMethod= b.name(qualifiedMethodName);
         } else {
             qualifiedMethod= b.copyExpression(originalMethod);
         }

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/AddAllRatherThanLoopCleanUp.java

@@ -194,9 +194,7 @@ private void replaceWithCollectionsAddAll(final Statement node, final Expression
             final MethodInvocation mi, final Set<String> classesToUseWithImport) {
         ASTNodeFactory b= ctx.getASTBuilder();
         ctx.getRefactorings().replace(node,
-                b.toStatement(b.invoke(
-                        classesToUseWithImport.contains(Collections.class.getCanonicalName()) ? b.name("Collections") //$NON-NLS-1$
-                                : b.name("java", "util", "Collections"), //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+                b.toStatement(b.invoke(b.name(classesToUseWithImport.contains(Collections.class.getCanonicalName()) ? Collections.class.getSimpleName() : Collections.class.getCanonicalName()),
                         "addAll", mi.getExpression() != null ? b.copy(mi.getExpression()) : b.this0(), //$NON-NLS-1$
                         b.copy(iterable))));
     }

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/BooleanCleanUp.java

@@ -467,9 +467,9 @@ private Expression getExpression(Expression condition, String expressionTypeName
 
     private Name getBooleanName(ASTNode node) {
         if (!isSimpleNameAlreadyUsed("Boolean", ASTNodes.getAncestor(node, CompilationUnit.class))) { //$NON-NLS-1$
-            return b.name("Boolean"); //$NON-NLS-1$
+            return b.simpleName("Boolean"); //$NON-NLS-1$
         }
-        return b.name(Boolean.class.getCanonicalName());
+        return b.simpleName(Boolean.class.getCanonicalName());
     }
 
     private boolean isSimpleNameAlreadyUsed(String simpleName, CompilationUnit cu) {

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/EnumSetRatherThanHashSetCleanUp.java

@@ -37,6 +37,7 @@
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.MethodInvocation;
+import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.TypeLiteral;
 
@@ -112,19 +113,18 @@ boolean maybeReplace(ClassInstanceCreation cic, Set<String> alreadyImportedClass
         ASTNodeFactory b= ctx.getASTBuilder();
         List<Expression> arguments= ASTNodes.arguments(cic);
         final MethodInvocation invocation;
+        final Name newClassName= b.name(alreadyImportedClasses.contains(EnumSet.class.getCanonicalName()) ? EnumSet.class.getSimpleName() : EnumSet.class.getCanonicalName());
 
         if (!arguments.isEmpty() && ASTNodes.instanceOf(arguments.get(0), Collection.class.getCanonicalName())) {
             Expression typeArg= arguments.get(0);
             if (!ASTNodes.instanceOf(typeArg, EnumSet.class.getCanonicalName())) {
                 return true;
             }
-            invocation= b.invoke(alreadyImportedClasses.contains(EnumSet.class.getCanonicalName()) ? b.name("EnumSet") //$NON-NLS-1$
-                    : b.name("java", "util", "EnumSet"), "copyOf", b.copy(typeArg)); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$
+            invocation= b.invoke(newClassName, "copyOf", b.copy(typeArg)); //$NON-NLS-1$
         } else {
             TypeLiteral newTypeLiteral= ctx.getAST().newTypeLiteral();
             newTypeLiteral.setType(b.copy(type));
-            invocation= b.invoke(alreadyImportedClasses.contains(EnumSet.class.getCanonicalName()) ? b.name("EnumSet") //$NON-NLS-1$
-                    : b.name("java", "util", "EnumSet"), "noneOf", newTypeLiteral); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$
+            invocation= b.invoke(newClassName, "noneOf", newTypeLiteral); //$NON-NLS-1$
         }
 
         ctx.getRefactorings().replace(cic, invocation);

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/FillRatherThanLoopCleanUp.java

@@ -124,9 +124,7 @@ private void replaceWithArraysFill(final ForStatement node, final Set<String> cl
             final Assignment assignment, final ArrayAccess arrayAccess) {
         ASTNodeFactory b= ctx.getASTBuilder();
         ctx.getRefactorings().replace(node,
-                b.toStatement(b.invoke(
-                        classesToUseWithImport.contains(Arrays.class.getCanonicalName()) ? b.name("Arrays") //$NON-NLS-1$
-                                : b.name("java", "util", "Arrays"), //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+                b.toStatement(b.invoke(b.name(classesToUseWithImport.contains(Arrays.class.getCanonicalName()) ? Arrays.class.getSimpleName() : Arrays.class.getCanonicalName()),
                         "fill", b.copy(arrayAccess.getArray()), //$NON-NLS-1$
                         b.copy(assignment.getRightHandSide()))));
     }

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/IfRatherThanTwoSwitchCasesCleanUp.java

@@ -224,7 +224,7 @@ private Expression buildEquality(final ASTNodeFactory b, final Expression discri
             equality= b.invoke(b.copy(value), "equals", b.copy(discriminant)); //$NON-NLS-1$
         } else if (value.resolveTypeBinding() != null && value.resolveTypeBinding().isEnum()) {
             equality= b.infixExpression(b.copy(discriminant), InfixExpression.Operator.EQUALS, b.getAST().newQualifiedName(
-                    b.name(value.resolveTypeBinding().getQualifiedName().split("\\.")), b.copy((SimpleName) value))); //$NON-NLS-1$
+                    b.name(value.resolveTypeBinding().getQualifiedName()), b.copy((SimpleName) value))); //$NON-NLS-1$
         } else {
             equality= b.infixExpression(b.parenthesizeIfNeeded(b.copy(discriminant)), InfixExpression.Operator.EQUALS,
                     b.copy(value));

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/Java7HashRatherThanEclipseJava6HashCleanUp.java

@@ -620,8 +620,7 @@ private void refactorHash(final MethodDeclaration node, final Set<String> classe
         }
 
         r.replace(statements.get(0),
-                b.return0(b.invoke(classesToUseWithImport.contains(Objects.class.getCanonicalName()) ? b.name("Objects") //$NON-NLS-1$ $NON-NLS-2$
-                        : b.name("java", "util", "Objects"), "hash", copyOfFields))); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$
+                b.return0(b.invoke(b.name(classesToUseWithImport.contains(Objects.class.getCanonicalName()) ? Objects.class.getSimpleName() : Objects.class.getCanonicalName()), "hash", copyOfFields)));
 
         for (int i= 1; i < statements.size(); i++) {
             r.remove(statements.get(i));

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/LambdaExpressionRatherThanComparatorCleanUp.java

@@ -246,8 +246,7 @@ private void refactorMethod(final ClassInstanceCreation node, final ITypeBinding
         typeMethodRef.setType(b.toType(type, typeNameDecider));
         typeMethodRef.setName(b.copy(method.getName()));
         final MethodInvocation comparingMethod= b
-                .invoke(classesToUseWithImport.contains(Comparator.class.getCanonicalName()) ? b.name("Comparator") //$NON-NLS-1$
-                        : b.name("java", "util", "Comparator"), "comparing", typeMethodRef); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$
+                .invoke(b.name(classesToUseWithImport.contains(Comparator.class.getCanonicalName()) ? Comparator.class.getSimpleName() : Comparator.class.getCanonicalName()), "comparing", typeMethodRef); //$NON-NLS-1$
         if (straightOrder) {
             r.replace(node, comparingMethod);
         } else {
@@ -278,8 +277,7 @@ private void refactorField(final ClassInstanceCreation node, final ITypeBinding
         lambdaExpression.setBody(b.fieldAccess(b.simpleName(identifier1), b.copy(field.getName())));
         lambdaExpression.setParentheses(false);
         final MethodInvocation comparingMethod= b
-                .invoke(classesToUseWithImport.contains(Comparator.class.getCanonicalName()) ? b.name("Comparator") //$NON-NLS-1$
-                        : b.name("java", "util", "Comparator"), "comparing", lambdaExpression); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ $NON-NLS-4$
+                .invoke(b.name(classesToUseWithImport.contains(Comparator.class.getCanonicalName()) ? Comparator.class.getSimpleName() : Comparator.class.getCanonicalName()), "comparing", lambdaExpression); //$NON-NLS-1$
         if (straightOrder) {
             r.replace(node, comparingMethod);
         } else {

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/ObjectsEqualsRatherThanEqualsAndNullCheckCleanUp.java

@@ -237,9 +237,7 @@ private void replaceEquals(final IfStatement node, final Name firstField, final
         final Refactorings r= this.ctx.getRefactorings();
 
         r.replace(node,
-                b.if0(b.not(b.invoke(
-                        classesToUseWithImport.contains(Objects.class.getCanonicalName()) ? b.name("Objects") //$NON-NLS-1$ $NON-NLS-2$
-                                : b.name("java", "util", "Objects"), //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+                b.if0(b.not(b.invoke(b.name(classesToUseWithImport.contains(Objects.class.getCanonicalName()) ? Objects.class.getSimpleName() : Objects.class.getCanonicalName()),
                         "equals", b.copy(firstField), b.copy(secondField))), b.block(b.copy(returnStmt1)))); //$NON-NLS-1$
     }
 }