You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/11/28 02:12:19 UTC
[james-project] 02/23: JAMES-2989 FetchGroupImpl constructors
should be private
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 a311e9e5caebece4157052c80e2368b3f9f5c7fb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Nov 25 11:07:18 2019 +0700
JAMES-2989 FetchGroupImpl constructors should be private
Encourage using base constants instead.
---
.../org/apache/james/mailbox/model/FetchGroupImpl.java | 18 +++++++-----------
.../james/imap/processor/fetch/FetchProcessor.java | 2 +-
.../mailets/delivery/MailboxAppenderTest.java | 9 ++++-----
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java
index c5d0430..d3b8d62 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java
@@ -29,27 +29,23 @@ import org.apache.james.mailbox.model.MessageResult.MimePath;
*/
public class FetchGroupImpl implements MessageResult.FetchGroup {
- public static final MessageResult.FetchGroup MINIMAL = new FetchGroupImpl(MessageResult.FetchGroup.MINIMAL);
+ public static final FetchGroupImpl MINIMAL = new FetchGroupImpl(MessageResult.FetchGroup.MINIMAL);
- public static final MessageResult.FetchGroup HEADERS = new FetchGroupImpl(MessageResult.FetchGroup.HEADERS);
+ public static final FetchGroupImpl HEADERS = new FetchGroupImpl(MessageResult.FetchGroup.HEADERS);
- public static final MessageResult.FetchGroup FULL_CONTENT = new FetchGroupImpl(MessageResult.FetchGroup.FULL_CONTENT);
+ public static final FetchGroupImpl FULL_CONTENT = new FetchGroupImpl(MessageResult.FetchGroup.FULL_CONTENT);
- public static final MessageResult.FetchGroup BODY_CONTENT = new FetchGroupImpl(MessageResult.FetchGroup.BODY_CONTENT);
+ public static final FetchGroupImpl BODY_CONTENT = new FetchGroupImpl(MessageResult.FetchGroup.BODY_CONTENT);
- private int content = MessageResult.FetchGroup.MINIMAL;
+ private int content;
private Set<PartContentDescriptor> partContentDescriptors;
- public FetchGroupImpl() {
- this(0, new HashSet<>());
- }
-
- public FetchGroupImpl(int content) {
+ private FetchGroupImpl(int content) {
this(content, new HashSet<>());
}
- public FetchGroupImpl(int content, Set<PartContentDescriptor> partContentDescriptors) {
+ private FetchGroupImpl(int content, Set<PartContentDescriptor> partContentDescriptors) {
this.content = content;
this.partContentDescriptors = partContentDescriptors;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
index d35b7bd..a75fd30 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
@@ -186,7 +186,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
}
protected FetchGroup getFetchGroup(FetchData fetch) {
- FetchGroupImpl result = new FetchGroupImpl();
+ FetchGroupImpl result = FetchGroupImpl.MINIMAL;
if (fetch.isEnvelope()) {
result.or(FetchGroup.HEADERS);
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
index 5c1f626..58102dd 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
@@ -35,7 +35,6 @@ import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.FetchGroupImpl;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
-import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MessageResultIterator;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
import org.junit.jupiter.api.BeforeEach;
@@ -72,7 +71,7 @@ public class MailboxAppenderTest {
testee.append(mimeMessage, USER, FOLDER);
MessageResultIterator messages = mailboxManager.getMailbox(MailboxPath.forUser(USER, FOLDER), session)
- .getMessages(MessageRange.all(), new FetchGroupImpl(MessageResult.FetchGroup.FULL_CONTENT), session);
+ .getMessages(MessageRange.all(), FetchGroupImpl.FULL_CONTENT, session);
assertThat(messages).toIterable()
.hasSize(1);
@@ -86,7 +85,7 @@ public class MailboxAppenderTest {
testee.append(mimeMessage, USER, FOLDER);
MessageResultIterator messages = mailboxManager.getMailbox(mailboxPath, session)
- .getMessages(MessageRange.all(), new FetchGroupImpl(MessageResult.FetchGroup.FULL_CONTENT), session);
+ .getMessages(MessageRange.all(), FetchGroupImpl.FULL_CONTENT, session);
assertThat(messages).toIterable()
.hasSize(1);
@@ -103,7 +102,7 @@ public class MailboxAppenderTest {
testee.append(mimeMessage, USER, "." + FOLDER);
MessageResultIterator messages = mailboxManager.getMailbox(MailboxPath.forUser(USER, FOLDER), session)
- .getMessages(MessageRange.all(), new FetchGroupImpl(MessageResult.FetchGroup.FULL_CONTENT), session);
+ .getMessages(MessageRange.all(), FetchGroupImpl.FULL_CONTENT, session);
assertThat(messages).toIterable()
.hasSize(1);
@@ -114,7 +113,7 @@ public class MailboxAppenderTest {
testee.append(mimeMessage, USER, FOLDER + "/any");
MessageResultIterator messages = mailboxManager.getMailbox(MailboxPath.forUser(USER, FOLDER + ".any"), session)
- .getMessages(MessageRange.all(), new FetchGroupImpl(MessageResult.FetchGroup.FULL_CONTENT), session);
+ .getMessages(MessageRange.all(), FetchGroupImpl.FULL_CONTENT, session);
assertThat(messages).toIterable()
.hasSize(1);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org