Add remaining checks to make all tests pass

Author: timtebeek

src/main/java/org/openrewrite/java/migrate/lombok/LombokUtils.java

@@ -48,21 +48,21 @@ static boolean isGetter(J.MethodDeclaration method) {
             J.Identifier identifier = (J.Identifier) returnExpression;
             if (identifier.getFieldType() != null && declaringType == identifier.getFieldType().getOwner()) {
                 // Check return: type and matching field name
-                return hasMatchingTypeAndName(method, identifier.getType(), identifier.getSimpleName());
+                return hasMatchingTypeAndGetterName(method, identifier.getType(), identifier.getSimpleName());
             }
         } else if (returnExpression instanceof J.FieldAccess) {
             J.FieldAccess fieldAccess = (J.FieldAccess) returnExpression;
             Expression target = fieldAccess.getTarget();
             if (target instanceof J.Identifier && ((J.Identifier) target).getFieldType() != null &&
                     declaringType == ((J.Identifier) target).getFieldType().getOwner()) {
                 // Check return: type and matching field name
-                return hasMatchingTypeAndName(method, fieldAccess.getType(), fieldAccess.getSimpleName());
+                return hasMatchingTypeAndGetterName(method, fieldAccess.getType(), fieldAccess.getSimpleName());
             }
         }
         return false;
     }
 
-    private static boolean hasMatchingTypeAndName(J.MethodDeclaration method, @Nullable JavaType type, String simpleName) {
+    private static boolean hasMatchingTypeAndGetterName(J.MethodDeclaration method, @Nullable JavaType type, String simpleName) {
         if (method.getType() == type) {
             String deriveGetterMethodName = deriveGetterMethodName(type, simpleName);
             return method.getSimpleName().equals(deriveGetterMethodName);
@@ -83,6 +83,10 @@ private static String deriveGetterMethodName(@Nullable JavaType type, String fie
         return "get" + StringUtils.capitalize(fieldName);
     }
 
+    private static boolean hasMatchingSetterMethodName(J.MethodDeclaration method, String simpleName) {
+        return method.getSimpleName().equals("set" + StringUtils.capitalize(simpleName));
+    }
+
     static boolean isSetter(J.MethodDeclaration method) {
         // Check return type: void
         if (method.getType() != JavaType.Primitive.Void) {
@@ -98,39 +102,39 @@ static boolean isSetter(J.MethodDeclaration method) {
                 !(method.getBody().getStatements().get(0) instanceof J.Assignment)) {
             return false;
         }
-        J.Assignment assignment = (J.Assignment) method.getBody().getStatements().get(0);
-        J.FieldAccess assignedField = (J.FieldAccess) assignment.getVariable();
-        if (!method.getSimpleName().equals(deriveSetterMethodName(assignedField))) {
-            return false;
-        }
+        JavaType.FullyQualified declaringType = method.getMethodType().getDeclaringType();
 
-        // Check argument is assigned to field
+        // Method parameter
         J.VariableDeclarations variableDeclarations = (J.VariableDeclarations) method.getParameters().get(0);
         J.VariableDeclarations.NamedVariable param = variableDeclarations.getVariables().get(0);
 
-        // type of parameter and field have to match
-        if (!param.getType().equals(assignedField.getType())) {
+        // Check there's no up/down cast between parameter and field
+        J.Assignment assignment = (J.Assignment) method.getBody().getStatements().get(0);
+        Expression variable = assignment.getVariable();
+        if (param.getType() != variable.getType()) {
             return false;
         }
 
-        // Check field is declared on method type
-        JavaType.FullyQualified declaringType = method.getMethodType().getDeclaringType();
-        if (assignedField.getTarget() instanceof J.Identifier) {
-            J.Identifier target = (J.Identifier) assignedField.getTarget();
-            return target.getFieldType() != null && declaringType == target.getFieldType().getOwner();
-        } else if (assignedField.getTarget() instanceof J.FieldAccess) {
-            Expression target = ((J.FieldAccess) assignedField.getTarget()).getTarget();
-            return target instanceof J.Identifier && ((J.Identifier) target).getFieldType() != null &&
-                    declaringType == ((J.Identifier) target).getFieldType().getOwner();
+        // Method name has to match
+        if (variable instanceof J.Identifier) {
+            J.Identifier assignedVar = (J.Identifier) variable;
+            if (hasMatchingSetterMethodName(method, assignedVar.getSimpleName())) {
+                // Check field is declared on method type
+                return assignedVar.getFieldType() != null && declaringType == assignedVar.getFieldType().getOwner();
+            }
+        } else if (variable instanceof J.FieldAccess) {
+            J.FieldAccess assignedField = (J.FieldAccess) variable;
+            if (hasMatchingSetterMethodName(method, assignedField.getSimpleName())) {
+                Expression target = assignedField.getTarget();
+                // Check field is declared on method type
+                return target instanceof J.Identifier && ((J.Identifier) target).getFieldType() != null &&
+                        declaringType == ((J.Identifier) target).getFieldType().getOwner();
+            }
         }
 
         return false;
     }
 
-    private static String deriveSetterMethodName(J.FieldAccess fieldAccess) {
-        return "set" + StringUtils.capitalize(fieldAccess.getSimpleName());
-    }
-
     static AccessLevel getAccessLevel(J.MethodDeclaration methodDeclaration) {
         if (methodDeclaration.hasModifier(Public)) {
             return PUBLIC;

src/main/java/org/openrewrite/java/migrate/lombok/UseLombokSetter.java

@@ -1,11 +1,11 @@
 /*
  * Copyright 2024 the original author or authors.
  * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Moderne Source Available License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
+ * https://docs.moderne.io/licensing/moderne-source-available-license
  * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,13 +23,12 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
 
 import java.util.Collections;
 import java.util.Set;
 
-import static org.openrewrite.java.tree.JavaType.Variable;
-
 @Value
 @EqualsAndHashCode(callSuper = false)
 public class UseLombokSetter extends Recipe {
@@ -41,7 +40,6 @@ public String getDisplayName() {
 
     @Override
     public String getDescription() {
-        //language=markdown
         return "Convert trivial setter methods to `@Setter` annotations on their respective fields.";
     }
 
@@ -56,11 +54,21 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             @Override
             public J.@Nullable MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
                 if (LombokUtils.isSetter(method)) {
-                    J.Assignment assignment_ = (J.Assignment) method.getBody().getStatements().get(0);
-                    J.FieldAccess fieldAccess = (J.FieldAccess) assignment_.getVariable();
-                    Variable fieldType = fieldAccess.getName().getFieldType();
-                    doAfterVisit(new FieldAnnotator(Setter.class, fieldType, LombokUtils.getAccessLevel(method)));
-                    return null; //delete
+                    Expression assignmentVariable = ((J.Assignment) method.getBody().getStatements().get(0)).getVariable();
+                    if (assignmentVariable instanceof J.FieldAccess &&
+                            ((J.FieldAccess) assignmentVariable).getName().getFieldType() != null) {
+                        doAfterVisit(new FieldAnnotator(Setter.class,
+                                ((J.FieldAccess) assignmentVariable).getName().getFieldType(),
+                                LombokUtils.getAccessLevel(method)));
+                        return null; //delete
+
+                    } else if (assignmentVariable instanceof J.Identifier &&
+                            ((J.Identifier) assignmentVariable).getFieldType() != null) {
+                        doAfterVisit(new FieldAnnotator(Setter.class,
+                                ((J.Identifier) assignmentVariable).getFieldType(),
+                                LombokUtils.getAccessLevel(method)));
+                        return null; //delete
+                    }
                 }
                 return method;
             }

src/test/java/org/openrewrite/java/migrate/lombok/UseLombokSetterTest.java

@@ -1,11 +1,11 @@
 /*
  * Copyright 2024 the original author or authors.
  * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Moderne Source Available License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
+ * https://docs.moderne.io/licensing/moderne-source-available-license
  * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,