diff options
author | 2017-11-30 08:45:22 -0800 | |
---|---|---|
committer | 2017-11-30 08:47:34 -0800 | |
commit | 38bd6d7e205df20bc94c8c7359cee81e500cdd16 (patch) | |
tree | 11a96204cefbe00bde9a9095f4cb620180b92dd0 | |
parent | 551d4395fa7e1360478dfbccc928c56e88ac77c4 (diff) |
Remove unused code from RuleSetUtils
PiperOrigin-RevId: 177459771
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/generatedprojecttest/util/RuleSetUtils.java | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/generatedprojecttest/util/RuleSetUtils.java b/src/test/java/com/google/devtools/build/lib/generatedprojecttest/util/RuleSetUtils.java index 32b9c83782..92b8e609b3 100644 --- a/src/test/java/com/google/devtools/build/lib/generatedprojecttest/util/RuleSetUtils.java +++ b/src/test/java/com/google/devtools/build/lib/generatedprojecttest/util/RuleSetUtils.java @@ -92,43 +92,21 @@ public class RuleSetUtils { */ public static class HasAttributes implements Predicate<RuleClass> { - private enum Operator { - ANY, ALL - } - private final List<Pair<String, Type<?>>> attributes; - private final Operator operator; - public HasAttributes(Collection<Pair<String, Type<?>>> attributes, Operator operator) { + public HasAttributes(Collection<Pair<String, Type<?>>> attributes) { this.attributes = ImmutableList.copyOf(attributes); - this.operator = operator; } @Override - public boolean apply(final RuleClass input) { - switch (operator) { - case ANY: - for (Pair<String, Type<?>> attribute : attributes) { - if (input.hasAttr(attribute.first, attribute.second)) { - return true; - } - } - return false; - case ALL: - for (Pair<String, Type<?>> attribute : attributes) { - if (!input.hasAttr(attribute.first, attribute.second)) { - return false; - } - } - return true; - } - return false; + public boolean apply(final RuleClass ruleClass) { + return attributes.stream().anyMatch(pair -> ruleClass.hasAttr(pair.first, pair.second)); } } public static Predicate<RuleClass> hasAnyAttributes( Collection<Pair<String, Type<?>>> attributes) { - return new HasAttributes(attributes, HasAttributes.Operator.ANY); + return new HasAttributes(attributes); } /** |