openrewrite#141 review feedback adjustments

kevin0x90 · Oct 19, 2023 · 5a7a199 · 5a7a199
1 parent 8409899
commit 5a7a199
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 178 deletions.
diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java b/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java
@@ -19,32 +19,16 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import org.openrewrite.Cursor;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Preconditions;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
+import org.openrewrite.*;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.AnnotationMatcher;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.RemoveAnnotationVisitor;
 import org.openrewrite.java.search.UsesJavaVersion;
-import org.openrewrite.java.tree.Expression;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaType;
-import org.openrewrite.java.tree.Statement;
-import org.openrewrite.java.tree.TypeUtils;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import org.openrewrite.java.tree.*;
+
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -56,7 +40,7 @@
 public class LombokValueToRecord extends Recipe {
 
  @Option(displayName = "useExactToString",
- description = "When set the toString format from Lombok is used in the migrated record.")
+ description = "When set the `toString` format from Lombok is used in the migrated record.")
  boolean useExactToString;
 
  @JsonCreator
@@ -66,24 +50,19 @@ public LombokValueToRecord(final @JsonProperty("useExactToString") boolean useEx
 
  @Override
  public String getDisplayName() {
- return "Convert Value class to Record";
+ return "Convert `@lombok.Value` class to Record";
  }
 
  @Override
  public String getDescription() {
- return "Convert Lombok Value annotated classes to standard Java Record classes in Java 17 or higher.";
+ return "Convert Lombok `@Value` annotated classes to standard Java Records.";
  }
 
  @Override
  public Set<String> getTags() {
  return Collections.singleton("lombok");
  }
 
- @Override
- public Duration getEstimatedEffortPerOccurrence() {
- return Duration.ofMinutes(5);
- }
-
  @Override
  public boolean causesAnotherCycle() {
  return true;
@@ -226,12 +205,12 @@ private J.ClassDeclaration addExactToStringMethod(final J.ClassDeclaration class
  }
 
  private static boolean isRelevantClass(final J.ClassDeclaration classDeclaration) {
- return !isRecord(classDeclaration)
+ return classDeclaration.getType() != null
+ && !isRecord(classDeclaration)
  && hasOnlyLombokValueAnnotation(classDeclaration)
  && !hasGenericTypeParameter(classDeclaration)
  && !hasExplicitMethods(classDeclaration)
- && !hasExplicitConstructor(classDeclaration)
- && classDeclaration.getType() != null;
+ && !hasExplicitConstructor(classDeclaration);
  }
 
  private static String memberVariablesToString(final Set<String> memberVariables) {