[james-project] 08/23: JAMES-2989 POP3 should rely on mailbox-api fetch groups

[btellier]

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 844c0adbe7d6941a0c3ce94f76c89bb86ef3bc1d
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Mon Nov 25 11:37:24 2019 +0700

    JAMES-2989 POP3 should rely on mailbox-api fetch groups
---
 .../james/pop3server/mailbox/MailboxAdapter.java   | 48 +++-------------------
 1 file changed, 5 insertions(+), 43 deletions(-)

diff --git 
a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
 
b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
index b6ca3b2..996e3b3 100644
--- 
a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
+++ 
b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
@@ -22,10 +22,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.james.mailbox.MailboxManager;
@@ -33,6 +31,7 @@ import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.FetchGroupImpl;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageResult;
 import org.apache.james.mailbox.model.MessageResult.FetchGroup;
@@ -43,47 +42,10 @@ import com.github.steveash.guavate.Guavate;
 import com.google.common.collect.ImmutableList;
 
 public class MailboxAdapter implements Mailbox {
-
-    private abstract static class POP3FetchGroup implements FetchGroup {
-        @Override
-        public Set<PartContentDescriptor> getPartContentDescriptors() {
-            return new HashSet<>();
-        }
-    }
-
-    private static final FetchGroup FULL_GROUP = new POP3FetchGroup() {
-
-        @Override
-        public int content() {
-            return BODY_CONTENT | HEADERS;
-        }
-
-    };
-
-    private static final FetchGroup BODY_GROUP = new POP3FetchGroup() {
-
-        @Override
-        public int content() {
-            return BODY_CONTENT;
-        }
-
-    };
-
-    private static final FetchGroup HEADERS_GROUP = new POP3FetchGroup() {
-
-        @Override
-        public int content() {
-            return HEADERS;
-        }
-    };
-
-    private static final FetchGroup METADATA_GROUP = new POP3FetchGroup() {
-
-        @Override
-        public int content() {
-            return MINIMAL;
-        }
-    };
+    private static final FetchGroup FULL_GROUP = FetchGroupImpl.FULL_CONTENT;
+    private static final FetchGroup BODY_GROUP = FetchGroupImpl.BODY_CONTENT;
+    private static final FetchGroup HEADERS_GROUP = FetchGroupImpl.HEADERS;
+    private static final FetchGroup METADATA_GROUP = FetchGroupImpl.MINIMAL;
 
     private final MessageManager manager;
     private final MailboxSession session;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org