Push down method and variable name matching into utils

Author: timtebeek

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

@@ -17,6 +17,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import lombok.AccessLevel;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.internal.StringUtils;
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
@@ -41,21 +42,27 @@ static boolean isEffectivelyGetter(J.MethodDeclaration method) {
                 !(method.getBody().getStatements().get(0) instanceof J.Return)) {
             return false;
         }
+        // Check return: type and matching field name
         Expression returnExpression = ((J.Return) method.getBody().getStatements().get(0)).getExpression();
-        //returns just an identifier
         if (returnExpression instanceof J.Identifier) {
             J.Identifier identifier = (J.Identifier) returnExpression;
-            JavaType.Variable fieldType = identifier.getFieldType();
-            return method.getType().equals(fieldType.getType());
+            return hasMatchingTypeAndName(method, identifier.getType(), identifier.getSimpleName());
         } else if (returnExpression instanceof J.FieldAccess) {
             J.FieldAccess fieldAccess = (J.FieldAccess) returnExpression;
-            JavaType fieldType = fieldAccess.getType();
-            return method.getType().equals(fieldType);
+            return hasMatchingTypeAndName(method, fieldAccess.getType(), fieldAccess.getSimpleName());
         }
         return false;
     }
 
-    static String deriveGetterMethodName(JavaType type, String fieldName) {
+    private static boolean hasMatchingTypeAndName(J.MethodDeclaration method, @Nullable JavaType type, String simpleName) {
+        if (method.getType().equals(type)) {
+            String deriveGetterMethodName = deriveGetterMethodName(type, simpleName);
+            return method.getSimpleName().equals(deriveGetterMethodName);
+        }
+        return false;
+    }
+
+    private static String deriveGetterMethodName(@Nullable JavaType type, String fieldName) {
         if (type == JavaType.Primitive.Boolean) {
             boolean alreadyStartsWithIs = fieldName.length() >= 3 &&
                     fieldName.substring(0, 3).matches("is[A-Z]");

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

@@ -34,7 +34,6 @@
 import java.util.Set;
 
 import static java.util.Comparator.comparing;
-import static org.openrewrite.java.tree.JavaType.Variable;
 
 @Value
 @EqualsAndHashCode(callSuper = false)
@@ -92,24 +91,18 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
         @Override
         public J.@Nullable MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
             if (method.getMethodType() != null && LombokUtils.isEffectivelyGetter(method)) {
-                J.Return return_ = (J.Return) method.getBody().getStatements().get(0);
-                Expression returnExpression = return_.getExpression();
+                Set<Finding> set = getCursor().getNearestMessage(FIELDS_TO_DECORATE_KEY);
+                Expression returnExpression = ((J.Return) method.getBody().getStatements().get(0)).getExpression();
                 if (returnExpression instanceof J.Identifier) {
-                    J.Identifier identifier = (J.Identifier) returnExpression;
-                    String deriveGetterMethodName = LombokUtils.deriveGetterMethodName(identifier.getType(), identifier.getSimpleName());
-                    if (method.getSimpleName().equals(deriveGetterMethodName)) {
-                        ((Set<Finding>) getCursor().getNearestMessage(FIELDS_TO_DECORATE_KEY))
-                                .add(new Finding(identifier.getSimpleName(), LombokUtils.getAccessLevel(method.getModifiers())));
-                        return null;
-                    }
+                    set.add(new Finding(
+                            ((J.Identifier) returnExpression).getSimpleName(),
+                            LombokUtils.getAccessLevel(method.getModifiers())));
+                    return null;
                 } else if (returnExpression instanceof J.FieldAccess) {
-                    J.FieldAccess fieldAccess = (J.FieldAccess) returnExpression;
-                    String deriveGetterMethodName = LombokUtils.deriveGetterMethodName(fieldAccess.getType(), fieldAccess.getSimpleName());
-                    if (method.getSimpleName().equals(deriveGetterMethodName)) {
-                        ((Set<Finding>) getCursor().getNearestMessage(FIELDS_TO_DECORATE_KEY))
-                                .add(new Finding(fieldAccess.getSimpleName(), LombokUtils.getAccessLevel(method.getModifiers())));
-                        return null;
-                    }
+                    set.add(new Finding(
+                            ((J.FieldAccess) returnExpression).getSimpleName(),
+                            LombokUtils.getAccessLevel(method.getModifiers())));
+                    return null;
                 }
             }
             return method;

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

@@ -248,7 +248,7 @@ class A {
                   public A() {
                   }
 
-                  long getfoo() {//return type wrong
+                  long getFoo() { //return type wrong
                       return foo;
                   }
               }