Author: norman Date: Sat Jan 7 22:08:17 2012 New Revision: 1228736 URL: http://svn.apache.org/viewvc?rev=1228736&view=rev Log: Use Set as return type of CapaCapability's method. See PROTOCOLS-84
Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java?rev=1228736&r1=1228735&r2=1228736&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCapability.java Sat Jan 7 22:08:17 2012 @@ -19,7 +19,7 @@ package org.apache.james.protocols.pop3.core; -import java.util.List; +import java.util.Set; import org.apache.james.protocols.pop3.POP3Session; @@ -37,5 +37,5 @@ public interface CapaCapability { * @param session * @return list */ - List<String> getImplementedCapabilities(POP3Session session); + Set<String> getImplementedCapabilities(POP3Session session); } Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java?rev=1228736&r1=1228735&r2=1228736&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java Sat Jan 7 22:08:17 2012 @@ -23,7 +23,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.james.protocols.api.Request; @@ -40,7 +42,7 @@ import org.apache.james.protocols.pop3.P public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHandler, CapaCapability { private List<CapaCapability> caps; private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("CAPA")); - private static final List<String> CAPS = Collections.unmodifiableList(Arrays.asList("PIPELINING")); + private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("PIPELINING"))); /** * @see @@ -51,9 +53,8 @@ public class CapaCmdHandler implements C POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, "Capability list follows"); for (int i = 0; i < caps.size(); i++) { - List<String> cList = caps.get(i).getImplementedCapabilities(session); - for (int a = 0; a < cList.size(); a++) { - response.appendLine(cList.get(a)); + for (String cap: caps.get(i).getImplementedCapabilities(session)) { + response.appendLine(cap); } } response.appendLine("."); @@ -74,10 +75,10 @@ public class CapaCmdHandler implements C * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, * java.util.List) */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void wireExtensions(Class interfaceName, List extension) throws WiringException { + @SuppressWarnings("unchecked") + public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(CapaCapability.class)) { - caps = extension; + caps = (List<CapaCapability>) extension; } } @@ -91,7 +92,7 @@ public class CapaCmdHandler implements C /** * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) */ - public List<String> getImplementedCapabilities(POP3Session session) { + public Set<String> getImplementedCapabilities(POP3Session session) { return CAPS; } Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java?rev=1228736&r1=1228735&r2=1228736&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java Sat Jan 7 22:08:17 2012 @@ -22,7 +22,8 @@ package org.apache.james.protocols.pop3. import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -37,7 +38,7 @@ import org.apache.james.protocols.pop3.S */ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapability { private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("STLS")); - private static final List<String> CAPS = Collections.unmodifiableList(Arrays.asList("STLS")); + private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("STLS"))); private static final Response BEGIN_TLS = new StartTlsPop3Response(POP3Response.OK_RESPONSE, "Begin TLS negotiation").immutable(); /** @@ -57,11 +58,11 @@ public class StlsCmdHandler implements C * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) */ @SuppressWarnings("unchecked") - public List<String> getImplementedCapabilities(POP3Session session) { + public Set<String> getImplementedCapabilities(POP3Session session) { if (session.isStartTLSSupported() && session.getHandlerState() == POP3Session.AUTHENTICATION_READY) { return CAPS; } else { - return Collections.EMPTY_LIST; + return Collections.EMPTY_SET; } } Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java?rev=1228736&r1=1228735&r2=1228736&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java Sat Jan 7 22:08:17 2012 @@ -25,8 +25,10 @@ import java.io.SequenceInputStream; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.NoSuchElementException; +import java.util.Set; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; @@ -41,7 +43,7 @@ import org.apache.james.protocols.pop3.m */ public class TopCmdHandler extends RetrCmdHandler implements CapaCapability { private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("TOP")); - private static final List<String> CAPS = Collections.unmodifiableList(Arrays.asList("TOP")); + private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("TOP"))); private static final Response SYNTAX_ERROR = new POP3Response(POP3Response.ERR_RESPONSE, "Usage: TOP [mail number] [Line number]").immutable(); private static final Response ERROR_MESSAGE_RETR = new POP3Response(POP3Response.ERR_RESPONSE, "Error while retrieving message.").immutable(); @@ -124,11 +126,11 @@ public class TopCmdHandler extends RetrC * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) */ @SuppressWarnings("unchecked") - public List<String> getImplementedCapabilities(POP3Session session) { + public Set<String> getImplementedCapabilities(POP3Session session) { if (session.getHandlerState() == POP3Session.TRANSACTION) { return CAPS; } else { - return Collections.EMPTY_LIST; + return Collections.EMPTY_SET; } } Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java?rev=1228736&r1=1228735&r2=1228736&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java Sat Jan 7 22:08:17 2012 @@ -23,7 +23,9 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.james.protocols.api.Request; @@ -39,7 +41,7 @@ import org.apache.james.protocols.pop3.m */ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapability { private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("UIDL")); - private static final List<String> CAPS = Collections.unmodifiableList(Arrays.asList("UIDL")); + private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("UIDL"))); /** * Handler method called upon receipt of a UIDL command. Returns a listing @@ -109,11 +111,11 @@ public class UidlCmdHandler implements C * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) */ @SuppressWarnings("unchecked") - public List<String> getImplementedCapabilities(POP3Session session) { + public Set<String> getImplementedCapabilities(POP3Session session) { if (session.getHandlerState() == POP3Session.TRANSACTION) { return CAPS; } else { - return Collections.EMPTY_LIST; + return Collections.EMPTY_SET; } } Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java?rev=1228736&r1=1228735&r2=1228736&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java Sat Jan 7 22:08:17 2012 @@ -22,7 +22,8 @@ package org.apache.james.protocols.pop3. import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -36,7 +37,7 @@ import org.apache.james.protocols.pop3.P public class UserCmdHandler implements CommandHandler<POP3Session>, CapaCapability { private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("USER")); - private static final List<String> CAPS = Collections.unmodifiableList(Arrays.asList("USER")); + private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("USER"))); /** @@ -57,7 +58,7 @@ public class UserCmdHandler implements C /** * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) */ - public List<String> getImplementedCapabilities(POP3Session session) { + public Set<String> getImplementedCapabilities(POP3Session session) { return CAPS; } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org