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 3b5711c7c12fe86dd1eaa0c648b836e203611703
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Thu Nov 28 17:09:42 2019 +0700
JAMES-2988 varargs for FetchGroup::addPartContent
---
.../main/java/org/apache/james/mailbox/model/FetchGroup.java | 5 +++++
.../java/org/apache/james/mailbox/model/FetchGroupTest.java | 2 +-
.../james/mailbox/store/mail/FetchGroupConverterTest.java | 6 +++---
.../james/imap/processor/fetch/FetchDataConverter.java | 3 +--
.../james/imap/processor/fetch/FetchDataConverterTest.java | 12 ++++++------
5 files changed, 16 insertions(+), 12 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 0fcb47a..e0966fa 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
@@ -19,6 +19,7 @@
package org.apache.james.mailbox.model;
+import java.util.Arrays;
import java.util.EnumSet;
import java.util.Objects;
import java.util.Set;
@@ -98,6 +99,10 @@ public class FetchGroup extends Profiles<FetchGroup> {
.collect(Guavate.toImmutableSet()));
}
+ public FetchGroup addPartContent(MimePath path, Profile... profiles) {
+ return addPartContent(path, EnumSet.copyOf(Arrays.asList(profiles)));
+ }
+
private PartContentDescriptor
retrieveUpdatedPartContentDescriptor(MimePath path, EnumSet<Profile> profiles) {
return partContentDescriptors.stream()
.filter(descriptor -> path.equals(descriptor.path()))
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 c900cdb..a888963 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
@@ -93,7 +93,7 @@ class FetchGroupTest {
assertThat(
FetchGroup.MINIMAL
.addPartContent(new MimePath(path),
EnumSet.noneOf(Profile.class))
- .addPartContent(new MimePath(path),
EnumSet.of(Profile.HEADERS)))
+ .addPartContent(new MimePath(path), Profile.HEADERS))
.isEqualTo(new FetchGroup(EnumSet.noneOf(Profile.class),
ImmutableSet.of(new
PartContentDescriptor(EnumSet.of(Profile.HEADERS), new MimePath(path)))));
}
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 5cfe5bf..04b7064 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
@@ -46,9 +46,9 @@ class FetchGroupConverterTest {
Arguments.arguments(FetchGroup.MINIMAL.with(Profile.MIME_DESCRIPTOR),
FetchType.Full),
Arguments.arguments(FetchGroup.MINIMAL.with(Profile.MIME_HEADERS),
FetchType.Full),
Arguments.arguments(FetchGroup.MINIMAL.addPartContent(new
MimePath(PARTS), EnumSet.noneOf(Profile.class)), FetchType.Full),
- Arguments.arguments(FetchGroup.MINIMAL.addPartContent(new
MimePath(PARTS), EnumSet.of(Profile.HEADERS)), FetchType.Full),
- Arguments.arguments(FetchGroup.MINIMAL.addPartContent(new
MimePath(PARTS), EnumSet.of(Profile.BODY_CONTENT)), FetchType.Full),
- Arguments.arguments(FetchGroup.MINIMAL.addPartContent(new
MimePath(PARTS), EnumSet.of(Profile.FULL_CONTENT)), FetchType.Full));
+ Arguments.arguments(FetchGroup.MINIMAL.addPartContent(new
MimePath(PARTS), Profile.HEADERS), FetchType.Full),
+ Arguments.arguments(FetchGroup.MINIMAL.addPartContent(new
MimePath(PARTS), Profile.BODY_CONTENT), FetchType.Full),
+ Arguments.arguments(FetchGroup.MINIMAL.addPartContent(new
MimePath(PARTS), Profile.FULL_CONTENT), FetchType.Full));
}
@ParameterizedTest
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 baa4d92..8596c88 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
@@ -20,7 +20,6 @@
package org.apache.james.imap.processor.fetch;
import java.util.Collection;
-import java.util.EnumSet;
import org.apache.james.imap.api.message.BodyFetchElement;
import org.apache.james.imap.api.message.FetchData;
@@ -78,7 +77,7 @@ class FetchDataConverter {
return result.with(profile);
} else {
MimePath mimePath = new MimePath(path);
- return result.addPartContent(mimePath, EnumSet.of(profile));
+ return result.addPartContent(mimePath, profile);
}
}
}
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 f5b1cfa..63e772e 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
@@ -58,17 +58,17 @@ class FetchDataConverterTest {
Arguments.arguments(new
FetchData().add(BodyFetchElement.createRFC822Header(), PEEK),
FetchGroup.HEADERS),
Arguments.arguments(new
FetchData().add(BodyFetchElement.createRFC822Text(), PEEK),
FetchGroup.BODY_CONTENT),
Arguments.arguments(new FetchData().add(new
BodyFetchElement(ImapConstants.FETCH_RFC822_HEADER, HEADER, PATH, null, null,
null), PEEK),
- FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
EnumSet.of(Profile.HEADERS))),
+ FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
Profile.HEADERS)),
Arguments.arguments(new FetchData().add(new
BodyFetchElement(ImapConstants.FETCH_RFC822_TEXT, HEADER, PATH, null, null,
null), PEEK),
- FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
EnumSet.of(Profile.BODY_CONTENT))),
+ FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
Profile.BODY_CONTENT)),
Arguments.arguments(new FetchData().add(new
BodyFetchElement(ImapConstants.FETCH_RFC822_TEXT, CONTENT, PATH, null, null,
null), PEEK),
- FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
EnumSet.of(Profile.BODY_CONTENT))),
+ FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
Profile.BODY_CONTENT)),
Arguments.arguments(new FetchData().add(new
BodyFetchElement(ImapConstants.FETCH_RFC822_TEXT, CONTENT, PATH, null, null,
null), PEEK),
- FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
EnumSet.of(Profile.MIME_CONTENT))),
+ FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
Profile.MIME_CONTENT)),
Arguments.arguments(new FetchData().add(new
BodyFetchElement(ImapConstants.FETCH_RFC822_TEXT, MIME, PATH, null, null,
null), PEEK),
- FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
EnumSet.of(Profile.MIME_HEADERS))),
+ FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
Profile.MIME_HEADERS)),
Arguments.arguments(new FetchData().add(new
BodyFetchElement(ImapConstants.FETCH_RFC822_TEXT, TEXT, PATH, null, null,
null), PEEK),
- FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
EnumSet.of(Profile.BODY_CONTENT))));
+ FetchGroup.MINIMAL.addPartContent(new MimePath(PATH),
Profile.BODY_CONTENT)));
}
@ParameterizedTest
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
