Remove DeclarativeRecipe specificity

openrewrite · Sep 20, 2024 · be3e43b · be3e43b
1 parent 587fe42
commit be3e43b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/rewrite-core/src/main/java/org/openrewrite/config/DeclarativeRecipe.java b/rewrite-core/src/main/java/org/openrewrite/config/DeclarativeRecipe.java
@@ -270,8 +270,7 @@ public final List<Recipe> getRecipeList() {
                         getName() + " declares the ScanningRecipe " + precondition.getName() + " as a precondition." +
                         "ScanningRecipe cannot be used as Preconditions.");
             }
-            andPreconditions.add(precondition instanceof DeclarativeRecipe ?
-                    (() -> or((DeclarativeRecipe) precondition)) : precondition::getVisitor);
+            andPreconditions.add(() -> orVisitors(precondition));
         }
         PreconditionBellwether bellwether = new PreconditionBellwether(Preconditions.and(andPreconditions.toArray(new Supplier[]{})));
         List<Recipe> recipeListWithBellwether = new ArrayList<>(recipeList.size() + 1);
@@ -280,10 +279,11 @@ public final List<Recipe> getRecipeList() {
         return recipeListWithBellwether;
     }
 
-    private static TreeVisitor<?, ExecutionContext> or(DeclarativeRecipe recipe) {
+    private static TreeVisitor<?, ExecutionContext> orVisitors(Recipe recipe) {
         List<TreeVisitor<?, ExecutionContext>> conditions = new ArrayList<>();
+        conditions.add(recipe.getVisitor());
         for (Recipe r : recipe.getRecipeList()) {
-            conditions.add(r instanceof DeclarativeRecipe ? or((DeclarativeRecipe) r) : r.getVisitor());
+            conditions.add(orVisitors(r));
         }
         //noinspection unchecked
         return Preconditions.or(conditions.toArray(new TreeVisitor[0]));