This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch 3.9.x in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 48fa72f6bb964d838c6bba52c22477bb195b3c54 Author: Benoit TELLIER <[email protected]> AuthorDate: Mon Sep 29 16:56:48 2025 +0200 JAMES-4148 Simplify builder for Rule.ConditionGroup --- .../src/main/java/org/apache/james/jmap/api/filtering/Rule.java | 5 +++++ .../java/org/apache/james/jmap/api/filtering/RuleFixture.java | 4 ++-- .../org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/Rule.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/Rule.java index 89effc3fb9..8fe31b98b8 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/Rule.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/Rule.java @@ -538,6 +538,11 @@ public class Rule { return this; } + public Builder conditionGroup(ConditionCombiner combiner, Condition... condition) { + this.conditionGroup = Rule.ConditionGroup.of(combiner, condition); + return this; + } + public Builder conditionGroup(ConditionGroup conditionGroup) { this.conditionGroup = conditionGroup; return this; diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/RuleFixture.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/RuleFixture.java index 6ad3285bdf..5160a086cd 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/RuleFixture.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/RuleFixture.java @@ -55,8 +55,8 @@ public interface RuleFixture { Rule RULE_2 = RULE_BUILDER.id(Rule.Id.of("2")).build(); Rule RULE_3 = RULE_BUILDER.id(Rule.Id.of("3")).build(); Rule RULE_4 = Rule.builder() - .conditionGroup(Rule.ConditionGroup.of(Rule.ConditionCombiner.AND, CONDITION, - Rule.Condition.of(new Rule.Condition.CustomHeaderField("custom"), Rule.Condition.Comparator.CONTAINS, "another thing"))) + .conditionGroup(Rule.ConditionCombiner.AND, CONDITION, + Rule.Condition.of(new Rule.Condition.CustomHeaderField("custom"), Rule.Condition.Comparator.CONTAINS, "another thing")) .action(ACTION_2) .id(Rule.Id.of("1")) .name(NAME) diff --git a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java index 86baf455b6..e050aa472a 100644 --- a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java +++ b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java @@ -1081,7 +1081,7 @@ class JMAPFilteringTest { Rule.builder() .id(Rule.Id.of("1")) .name("rule 1") - .conditionGroup(Rule.ConditionGroup.of(Rule.ConditionCombiner.AND, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cd"))) + .conditionGroup(Rule.ConditionCombiner.AND, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cd")) .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(testSystem.getRecipient1MailboxId().serialize()))) .build())).block(); @@ -1100,7 +1100,7 @@ class JMAPFilteringTest { Rule.builder() .id(Rule.Id.of("1")) .name("rule 1") - .conditionGroup(Rule.ConditionGroup.of(Rule.ConditionCombiner.AND, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cdf"))) + .conditionGroup(Rule.ConditionCombiner.AND, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cdf")) .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(testSystem.getRecipient1MailboxId().serialize()))) .build())).block(); @@ -1117,7 +1117,7 @@ class JMAPFilteringTest { Rule.builder() .id(Rule.Id.of("1")) .name("rule 1") - .conditionGroup(Rule.ConditionGroup.of(Rule.ConditionCombiner.OR, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cdf"))) + .conditionGroup(Rule.ConditionCombiner.OR, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cdf")) .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(testSystem.getRecipient1MailboxId().serialize()))) .build())).block(); @@ -1135,7 +1135,7 @@ class JMAPFilteringTest { Rule.builder() .id(Rule.Id.of("1")) .name("rule 1") - .conditionGroup(Rule.ConditionGroup.of(Rule.ConditionCombiner.OR, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cdf"))) + .conditionGroup(Rule.ConditionCombiner.OR, Rule.Condition.of(FROM, CONTAINS, USER_2_USERNAME), Rule.Condition.of(SUBJECT, CONTAINS, "cdf")) .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(testSystem.getRecipient1MailboxId().serialize()))) .build())).block(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
