Exclude prefix handling for enums in convert method

openrewrite · Feb 10, 2025 · ab07902 · ab07902
1 parent 888fd2e
commit ab07902
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/...te-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java b/...te-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java
@@ -1655,12 +1655,8 @@ public J visitWildcard(WildcardTree node, Space fmt) {
             return null;
         }
         try {
-            String prefix;
-            if (t instanceof JCNewClass && (((JCNewClass) t).type.tsym.flags() & Flags.ENUM) != 0L) {
-                prefix = "";
-            } else {
-                prefix = source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
-            }
+            String prefix = t instanceof JCNewClass && hasFlag(((JCNewClass) t).type.tsym.flags(), Flags.ENUM) ? ""
+                    : source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
             cursor += prefix.length();
             @SuppressWarnings("unchecked") J2 j = (J2) scan(t, formatWithCommentTree(prefix, (JCTree) t, docCommentTable.getCommentTree((JCTree) t)));
             return j;
@@ -2040,7 +2036,11 @@ private void cursor(int n) {
     }
 
     private boolean hasFlag(ModifiersTree modifiers, long flag) {
-        return (((JCModifiers) modifiers).flags & flag) != 0L;
+        return hasFlag(((JCModifiers) modifiers).flags, flag);
+    }
+
+    private boolean hasFlag(long flags, long flag) {
+        return (flags & flag) != 0L;
     }
 
     @SuppressWarnings("unused")

diff --git a/...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java b/...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
@@ -1738,12 +1738,8 @@ public J visitWildcard(WildcardTree node, Space fmt) {
             return null;
         }
         try {
-            String prefix;
-            if (t instanceof JCNewClass && (((JCNewClass) t).type.tsym.flags() & Flags.ENUM) != 0L) {
-                prefix = "";
-            } else {
-                prefix = source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
-            }
+            String prefix = t instanceof JCNewClass && hasFlag(((JCNewClass) t).type.tsym.flags(), Flags.ENUM) ? ""
+                    : source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
             cursor += prefix.length();
             Space p = formatWithCommentTree(prefix, (JCTree) t, docCommentTable.getCommentTree((JCTree) t));
             @SuppressWarnings("unchecked") J2 j = (J2) scan(t, p);
@@ -2121,7 +2117,11 @@ private void cursor(int n) {
     }
 
     private boolean hasFlag(ModifiersTree modifiers, long flag) {
-        return (((JCModifiers) modifiers).flags & flag) != 0L;
+        return hasFlag(((JCModifiers) modifiers).flags, flag);
+    }
+
+    private boolean hasFlag(long flags, long flag) {
+        return (flags & flag) != 0L;
     }
 
     @SuppressWarnings("unused")

diff --git a/...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java b/...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
@@ -1766,12 +1766,8 @@ public J visitWildcard(WildcardTree node, Space fmt) {
             return null;
         }
         try {
-            String prefix;
-            if (t instanceof JCNewClass && (((JCNewClass) t).type.tsym.flags() & Flags.ENUM) != 0L) {
-                prefix = "";
-            } else {
-                prefix = source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
-            }
+            String prefix = t instanceof JCNewClass && hasFlag(((JCNewClass) t).type.tsym.flags(), Flags.ENUM) ? ""
+                    : source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
             cursor += prefix.length();
             // Java 21 and 23 have a different return type from getCommentTree; with reflection we can support both
             Method getCommentTreeMethod = DocCommentTable.class.getMethod("getCommentTree", JCTree.class);
@@ -2154,7 +2150,11 @@ private void cursor(int n) {
     }
 
     private boolean hasFlag(ModifiersTree modifiers, long flag) {
-        return (((JCModifiers) modifiers).flags & flag) != 0L;
+        return hasFlag(((JCModifiers) modifiers).flags, flag);
+    }
+
+    private boolean hasFlag(long flags, long flag) {
+        return (flags & flag) != 0L;
     }
 
     @SuppressWarnings("unused")

diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java
@@ -1639,12 +1639,8 @@ public J visitWildcard(WildcardTree node, Space fmt) {
             return null;
         }
         try {
-            String prefix;
-            if (t instanceof JCNewClass && (((JCNewClass) t).type.tsym.flags() & Flags.ENUM) != 0L) {
-                prefix = "";
-            } else {
-                prefix = source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
-            }
+            String prefix = t instanceof JCNewClass && hasFlag(((JCNewClass) t).type.tsym.flags(), Flags.ENUM) ? ""
+                    : source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
             cursor += prefix.length();
             @SuppressWarnings("unchecked") J2 j = (J2) scan(t, formatWithCommentTree(prefix, (JCTree) t, docCommentTable.getCommentTree((JCTree) t)));
             return j;
@@ -2036,7 +2032,11 @@ private void cursor(int n) {
     }
 
     private boolean hasFlag(ModifiersTree modifiers, long flag) {
-        return (((JCModifiers) modifiers).flags & flag) != 0L;
+        return hasFlag(((JCModifiers) modifiers).flags, flag);
+    }
+
+    private boolean hasFlag(long flags, long flag) {
+        return (flags & flag) != 0L;
     }
 
     @SuppressWarnings("unused")