Author: norman
Date: Fri Jun 17 09:07:55 2011
New Revision: 1136815
URL: http://svn.apache.org/viewvc?rev=1136815&view=rev
Log:
Replace usage of FetchGroupImpl and also remove an not necessary synchronized
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java?rev=1136815&r1=1136814&r2=1136815&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
Fri Jun 17 09:07:55 2011
@@ -29,6 +29,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Set;
import org.apache.james.mailbox.Content;
import org.apache.james.mailbox.InputStreamContent;
@@ -37,7 +38,6 @@ import org.apache.james.mailbox.MailboxS
import org.apache.james.mailbox.MessageRange;
import org.apache.james.mailbox.MessageResult;
import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.util.FetchGroupImpl;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.CommandHandler;
@@ -50,7 +50,19 @@ import org.apache.james.protocols.api.Re
public class RetrCmdHandler implements CommandHandler<POP3Session> {
private final static String COMMAND_NAME = "RETR";
+ private final static FetchGroup GROUP = new FetchGroup() {
+ @Override
+ public int content() {
+ return FULL_CONTENT;
+ }
+
+ @Override
+ public Set<PartContentDescriptor> getPartContentDescriptors() {
+ return null;
+ }
+
+ };
/**
* Handler method called upon receipt of a RETR command. This command
* retrieves a particular mail message from the mailbox.
@@ -74,7 +86,7 @@ public class RetrCmdHandler implements C
MailboxSession mailboxSession = (MailboxSession)
session.getState().get(POP3Session.MAILBOX_SESSION);
Long uid = uidList.get(num - 1).getUid();
if (deletedUidList.contains(uid) == false) {
- Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), new
FetchGroupImpl(FetchGroup.FULL_CONTENT), mailboxSession);
+ Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), GROUP,
mailboxSession);
if (results.hasNext()) {
MessageResult result = results.next();
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java?rev=1136815&r1=1136814&r2=1136815&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
Fri Jun 17 09:07:55 2011
@@ -23,13 +23,13 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageRange;
import org.apache.james.mailbox.MessageResult;
import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.util.FetchGroupImpl;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.CommandHandler;
@@ -42,6 +42,20 @@ import org.apache.james.protocols.api.Re
public class RsetCmdHandler implements CommandHandler<POP3Session> {
private final static String COMMAND_NAME = "RSET";
+ private final static FetchGroup GROUP = new FetchGroup() {
+
+ @Override
+ public int content() {
+ return MINIMAL;
+ }
+
+ @Override
+ public Set<PartContentDescriptor> getPartContentDescriptors() {
+ return null;
+ }
+
+ };
+
/**
* Handler method called upon receipt of a RSET command. Calls stat() to
* reset the mailbox.
@@ -68,7 +82,7 @@ public class RsetCmdHandler implements C
MailboxSession mailboxSession = (MailboxSession)
session.getState().get(POP3Session.MAILBOX_SESSION);
List<MessageMetaData> uids = new ArrayList<MessageMetaData>();
- Iterator<MessageResult> it =
session.getUserMailbox().getMessages(MessageRange.all(), new
FetchGroupImpl(FetchGroup.MINIMAL), mailboxSession);
+ Iterator<MessageResult> it =
session.getUserMailbox().getMessages(MessageRange.all(), GROUP, mailboxSession);
while (it.hasNext()) {
MessageResult result = it.next();
uids.add(new MessageMetaData(result.getUid(),
result.getSize()));
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java?rev=1136815&r1=1136814&r2=1136815&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
Fri Jun 17 09:07:55 2011
@@ -32,6 +32,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Set;
import org.apache.james.mailbox.Content;
import org.apache.james.mailbox.InputStreamContent;
@@ -41,7 +42,6 @@ import org.apache.james.mailbox.MessageR
import org.apache.james.mailbox.MessageResult;
import org.apache.james.mailbox.MessageResult.FetchGroup;
import org.apache.james.mailbox.MessageResult.Header;
-import org.apache.james.mailbox.util.FetchGroupImpl;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.Request;
@@ -52,7 +52,20 @@ import org.apache.james.protocols.api.Re
*/
public class TopCmdHandler extends RetrCmdHandler implements CapaCapability {
private final static String COMMAND_NAME = "TOP";
+ private final static FetchGroup GROUP = new FetchGroup() {
+ @Override
+ public int content() {
+ return BODY_CONTENT | HEADERS;
+ }
+
+ @Override
+ public Set<PartContentDescriptor> getPartContentDescriptors() {
+ return null;
+ }
+
+ };
+
/**
* Handler method called upon receipt of a TOP command. This command
* retrieves the top N lines of a specified message in the mailbox.
@@ -95,9 +108,8 @@ public class TopCmdHandler extends RetrC
MailboxSession mailboxSession = (MailboxSession)
session.getState().get(POP3Session.MAILBOX_SESSION);
Long uid = uidList.get(num - 1).getUid();
if (deletedUidList.contains(uid) == false) {
- FetchGroupImpl fetchGroup = new
FetchGroupImpl(FetchGroup.BODY_CONTENT);
- fetchGroup.or(FetchGroup.HEADERS);
- Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), fetchGroup,
mailboxSession);
+
+ Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), GROUP,
mailboxSession);
if (results.hasNext()) {
MessageResult result = results.next();
@@ -209,7 +221,7 @@ public class TopCmdHandler extends RetrC
}
@Override
- public synchronized int read() throws IOException {
+ public int read() throws IOException {
if (limit != -1) {
if (count <= limit) {
int a = in.read();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
