refactor: Code cleanup (#165)

pway99 · TeamModerne · web-flow · commit 11253243bde9 · 2021-07-28T09:25:58.000-07:00
* refactor: Code cleanup

Co-authored-by: Moderne &lt;team@moderne.io&gt;

* remove unnecessary cast

Co-authored-by: Moderne &lt;team@moderne.io&gt;
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java
@@ -151,7 +151,7 @@ private static boolean isFloatingPointType(Expression expression) {
             JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(expression.getType());
             if (fullyQualified != null) {
                 String typeName = fullyQualified.getFullyQualifiedName();
-                return (typeName.equals("java.lang.Double") || typeName.equals("java.lang.Float"));
+                return ("java.lang.Double".equals(typeName) || "java.lang.Float".equals(typeName));
             }
 
             JavaType.Primitive parameterType = TypeUtils.asPrimitive(expression.getType());
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java
@@ -145,7 +145,7 @@ private static boolean isFloatingPointType(Expression expression) {
             JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(expression.getType());
             if (fullyQualified != null) {
                 String typeName = fullyQualified.getFullyQualifiedName();
-                return (typeName.equals("java.lang.Double") || typeName.equals("java.lang.Float"));
+                return ("java.lang.Double".equals(typeName) || "java.lang.Float".equals(typeName));
             }
 
             JavaType.Primitive parameterType = TypeUtils.asPrimitive(expression.getType());
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java
@@ -144,7 +144,7 @@ private static boolean isFloatingPointType(Expression expression) {
             JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(expression.getType());
             if (fullyQualified != null) {
                 String typeName = fullyQualified.getFullyQualifiedName();
-                return (typeName.equals("java.lang.Double") || typeName.equals("java.lang.Float"));
+                return ("java.lang.Double".equals(typeName) || "java.lang.Float".equals(typeName));
             }
 
             JavaType.Primitive parameterType = TypeUtils.asPrimitive(expression.getType());
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AssertToAssertions.java b/src/main/java/org/openrewrite/java/testing/junit5/AssertToAssertions.java
@@ -67,10 +67,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             Expression firstArg = args.get(0);
             // Suppress arg-switching for Assertions.assertEquals(String, String)
             if (args.size() == 2) {
-                if (m.getSimpleName().equals("assertSame")
-                        || m.getSimpleName().equals("assertNotSame")
-                        || m.getSimpleName().equals("assertEquals")
-                        || m.getSimpleName().equals("assertNotEquals")) {
+                if ("assertSame".equals(m.getSimpleName())
+                        || "assertNotSame".equals(m.getSimpleName())
+                        || "assertEquals".equals(m.getSimpleName())
+                        || "assertNotEquals".equals(m.getSimpleName())) {
                     return m;
                 }
             }
@@ -101,7 +101,7 @@ private boolean isStringArgument(Expression arg) {
 
         private static boolean isJunitAssertMethod(J.MethodInvocation method) {
             if (method.getType() != null && TypeUtils.isAssignableTo(ASSERTION_TYPE, method.getType().getDeclaringType())) {
-                return !method.getSimpleName().equals("assertThat");
+                return !"assertThat".equals(method.getSimpleName());
             }
             if (!(method.getSelect() instanceof J.Identifier)) {
                 return false;
@@ -111,7 +111,7 @@ private static boolean isJunitAssertMethod(J.MethodInvocation method) {
                 return false;
             }
             JavaType.FullyQualified receiverType = (JavaType.FullyQualified) receiver.getType();
-            return receiverType.getFullyQualifiedName().equals("org.junit.Assert");
+            return "org.junit.Assert".equals(receiverType.getFullyQualifiedName());
         }
     }
 }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/ExpectedExceptionToAssertThrows.java b/src/main/java/org/openrewrite/java/testing/junit5/ExpectedExceptionToAssertThrows.java
@@ -137,7 +137,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl
                 Expression expectMethodArg = args.get(0);
                 isExpectArgAMatcher = isHamcrestMatcher(expectMethodArg);
                 JavaType.FullyQualified argType = TypeUtils.asFullyQualified(expectMethodArg.getType());
-                if (!isExpectArgAMatcher && (argType == null || !argType.getFullyQualifiedName().equals("java.lang.Class"))) {
+                if (!isExpectArgAMatcher && (argType == null || !"java.lang.Class".equals(argType.getFullyQualifiedName()))) {
                     return m;
                 }
             }
@@ -235,7 +235,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl
 
         @Override
         public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
-            if (method.getType() != null && method.getType().getDeclaringType().getFullyQualifiedName().equals("org.junit.rules.ExpectedException")) {
+            if (method.getType() != null && "org.junit.rules.ExpectedException".equals(method.getType().getDeclaringType().getFullyQualifiedName())) {
                 switch (method.getSimpleName()) {
                     case "expect":
                         getCursor().putMessageOnFirstEnclosing(J.MethodDeclaration.class, "expectedExceptionMethodInvocation", method);
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java b/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java
@@ -99,7 +99,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                 Cursor classDeclCursor = getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance);
                 // methods having names starting with parametersFor... are init methods
                 if (m.getSimpleName().startsWith(PARAMETERS_FOR_PREFIX)) {
-                    ((Set<String>) classDeclCursor.computeMessageIfAbsent(INIT_METHOD_REFERENCES, v -> new HashSet<String>())).add(m.getSimpleName());
+                    classDeclCursor.computeMessageIfAbsent(INIT_METHOD_REFERENCES, v -> new HashSet<>()).add(m.getSimpleName());
                 }
                 return m;
             }
@@ -112,7 +112,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ex
                     String annotationArgumentValue = getAnnotationArgumentForInitMethod(anno, "method", "named");
                     if (annotationArgumentValue != null) {
                         for (String method : annotationArgumentValue.split(",")) {
-                            ((Set<String>) classDeclCursor.computeMessageIfAbsent(INIT_METHOD_REFERENCES, v -> new HashSet<String>())).add(method);
+                            classDeclCursor.computeMessageIfAbsent(INIT_METHOD_REFERENCES, v -> new HashSet<>()).add(method);
                         }
                     } else if (anno.getArguments() != null && !anno.getArguments().isEmpty()) {
                         // This conversion is not supported add a comment to the annotation and the method name to the not supported list
@@ -130,15 +130,15 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ex
                     String namedInitMethod = getLiteralAnnotationArgumentValue(annotation);
                     if (namedInitMethod != null) {
                         J.MethodDeclaration m = getCursor().dropParentUntil(J.MethodDeclaration.class::isInstance).getValue();
-                        ((Set<String>) classDeclCursor.computeMessageIfAbsent(INIT_METHOD_REFERENCES, v -> new HashSet<String>())).add(m.getSimpleName());
-                        classDeclCursor.computeMessageIfAbsent(INIT_METHODS_MAP, v -> new HashMap<String, String>()).put(namedInitMethod, m.getSimpleName());
+                        classDeclCursor.computeMessageIfAbsent(INIT_METHOD_REFERENCES, v -> new HashSet<>()).add(m.getSimpleName());
+                        classDeclCursor.computeMessageIfAbsent(INIT_METHODS_MAP, v -> new HashMap<>()).put(namedInitMethod, m.getSimpleName());
                     }
                 } else if (TEST_CASE_NAME_MATCHER.matches(anno)) {
                     // test name for ParameterizedTest argument
                     Object testNameArg = getLiteralAnnotationArgumentValue(anno);
                     String testName = testNameArg != null ? testNameArg.toString() : "{method}({params}) [{index}]";
                     J.MethodDeclaration md = getCursor().dropParentUntil(J.MethodDeclaration.class::isInstance).getValue();
-                    classDeclCursor.computeMessageIfAbsent(INIT_METHODS_MAP, v -> new HashMap<String, String>()).put(md.getSimpleName(), testName);
+                    classDeclCursor.computeMessageIfAbsent(INIT_METHODS_MAP, v -> new HashMap<>()).put(md.getSimpleName(), testName);
                 }
                 return anno;
             }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java b/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java
@@ -146,9 +146,9 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
             J.MethodDeclaration md = super.visitMethodDeclaration(method, executionContext);
             if (md.getSimpleName().startsWith("test") && md.getLeadingAnnotations().stream().noneMatch(JUNIT_TEST_ANNOTATION_MATCHER::matches)) {
                 md = updateMethodDeclarationAnnotationAndModifier(md, "@Test", "org.junit.jupiter.api.Test");
-            } else if (md.getSimpleName().equals("setUp")) {
+            } else if ("setUp".equals(md.getSimpleName())) {
                 md = updateMethodDeclarationAnnotationAndModifier(md, "@BeforeEach", "org.junit.jupiter.api.BeforeEach");
-            } else if (md.getSimpleName().equals("tearDown")) {
+            } else if ("tearDown".equals(md.getSimpleName())) {
                 md = updateMethodDeclarationAnnotationAndModifier(md, "@AfterEach", "org.junit.jupiter.api.AfterEach");
             }
             return md;
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java b/src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java
@@ -131,7 +131,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
                     variableForInitMethod = variableForInitMethod.withTypeExpression(variableForInitMethod.getTypeExpression().withPrefix(Space.EMPTY).withComments(new ArrayList<>()));
                 }
                 //noinspection unchecked
-                ((TreeMap<Integer, Statement>) params.computeIfAbsent(FIELD_INJECTION_ARGUMENTS, v -> new TreeMap<Integer, Statement>())).put(position, variableForInitMethod);
+                ((TreeMap<Integer, Statement>) params.computeIfAbsent(FIELD_INJECTION_ARGUMENTS, v -> new TreeMap<>())).put(position, variableForInitMethod);
 
             }
             return variableDeclarations;
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java b/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java
@@ -161,7 +161,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
             JavaType newFolderMethodDeclaration = methods
                     .filter(m -> {
                         List<Statement> params = m.getParameters();
-                        return m.getSimpleName().equals("newFolder")
+                        return "newFolder".equals(m.getSimpleName())
                                 && params.size() == 2
                                 && params.get(0).hasClassType(FILE_TYPE)
                                 && params.get(1).hasClassType(STRING_TYPE);
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java b/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
@@ -127,7 +127,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                             String assignParamName = ((J.Identifier) assign.getVariable()).getSimpleName();
                             Expression e = assign.getAssignment();
 
-                            if (assignParamName.equals("expected")) {
+                            if ("expected".equals(assignParamName)) {
                                 assert e instanceof J.FieldAccess;
 
                                 m = m.withTemplate(JavaTemplate.builder(this::getCursor, "Object o = () -> #{}").build(),
@@ -146,7 +146,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                                         e, lambda);
 
                                 maybeAddImport("org.junit.jupiter.api.Assertions", "assertThrows");
-                            } else if (assignParamName.equals("timeout")) {
+                            } else if ("timeout".equals(assignParamName)) {
                                 doAfterVisit(new AddTimeoutAnnotationStep(m, e));
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private static boolean isFloatingPointType(Expression expression) {`
`151`	`151`	`JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(expression.getType());`
`152`	`152`	`if (fullyQualified != null) {`
`153`	`153`	`String typeName = fullyQualified.getFullyQualifiedName();`
`154`		`- return (typeName.equals("java.lang.Double") \|\| typeName.equals("java.lang.Float"));`
	`154`	`+ return ("java.lang.Double".equals(typeName) \|\| "java.lang.Float".equals(typeName));`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`JavaType.Primitive parameterType = TypeUtils.asPrimitive(expression.getType());`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ private static boolean isFloatingPointType(Expression expression) {`
`145`	`145`	`JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(expression.getType());`
`146`	`146`	`if (fullyQualified != null) {`
`147`	`147`	`String typeName = fullyQualified.getFullyQualifiedName();`
`148`		`- return (typeName.equals("java.lang.Double") \|\| typeName.equals("java.lang.Float"));`
	`148`	`+ return ("java.lang.Double".equals(typeName) \|\| "java.lang.Float".equals(typeName));`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`JavaType.Primitive parameterType = TypeUtils.asPrimitive(expression.getType());`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ private static boolean isFloatingPointType(Expression expression) {`
`144`	`144`	`JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(expression.getType());`
`145`	`145`	`if (fullyQualified != null) {`
`146`	`146`	`String typeName = fullyQualified.getFullyQualifiedName();`
`147`		`- return (typeName.equals("java.lang.Double") \|\| typeName.equals("java.lang.Float"));`
	`147`	`+ return ("java.lang.Double".equals(typeName) \|\| "java.lang.Float".equals(typeName));`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`JavaType.Primitive parameterType = TypeUtils.asPrimitive(expression.getType());`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu`
`67`	`67`	`Expression firstArg = args.get(0);`
`68`	`68`	`// Suppress arg-switching for Assertions.assertEquals(String, String)`
`69`	`69`	`if (args.size() == 2) {`
`70`		`- if (m.getSimpleName().equals("assertSame")`
`71`		`- \|\| m.getSimpleName().equals("assertNotSame")`
`72`		`- \|\| m.getSimpleName().equals("assertEquals")`
`73`		`- \|\| m.getSimpleName().equals("assertNotEquals")) {`
	`70`	`+ if ("assertSame".equals(m.getSimpleName())`
	`71`	`+ \|\| "assertNotSame".equals(m.getSimpleName())`
	`72`	`+ \|\| "assertEquals".equals(m.getSimpleName())`
	`73`	`+ \|\| "assertNotEquals".equals(m.getSimpleName())) {`
`74`	`74`	`return m;`
`75`	`75`	`}`
`76`	`76`	`}`
`@@ -101,7 +101,7 @@ private boolean isStringArgument(Expression arg) {`
`101`	`101`
`102`	`102`	`private static boolean isJunitAssertMethod(J.MethodInvocation method) {`
`103`	`103`	`if (method.getType() != null && TypeUtils.isAssignableTo(ASSERTION_TYPE, method.getType().getDeclaringType())) {`
`104`		`- return !method.getSimpleName().equals("assertThat");`
	`104`	`+ return !"assertThat".equals(method.getSimpleName());`
`105`	`105`	`}`
`106`	`106`	`if (!(method.getSelect() instanceof J.Identifier)) {`
`107`	`107`	`return false;`
`@@ -111,7 +111,7 @@ private static boolean isJunitAssertMethod(J.MethodInvocation method) {`
`111`	`111`	`return false;`
`112`	`112`	`}`
`113`	`113`	`JavaType.FullyQualified receiverType = (JavaType.FullyQualified) receiver.getType();`
`114`		`- return receiverType.getFullyQualifiedName().equals("org.junit.Assert");`
	`114`	`+ return "org.junit.Assert".equals(receiverType.getFullyQualifiedName());`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m`
`131`	`131`	`variableForInitMethod = variableForInitMethod.withTypeExpression(variableForInitMethod.getTypeExpression().withPrefix(Space.EMPTY).withComments(new ArrayList<>()));`
`132`	`132`	`}`
`133`	`133`	`//noinspection unchecked`
`134`		`- ((TreeMap<Integer, Statement>) params.computeIfAbsent(FIELD_INJECTION_ARGUMENTS, v -> new TreeMap<Integer, Statement>())).put(position, variableForInitMethod);`
	`134`	`+ ((TreeMap<Integer, Statement>) params.computeIfAbsent(FIELD_INJECTION_ARGUMENTS, v -> new TreeMap<>())).put(position, variableForInitMethod);`
`135`	`135`
`136`	`136`	`}`
`137`	`137`	`return variableDeclarations;`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex`
`127`	`127`	`String assignParamName = ((J.Identifier) assign.getVariable()).getSimpleName();`
`128`	`128`	`Expression e = assign.getAssignment();`
`129`	`129`
`130`		`- if (assignParamName.equals("expected")) {`
	`130`	`+ if ("expected".equals(assignParamName)) {`
`131`	`131`	`assert e instanceof J.FieldAccess;`
`132`	`132`
`133`	`133`	`m = m.withTemplate(JavaTemplate.builder(this::getCursor, "Object o = () -> #{}").build(),`
`@@ -146,7 +146,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex`
`146`	`146`	`e, lambda);`
`147`	`147`
`148`	`148`	`maybeAddImport("org.junit.jupiter.api.Assertions", "assertThrows");`
`149`		`- } else if (assignParamName.equals("timeout")) {`
	`149`	`+ } else if ("timeout".equals(assignParamName)) {`
`150`	`150`	`doAfterVisit(new AddTimeoutAnnotationStep(m, e));`
`151`	`151`	`}`
`152`	`152`	`}`