refactor: Operator wrapping on end of line

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.OperatorWrap?organizationId=T3BlblJld3JpdGU%3D#defaults=W3sidmFsdWUiOiJFT0wiLCJuYW1lIjoid3JhcE9wdGlvbiJ9XQ== Co-authored-by: Moderne <[email protected]>
openrewrite · Sep 21, 2024 · 0466552 · 0466552
1 parent 11a43f2
commit 0466552
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/org/openrewrite/apache/commons/lang/IsNotEmptyToJdk.java b/src/main/java/org/openrewrite/apache/commons/lang/IsNotEmptyToJdk.java
@@ -98,8 +98,8 @@ public J visitMethodInvocation(J.MethodInvocation mi, ExecutionContext ctx) {
                 }
 
                 // Replace StringUtils.isEmpty(var.trim()) with var.trim().isEmpty()
-                if (trimMatcher.matches(arg)
-                        && (((J.MethodInvocation) arg).getSelect() instanceof J.Identifier || ((J.MethodInvocation) arg).getSelect() instanceof J.FieldAccess)) {
+                if (trimMatcher.matches(arg) &&
+                        (((J.MethodInvocation) arg).getSelect() instanceof J.Identifier || ((J.MethodInvocation) arg).getSelect() instanceof J.FieldAccess)) {
                     JavaTemplate replacementTemplate = isEmptyCall ? isEmptyTrimmed : isNotEmptyTrimmed;
                     // Maybe remove imports
                     maybeRemoveImport("org.apache.commons.lang3.StringUtils");

diff --git a/src/main/java/org/openrewrite/apache/commons/lang/RepeatableArgumentMatcher.java b/src/main/java/org/openrewrite/apache/commons/lang/RepeatableArgumentMatcher.java
@@ -30,11 +30,11 @@ static boolean isRepeatableArgument(Expression arg) {
             return true;
         }
         // Allow simple getters that return a String
-        return arg instanceof J.MethodInvocation
-                && ((J.MethodInvocation) arg).getSelect() instanceof J.Identifier
-                && ((J.MethodInvocation) arg).getSimpleName().startsWith("get")
-                && (((J.MethodInvocation) arg).getArguments().isEmpty() || ((J.MethodInvocation) arg).getArguments().get(0) instanceof J.Empty)
-                && TypeUtils.isAssignableTo("java.lang.String", ((J.MethodInvocation) arg).getMethodType());
+        return arg instanceof J.MethodInvocation &&
+                ((J.MethodInvocation) arg).getSelect() instanceof J.Identifier &&
+                ((J.MethodInvocation) arg).getSimpleName().startsWith("get") &&
+                (((J.MethodInvocation) arg).getArguments().isEmpty() || ((J.MethodInvocation) arg).getArguments().get(0) instanceof J.Empty) &&
+                TypeUtils.isAssignableTo("java.lang.String", ((J.MethodInvocation) arg).getMethodType());
     }
 
     @Override