Move repetitive Comparator declarations into Util class

Philzen · Jun 18, 2024 · 7b5b230 · 7b5b230
1 parent 28ea0b4
commit 7b5b230
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 27 deletions.
diff --git a/src/main/java/org/philzen/oss/testng/UpdateTestAnnotationToJunit5.java b/src/main/java/org/philzen/oss/testng/UpdateTestAnnotationToJunit5.java
@@ -20,12 +20,9 @@
 import org.openrewrite.java.tree.JavaType;
 import org.openrewrite.java.tree.TypeUtils;
 import org.philzen.oss.utils.Class;
-import org.philzen.oss.utils.Cleanup;
-import org.philzen.oss.utils.Method;
-import org.philzen.oss.utils.Parser;
+import org.philzen.oss.utils.*;
 
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 
@@ -133,24 +130,19 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
 
                 return JavaTemplate.builder(neededOnAllMethods).javaParser(Parser.jupiter())
                     .imports(JUPITER_TYPE).build()
-                    .apply(getCursor(), method.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName).reversed()));
+                    .apply(getCursor(), m.getCoordinates().addAnnotation(Sort.BELOW));
             }
 
             if (cta.description != null && !J.Literal.isLiteralValue(cta.description, "")) {
                 maybeAddImport(JUPITER_API_NAMESPACE + ".DisplayName");
                 m = displayNameAnnotation.apply(
-                    updateCursor(m),
-                    m.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName).reversed()),
-                    cta.description
+                    updateCursor(m), m.getCoordinates().addAnnotation(Sort.BELOW), cta.description
                 );
             }
 
             if (J.Literal.isLiteralValue(cta.enabled, Boolean.FALSE)) {
                 maybeAddImport(JUPITER_API_NAMESPACE + ".Disabled");
-                m = disabledAnnotation.apply(
-                        updateCursor(m),
-                        m.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName).reversed())
-                );
+                m = disabledAnnotation.apply(updateCursor(m), m.getCoordinates().addAnnotation(Sort.BELOW));
             }
 
             if (cta.expectedException instanceof J.FieldAccess
@@ -181,32 +173,20 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
             if (cta.groups != null) {
                 maybeAddImport(JUPITER_API_NAMESPACE + ".Tag");
                 if (cta.groups instanceof J.Literal && !J.Literal.isLiteralValue(cta.groups, "")) {
-                    m = tagAnnotation.apply(
-                            updateCursor(m),
-                            m.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName).reversed()),
-                            cta.groups
-                    );
+                    m = tagAnnotation.apply(updateCursor(m), m.getCoordinates().addAnnotation(Sort.BELOW), cta.groups);
                 } else if (cta.groups instanceof J.NewArray && ((J.NewArray) cta.groups).getInitializer() != null) {
                     final List<Expression> groups = ((J.NewArray) cta.groups).getInitializer();
                     for (Expression group : groups) {
                         if (group instanceof J.Empty) continue;
-                        m = tagAnnotation.apply(
-                                updateCursor(m),
-                                m.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName).reversed()),
-                                group
-                        );
+                        m = tagAnnotation.apply(updateCursor(m), m.getCoordinates().addAnnotation(Sort.BELOW), group);
                     }
                 }
             }
 
             if (cta.timeout != null) {
                 maybeAddImport("java.util.concurrent.TimeUnit");
                 maybeAddImport(JUPITER_API_NAMESPACE + ".Timeout");
-                m = timeoutAnnotation.apply(
-                        updateCursor(m),
-                        m.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName)),
-                        cta.timeout
-                );
+                m = timeoutAnnotation.apply(updateCursor(m), m.getCoordinates().addAnnotation(Sort.ABOVE), cta.timeout);
             }
 
             return m;

diff --git a/src/main/java/org/philzen/oss/utils/Sort.java b/src/main/java/org/philzen/oss/utils/Sort.java
@@ -0,0 +1,11 @@
+package org.philzen.oss.utils;
+
+import org.openrewrite.java.tree.J;
+
+import java.util.Comparator;
+
+public final class Sort {
+
+    public final static Comparator<J.Annotation> ABOVE = java.util.Comparator.comparing(J.Annotation::getSimpleName);
+    public final static Comparator<J.Annotation> BELOW = java.util.Comparator.comparing(J.Annotation::getSimpleName).reversed();
+}