DRY: Unify empty J.Block creation to helper method (#2638)

Thanks @JLLeitschuh !
openrewrite · Jan 14, 2023 · 38c85f2 · 38c85f2
1 parent b794edd
commit 38c85f2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/DeleteStatement.java b/rewrite-java/src/main/java/org/openrewrite/java/DeleteStatement.java
@@ -142,12 +142,6 @@ public J preVisit(J tree, P p) {
     }
 
     private Statement emptyBlock() {
-        return new J.Block(randomId(),
-                Space.EMPTY,
-                Markers.EMPTY,
-                JRightPadded.build(false),
-                emptyList(),
-                Space.EMPTY
-        );
+        return J.Block.createEmptyBlock();
     }
 }
diff --git a/...te-java/src/main/java/org/openrewrite/java/cleanup/SimplifyConstantIfBranchExecution.java b/...te-java/src/main/java/org/openrewrite/java/cleanup/SimplifyConstantIfBranchExecution.java
@@ -144,7 +144,7 @@ public J visitIf(J.If if_, ExecutionContext context) {
                  * ```
                  * The above is not valid java and will cause later processing errors.
                  */
-                return emptyJBlock();
+                return J.Block.createEmptyBlock();
             }
         }
 
@@ -183,20 +183,6 @@ public J.Throw visitThrow(J.Throw thrown, AtomicBoolean atomicBoolean) {
             return visitedCFKeyword.get();
         }
 
-        /**
-         * An empty {@link J.Block} with no contents.
-         */
-        private static J.Block emptyJBlock() {
-            return new J.Block(
-                    Tree.randomId(),
-                    Space.EMPTY,
-                    Markers.EMPTY,
-                    JRightPadded.build(false),
-                    Collections.emptyList(),
-                    Space.EMPTY
-            );
-        }
-
         private static boolean isLiteralTrue(@Nullable Expression expression) {
             return J.Literal.isLiteralValue(expression, Boolean.TRUE);
         }

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java
@@ -704,6 +704,11 @@ public Binary withOperator(JLeftPadded<Type> operator) {
         }
     }
 
+    /**
+     * A block of statements, enclosed in curly braces.
+     * <p>
+     * To create an empty block, use {@link #createEmptyBlock()}.
+     */
     @ToString
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
     @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
@@ -797,6 +802,17 @@ public Block withStatements(List<JRightPadded<Statement>> statements) {
             }
         }
 
+        public static J.Block createEmptyBlock() {
+            return new J.Block(
+                    Tree.randomId(),
+                    Space.EMPTY,
+                    Markers.EMPTY,
+                    JRightPadded.build(false),
+                    Collections.emptyList(),
+                    Space.EMPTY
+            );
+        }
+
         @SelfLoathing(name = "Jonathan Leitschuh")
         @LoathingOfOthers("Who didn't encode this in the model?!")
         @Incubating(since = "7.25.0")