JAMES-1781 Remove constraint from Vacation This constraint can be broken given concurrent partial updates. It is better not to rely on it.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ca8c20da Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ca8c20da Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ca8c20da Branch: refs/heads/master Commit: ca8c20da916b43875813ceb104f98a604de13289 Parents: 75b5767 Author: Benoit Tellier <[email protected]> Authored: Mon Jun 27 18:18:36 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Sep 29 12:48:14 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/james/jmap/api/vacation/Vacation.java | 3 --- .../org/apache/james/jmap/api/vacation/VacationTest.java | 9 --------- 2 files changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/ca8c20da/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java index 62d6879..b806df9 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java @@ -100,9 +100,6 @@ public class Vacation { public Vacation build() { boolean enabled = isEnabled.orElse(DEFAULT_DISABLED); - if (enabled) { - Preconditions.checkState(textBody.isPresent() || htmlBody.isPresent(), "textBody or htmlBody property of vacationResponse object should not be null when enabled"); - } return new Vacation(enabled, fromDate, toDate, textBody, subject, htmlBody); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/ca8c20da/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/VacationTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/VacationTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/VacationTest.java index 6442a32..93cfeb4 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/VacationTest.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/VacationTest.java @@ -192,15 +192,6 @@ public class VacationTest { } @Test - public void activeVacationShouldHaveHtmlBodyOrTextBody() { - assertThatThrownBy( - () -> Vacation.builder() - .enabled(true) - .build()) - .isInstanceOf(IllegalStateException.class); - } - - @Test public void textBodyShouldBeEnoughToBuildAnActivatedVacation() { assertThat( Vacation.builder() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
