This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 362bc7222b547390195c342dedd4db9057a83a5c Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Wed Nov 27 10:22:56 2019 +0700 s/JAMES-2988 FetchGroup::or/FetchGroup::with --- .../java/org/apache/james/mailbox/model/FetchGroup.java | 2 +- .../org/apache/james/mailbox/model/FetchGroupTest.java | 14 +++++++------- .../james/mailbox/store/mail/FetchGroupConverterTest.java | 8 ++++---- .../james/imap/processor/fetch/FetchDataConverter.java | 6 +++--- .../james/imap/processor/fetch/FetchDataConverterTest.java | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroup.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroup.java index 56c01ee..7ff2d70 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroup.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroup.java @@ -80,7 +80,7 @@ public class FetchGroup { return content; } - public FetchGroup or(int content) { + public FetchGroup with(int content) { return new FetchGroup(this.content | content, partContentDescriptors); } diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/FetchGroupTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/FetchGroupTest.java index 5ded8c0..1ad5baa 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/FetchGroupTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/FetchGroupTest.java @@ -37,7 +37,7 @@ class FetchGroupTest { @Test void orShouldReturnAFetchGroupWithUpdatedContent() { int expected = FetchGroup.HEADERS_MASK | FetchGroup.FULL_CONTENT_MASK; - assertThat(FetchGroup.HEADERS.or(FetchGroup.FULL_CONTENT_MASK)) + assertThat(FetchGroup.HEADERS.with(FetchGroup.FULL_CONTENT_MASK)) .isEqualTo(new FetchGroup(expected)); } @@ -76,8 +76,8 @@ class FetchGroupTest { @Test void hasMaskShouldReturnFalseWhenNotContained() { assertThat(FetchGroup.MINIMAL - .or(FetchGroup.MIME_HEADERS_MASK) - .or(FetchGroup.MIME_DESCRIPTOR_MASK) + .with(FetchGroup.MIME_HEADERS_MASK) + .with(FetchGroup.MIME_DESCRIPTOR_MASK) .hasMask(FetchGroup.HEADERS_MASK)) .isFalse(); } @@ -85,8 +85,8 @@ class FetchGroupTest { @Test void hasMaskShouldReturnTrueWhenContained() { assertThat(FetchGroup.MINIMAL - .or(FetchGroup.MIME_HEADERS_MASK) - .or(FetchGroup.MIME_DESCRIPTOR_MASK) + .with(FetchGroup.MIME_HEADERS_MASK) + .with(FetchGroup.MIME_DESCRIPTOR_MASK) .hasMask(FetchGroup.MIME_HEADERS_MASK)) .isTrue(); } @@ -108,7 +108,7 @@ class FetchGroupTest { @Test void hasOnlyMasksShouldReturnTrueWhenExactlyContainMultipleValues() { assertThat(FetchGroup.HEADERS - .or(FetchGroup.BODY_CONTENT_MASK) + .with(FetchGroup.BODY_CONTENT_MASK) .hasOnlyMasks(FetchGroup.HEADERS_MASK, FetchGroup.BODY_CONTENT_MASK)) .isTrue(); } @@ -116,7 +116,7 @@ class FetchGroupTest { @Test void hasOnlyMasksShouldReturnFalseWhenNotContained() { assertThat(FetchGroup.HEADERS - .or(FetchGroup.BODY_CONTENT_MASK) + .with(FetchGroup.BODY_CONTENT_MASK) .hasOnlyMasks(FetchGroup.FULL_CONTENT_MASK)) .isFalse(); } diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/FetchGroupConverterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/FetchGroupConverterTest.java index 2c3f66f..07c92e9 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/FetchGroupConverterTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/FetchGroupConverterTest.java @@ -47,7 +47,7 @@ class FetchGroupConverterTest { @Test void getFetchTypeShouldReturnFullWhenBodyAndHeaders() { FetchGroup fetchGroup = FetchGroup.BODY_CONTENT - .or(FetchGroup.HEADERS_MASK); + .with(FetchGroup.HEADERS_MASK); assertThat(FetchGroupConverter.getFetchType(fetchGroup)) .isEqualTo(MessageMapper.FetchType.Full); @@ -62,7 +62,7 @@ class FetchGroupConverterTest { @Test void getFetchTypeShouldReturnFullWhenMimeContent() { FetchGroup fetchGroup = FetchGroup.MINIMAL - .or(FetchGroup.MIME_CONTENT_MASK); + .with(FetchGroup.MIME_CONTENT_MASK); assertThat(FetchGroupConverter.getFetchType(fetchGroup)) .isEqualTo(MessageMapper.FetchType.Full); } @@ -70,7 +70,7 @@ class FetchGroupConverterTest { @Test void getFetchTypeShouldReturnFullWhenMimeDescriptor() { FetchGroup fetchGroup = FetchGroup.MINIMAL - .or(FetchGroup.MIME_DESCRIPTOR_MASK); + .with(FetchGroup.MIME_DESCRIPTOR_MASK); assertThat(FetchGroupConverter.getFetchType(fetchGroup)) .isEqualTo(MessageMapper.FetchType.Full); } @@ -78,7 +78,7 @@ class FetchGroupConverterTest { @Test void getFetchTypeShouldReturnFullWhenMimeHeaders() { FetchGroup fetchGroup = FetchGroup.MINIMAL - .or(FetchGroup.MIME_HEADERS_MASK); + .with(FetchGroup.MIME_HEADERS_MASK); assertThat(FetchGroupConverter.getFetchType(fetchGroup)) .isEqualTo(MessageMapper.FetchType.Full); } diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchDataConverter.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchDataConverter.java index 54d4b5e..a75080a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchDataConverter.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchDataConverter.java @@ -32,10 +32,10 @@ class FetchDataConverter { FetchGroup result = FetchGroup.MINIMAL; if (fetch.isEnvelope()) { - result = result.or(FetchGroup.HEADERS_MASK); + result = result.with(FetchGroup.HEADERS_MASK); } if (fetch.isBody() || fetch.isBodyStructure()) { - result = result.or(FetchGroup.MIME_DESCRIPTOR_MASK); + result = result.with(FetchGroup.MIME_DESCRIPTOR_MASK); } Collection<BodyFetchElement> bodyElements = fetch.getBodyElements(); @@ -74,7 +74,7 @@ class FetchDataConverter { private static FetchGroup addContent(FetchGroup result, int[] path, boolean isBase, int content) { if (isBase) { - return result.or(content); + return result.with(content); } else { MimePath mimePath = new MimePath(path); return result.addPartContent(mimePath, content); diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/FetchDataConverterTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/FetchDataConverterTest.java index 2c304ec..192cc26 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/FetchDataConverterTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/FetchDataConverterTest.java @@ -44,8 +44,8 @@ class FetchDataConverterTest { static Stream<Arguments> getFetchGroupShouldReturnCorrectValue() { return Stream.of( Arguments.arguments(new FetchData(), FetchGroup.MINIMAL), - Arguments.arguments(new FetchData().setBody(true), FetchGroup.MINIMAL.or(MIME_DESCRIPTOR_MASK)), - Arguments.arguments(new FetchData().setBodyStructure(true), FetchGroup.MINIMAL.or(MIME_DESCRIPTOR_MASK)), + Arguments.arguments(new FetchData().setBody(true), FetchGroup.MINIMAL.with(MIME_DESCRIPTOR_MASK)), + Arguments.arguments(new FetchData().setBodyStructure(true), FetchGroup.MINIMAL.with(MIME_DESCRIPTOR_MASK)), Arguments.arguments(new FetchData().setChangedSince(0L), FetchGroup.MINIMAL), Arguments.arguments(new FetchData().setEnvelope(true), FetchGroup.HEADERS), Arguments.arguments(new FetchData().setFlags(true), FetchGroup.MINIMAL), --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org