From b3821ef27194ac553ef5146ca81759830f3e210f Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Sun, 21 May 2017 23:13:24 +0200 Subject: [PATCH] add method to unregister rule by name ( issue 64 ) --- .../main/java/org/jeasy/rules/api/Rules.java | 20 ++++++++++ .../java/org/jeasy/rules/api/RulesTest.java | 37 +++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/api/Rules.java b/easy-rules-core/src/main/java/org/jeasy/rules/api/Rules.java index bca7307..28f480d 100644 --- a/easy-rules-core/src/main/java/org/jeasy/rules/api/Rules.java +++ b/easy-rules-core/src/main/java/org/jeasy/rules/api/Rules.java @@ -87,6 +87,18 @@ public class Rules implements Iterable { rules.remove(RuleProxy.asRule(rule)); } + /** + * Unregister a rule by name. + * + * @param ruleName the name of the rule to unregister + */ + public void unregister(final String ruleName){ + Rule rule = findRuleByName(ruleName); + if(rule != null) { + unregister(rule); + } + } + /** * Check if the rule set is empty. * @@ -114,4 +126,12 @@ public class Rules implements Iterable { public void sort() { rules = new TreeSet<>(rules); } + + private Rule findRuleByName(String ruleName){ + for(Rule rule : rules){ + if(rule.getName().equalsIgnoreCase(ruleName)) + return rule; + } + return null; + } } diff --git a/easy-rules-core/src/test/java/org/jeasy/rules/api/RulesTest.java b/easy-rules-core/src/test/java/org/jeasy/rules/api/RulesTest.java index 85e8a09..d467491 100644 --- a/easy-rules-core/src/test/java/org/jeasy/rules/api/RulesTest.java +++ b/easy-rules-core/src/test/java/org/jeasy/rules/api/RulesTest.java @@ -1,3 +1,26 @@ +/** + * The MIT License + * + * Copyright (c) 2017, Mahmoud Ben Hassine (mahmoud.benhassine@icloud.com) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package org.jeasy.rules.api; import org.jeasy.rules.annotation.Action; @@ -43,6 +66,20 @@ public class RulesTest { assertThat(rules).isEmpty(); } + @Test + public void unregisterByName() throws Exception { + Rule r1 = new BasicRule("rule1"); + Rule r2 = new BasicRule("rule2"); + Set ruleSet = new HashSet<>(); + ruleSet.add(r1); + ruleSet.add(r2); + + rules = new Rules(ruleSet); + rules.unregister("rule2"); + + assertThat(rules).hasSize(1).containsExactly(r1); + } + @Test public void isEmpty() throws Exception { assertThat(rules.isEmpty()).isTrue();