openrewrite#141 re-order static member

kevin0x90 · Oct 16, 2023 · b66f1cb · b66f1cb
1 parent 1c005f4
commit b66f1cb
Showing 1 changed file with 11 additions and 11 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
@@ -105,6 +105,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
 
  private static class LombokValueToRecordVisitor extends JavaIsoVisitor<ExecutionContext> {
 
+ private static final Pattern LOMBOK_ANNOTATION_PATTERN = Pattern.compile("^lombok.*");
+
  private static final JavaTemplate TO_STRING_TEMPLATE = JavaTemplate
  .builder("@Override public String toString() { return \"#{}(\" +\n#{}\n\")\"; }")
  .contextSensitive()
@@ -214,15 +216,6 @@ public J.ClassDeclaration visitClassDeclaration(final J.ClassDeclaration cd, fin
  return maybeAutoFormat(cd, classDeclaration, ctx);
  }
 
- private static boolean isRelevantClass(final J.ClassDeclaration classDeclaration) {
- return !isRecord(classDeclaration)
- && hasOnlyLombokValueAnnotation(classDeclaration)
- && !hasGenericTypeParameter(classDeclaration)
- && !hasExplicitMethods(classDeclaration)
- && !hasExplicitConstructor(classDeclaration)
- && classDeclaration.getType() != null;
- }
-
  private J.ClassDeclaration addExactToStringMethod(final J.ClassDeclaration classDeclaration,
  final List<J.VariableDeclarations> memberVariables) {
  return classDeclaration.withBody(TO_STRING_TEMPLATE
@@ -232,6 +225,15 @@ private J.ClassDeclaration addExactToStringMethod(final J.ClassDeclaration class
  memberVariablesToString(getMemberVariableNames(memberVariables))));
  }
 
+ private static boolean isRelevantClass(final J.ClassDeclaration classDeclaration) {
+ return !isRecord(classDeclaration)
+ && hasOnlyLombokValueAnnotation(classDeclaration)
+ && !hasGenericTypeParameter(classDeclaration)
+ && !hasExplicitMethods(classDeclaration)
+ && !hasExplicitConstructor(classDeclaration)
+ && classDeclaration.getType() != null;
+ }
+
  private static String memberVariablesToString(final Set<String> memberVariables) {
  return memberVariables
  .stream()
@@ -336,8 +338,6 @@ private static boolean hasMemberVariableAssignments(final List<J.VariableDeclara
  .anyMatch(J.Literal.class::isInstance);
  }
 
- private static final Pattern LOMBOK_ANNOTATION_PATTERN = Pattern.compile("^lombok.*");
-
  private static boolean hasOnlyLombokValueAnnotation(final J.ClassDeclaration cd) {
  return cd.getAllAnnotations()
  .stream()