Move composite rules to a dedicated package

easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELJsonRuleFactoryTest.java

@@ -26,7 +26,7 @@ package org.jeasy.rules.mvel;
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
 import org.jeasy.rules.support.reader.JsonRuleDefinitionReader;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 

easy-rules-mvel/src/test/java/org/jeasy/rules/mvel/MVELYamlRuleFactoryTest.java

@@ -26,7 +26,7 @@ package org.jeasy.rules.mvel;
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
 import org.jeasy.rules.support.reader.YamlRuleDefinitionReader;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 

easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELJsonRuleFactoryTest.java

@@ -26,7 +26,7 @@ package org.jeasy.rules.spel;
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
 import org.jeasy.rules.support.reader.JsonRuleDefinitionReader;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 

easy-rules-spel/src/test/java/org/jeasy/rules/spel/SpELYamlRuleFactoryTest.java

@@ -25,7 +25,7 @@ package org.jeasy.rules.spel;
 
 import org.jeasy.rules.api.Rule;
 import org.jeasy.rules.api.Rules;
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.jeasy.rules.support.reader.YamlRuleDefinitionReader;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;

easy-rules-support/src/main/java/org/jeasy/rules/support/AbstractRuleFactory.java

@@ -24,6 +24,10 @@
 package org.jeasy.rules.support;
 
 import org.jeasy.rules.api.Rule;
+import org.jeasy.rules.support.composite.ActivationRuleGroup;
+import org.jeasy.rules.support.composite.CompositeRule;
+import org.jeasy.rules.support.composite.ConditionalRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ActivationRuleGroup.java

@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;

easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java

@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;

easy-rules-support/src/main/java/org/jeasy/rules/support/composite/ConditionalRuleGroup.java

@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;

easy-rules-support/src/main/java/org/jeasy/rules/support/composite/UnitRuleGroup.java

@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.api.Facts;
 import org.jeasy.rules.api.Rule;

easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ActivationRuleGroupTest.java

@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.annotation.Action;
 import org.jeasy.rules.annotation.Condition;

easy-rules-support/src/test/java/org/jeasy/rules/support/composite/ConditionalRuleGroupTest.java

@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.annotation.Action;
 import org.jeasy.rules.annotation.Condition;

easy-rules-support/src/test/java/org/jeasy/rules/support/composite/UnitRuleGroupTest.java

@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-package org.jeasy.rules.support;
+package org.jeasy.rules.support.composite;
 
 import org.jeasy.rules.annotation.Action;
 import org.jeasy.rules.annotation.Condition;
@@ -51,7 +51,7 @@ public class UnitRuleGroupTest {
 
     private DefaultRulesEngine rulesEngine = new DefaultRulesEngine();
 
-    private org.jeasy.rules.support.UnitRuleGroup unitRuleGroup;
+    private UnitRuleGroup unitRuleGroup;
 
 
     @Before

easy-rules-tutorials/src/main/java/org/jeasy/rules/tutorials/fizzbuzz/FizzBuzzRule.java

@@ -23,7 +23,7 @@
  */
 package org.jeasy.rules.tutorials.fizzbuzz;
 
-import org.jeasy.rules.support.UnitRuleGroup;
+import org.jeasy.rules.support.composite.UnitRuleGroup;
 
 public class FizzBuzzRule extends UnitRuleGroup {