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 <team@moderne.io>
openrewrite · Sep 21, 2024 · 6996576 · 6996576
1 parent 3e97fc3
commit 6996576
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/org/openrewrite/java/security/PathTraversalGuardInsertionVisitor.java b/src/main/java/org/openrewrite/java/security/PathTraversalGuardInsertionVisitor.java
@@ -318,8 +318,8 @@ public J visitNewClass(J.NewClass newClass, P p) {
         }
 
         private <M extends MethodCall> Optional<J.Identifier> visitMethodCall(M methodCall, Function<M, Expression> parentDirExtractor) {
-            if (methodCall.getArguments().stream().anyMatch(taintedSinks::contains)
-                && Dataflow.startingAt(getCursor()).findSinks(new FileOrPathCreationToVulnerableUsageLocalFlowSpec()).isSome()) {
+            if (methodCall.getArguments().stream().anyMatch(taintedSinks::contains) &&
+                Dataflow.startingAt(getCursor()).findSinks(new FileOrPathCreationToVulnerableUsageLocalFlowSpec()).isSome()) {
                 J.Block firstEnclosingBlock = getCursor().firstEnclosingOrThrow(J.Block.class);
                 @SuppressWarnings("SuspiciousMethodCalls")
                 Statement enclosingStatement = getCursor()

diff --git a/src/main/java/org/openrewrite/java/security/SecureRandomPrefersDefaultSeed.java b/src/main/java/org/openrewrite/java/security/SecureRandomPrefersDefaultSeed.java
@@ -75,11 +75,11 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                         isWeakSeed = true;
                     } else if (arg instanceof J.MethodInvocation) {
                         J.MethodInvocation argMi = (J.MethodInvocation) arg;
-                        if (SYSTEM_TIME_MATCHER.matches(arg) || SYSTEM_NANO_TIME_MATCHER.matches(argMi)
-                                || (STRING_BYTES_MATCHER.matches(argMi) && argMi.getSelect() instanceof J.Literal)) {
+                        if (SYSTEM_TIME_MATCHER.matches(arg) || SYSTEM_NANO_TIME_MATCHER.matches(argMi) ||
+                                (STRING_BYTES_MATCHER.matches(argMi) && argMi.getSelect() instanceof J.Literal)) {
                             isWeakSeed = true;
-                        } else if (argMi.getMethodType() != null
-                                && (TypeUtils.isAssignableTo(dateType, argMi.getMethodType().getDeclaringType()))) {
+                        } else if (argMi.getMethodType() != null &&
+                                (TypeUtils.isAssignableTo(dateType, argMi.getMethodType().getDeclaringType()))) {
                             isWeakSeed = true;
                             maybeRemoveImport("java.util.Date");
                         }

diff --git a/src/main/java/org/openrewrite/java/security/UseFilesCreateTempDirectory.java b/src/main/java/org/openrewrite/java/security/UseFilesCreateTempDirectory.java
@@ -370,8 +370,8 @@ private static class SecureTempDirectoryCreation<P> extends JavaIsoVisitor<P> {
         public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, P p) {
             J.MethodInvocation m = method;
             if (CREATE_TEMP_FILE_MATCHER.matches(m)) {
-                if (m.getArguments().size() == 2
-                    || (m.getArguments().size() == 3 && m.getArguments().get(2).getType() == JavaType.Primitive.Null)) {
+                if (m.getArguments().size() == 2 ||
+                    (m.getArguments().size() == 3 && m.getArguments().get(2).getType() == JavaType.Primitive.Null)) {
                     // File.createTempFile(String prefix, String suffix)
                     m = maybeAutoFormat(m, twoArg.apply(
                                     getCursor(),

diff --git a/src/test/java/org/openrewrite/java/security/SecureTempFileCreationFilteringTest.java b/src/test/java/org/openrewrite/java/security/SecureTempFileCreationFilteringTest.java
@@ -165,9 +165,9 @@ public TreeVisitor<?, ExecutionContext> getScanner(AtomicBoolean acc) {
             return new TreeVisitor<>() {
                 @Override
                 public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
-                    if (!acc.get()
-                      && new IsLikelyNotTest().getVisitor().visit(tree, ctx) != tree
-                      && new SecureTempFileCreation().getVisitor().visit(tree, ctx) != tree) {
+                    if (!acc.get() &&
+                      new IsLikelyNotTest().getVisitor().visit(tree, ctx) != tree &&
+                      new SecureTempFileCreation().getVisitor().visit(tree, ctx) != tree) {
                         acc.set(true);
                     }
                     return tree;