Register accumulators for nested ScanningRecipes in OR preconditions #6701
+205
−9
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
ScanningRecipesScanningRecipes inDeclarativeRecipeProblem
When using the OR precondition pattern with
ScanningRecipes likeModuleHasDependencyorRepositoryContainsFile, the recipes fail with aNullPointerException:The root cause is that
getInitialValue()only registers direct preconditions, butorVisitors()recursively looks up nestedScanningRecipes in precondition recipes'recipeLists that were never registered.Solution
Added two helper methods that recursively traverse precondition recipes'
recipeLists:registerNestedScanningRecipes()- Called fromgetInitialValue()to register all nestedScanningRecipes in the accumulator mapscanNestedScanningRecipes()- Called fromgetScanner()to invoke the scanner on all nestedScanningRecipesTest plan
Existing tests pass
New tests added covering:
ScanningRecipein OR preconditionFixes DeclarativeRecipe doesn't register accumulators for nested ScanningRecipes in OR preconditions #6698