issue j-easy#96 : add priority attribute to Rule annotation

If a priority method is defined, it will take precedence over the priority attribute of the annotation.
Tilmy · Apr 8, 2018 · ca4b78d · ca4b78d
1 parent abad973
commit ca4b78d
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 2 deletions.
diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/annotation/Rule.java b/easy-rules-core/src/main/java/org/jeasy/rules/annotation/Rule.java
@@ -48,4 +48,10 @@
      */
     String description() default  org.jeasy.rules.api.Rule.DEFAULT_DESCRIPTION;
 
+    /**
+     * The rule priority.
+     * @return The rule priority
+     */
+    int priority() default org.jeasy.rules.api.Rule.DEFAULT_PRIORITY;
+
 }
diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleProxy.java b/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleProxy.java
@@ -213,6 +213,11 @@ private int compareTo(final Rule otherRule) throws Exception {
     private int getRulePriority() throws Exception {
         int priority = Rule.DEFAULT_PRIORITY;
 
+        org.jeasy.rules.annotation.Rule rule = getRuleAnnotation();
+        if (rule.priority() != Rule.DEFAULT_PRIORITY) {
+            priority = rule.priority();
+        }
+
         Method[] methods = getMethods();
         for (Method method : methods) {
             if (method.isAnnotationPresent(Priority.class)) {

diff --git a/easy-rules-core/src/test/java/org/jeasy/rules/core/RuleProxyTest.java b/easy-rules-core/src/test/java/org/jeasy/rules/core/RuleProxyTest.java
@@ -26,6 +26,7 @@
 import org.jeasy.rules.annotation.Action;
 import org.jeasy.rules.annotation.AnnotatedRuleWithMetaRuleAnnotation;
 import org.jeasy.rules.annotation.Condition;
+import org.jeasy.rules.annotation.Priority;
 import org.jeasy.rules.api.Rule;
 import org.junit.Test;
 
@@ -155,6 +156,80 @@ public void invokeToString() {
         assertEquals(rule.toString(), proxy1.toString());
     }
 
+    @Test
+    public void testPriorityFromAnnotation() {
+
+        @org.jeasy.rules.annotation.Rule(priority = 1)
+        class MyRule {
+            @Condition
+            public boolean when() { return true; }
+
+            @Action
+            public void then() { }
+        }
+
+        Object rule = new MyRule();
+        Rule proxy = RuleProxy.asRule(rule);
+        assertEquals(1, proxy.getPriority());
+    }
+
+    @Test
+    public void testPriorityFromMethod() {
+
+        @org.jeasy.rules.annotation.Rule
+        class MyRule {
+            @Condition
+            public boolean when() { return true; }
+
+            @Action
+            public void then() { }
+
+            @Priority
+            public int getPriority() { return 2; }
+        }
+
+        Object rule = new MyRule();
+        Rule proxy = RuleProxy.asRule(rule);
+        assertEquals(2, proxy.getPriority());
+    }
+
+    @Test
+    public void testPriorityPrecedence() {
+
+        @org.jeasy.rules.annotation.Rule(priority = 1)
+        class MyRule {
+            @Condition
+            public boolean when() { return true; }
+
+            @Action
+            public void then() { }
+
+            @Priority
+            public int getPriority() { return 2; }
+        }
+
+        Object rule = new MyRule();
+        Rule proxy = RuleProxy.asRule(rule);
+        assertEquals(2, proxy.getPriority());
+    }
+
+    @Test
+    public void testDefaultPriority() {
+
+        @org.jeasy.rules.annotation.Rule
+        class MyRule {
+            @Condition
+            public boolean when() { return true; }
+
+            @Action
+            public void then() { }
+        }
+
+        Object rule = new MyRule();
+        Rule proxy = RuleProxy.asRule(rule);
+        assertEquals(Rule.DEFAULT_PRIORITY, proxy.getPriority());
+    }
+
     @org.jeasy.rules.annotation.Rule
     class DummyRule {
         @Condition
@@ -168,7 +243,6 @@ public String toString() {
         	return "I am a Dummy rule";
         }
 
-
     }
-}
 
+}