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 fe...@apache.org on 2011/04/14 13:21:16 UTC
svn commit: r1092137 [5/9] - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/
api/src/main/java/org/apache/james/imap/api/display/
api/src/main/java/org/apache/james/imap/api/message/
api/src/main/java/org/apache/james/imap/api/messag...
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java Thu Apr 14 11:21:11 2011
@@ -39,8 +39,7 @@ public interface ImapResponseComposer {
* @param responseCode
* response code or null when there is no response code
*/
- public ImapResponseComposer untaggedNoResponse(String displayMessage,
- String responseCode) throws IOException;
+ public ImapResponseComposer untaggedNoResponse(String displayMessage, String responseCode) throws IOException;
/**
* Writes flags to output using standard format.
@@ -93,8 +92,7 @@ public interface ImapResponseComposer {
* @throws IOException
* @see {@link #endEnvelope(String, String)} must be called
*/
- public ImapResponseComposer startEnvelope(String date, String subject,
- boolean prefixWithName) throws IOException;
+ public ImapResponseComposer startEnvelope(String date, String subject, boolean prefixWithName) throws IOException;
/**
* Starts a list of addresses.
@@ -116,8 +114,7 @@ public interface ImapResponseComposer {
* host name, or null for <code>NIL</code>
* @throws IOException
*/
- public ImapResponseComposer address(String name, String domainList,
- String mailbox, String host) throws IOException;
+ public ImapResponseComposer address(String name, String domainList, String mailbox, String host) throws IOException;
/**
* Ends a list of addresses.
@@ -135,8 +132,7 @@ public interface ImapResponseComposer {
* envelope message-id, or null for <code>NIL</code>
* @throws IOException
*/
- public ImapResponseComposer endEnvelope(String inReplyTo, String messageId)
- throws IOException;
+ public ImapResponseComposer endEnvelope(String inReplyTo, String messageId) throws IOException;
/**
* Composes a <code>NIL</code>.
@@ -145,8 +141,7 @@ public interface ImapResponseComposer {
*/
public ImapResponseComposer nil() throws IOException;
- public ImapResponseComposer commandResponse(ImapCommand command, String message)
- throws IOException;
+ public ImapResponseComposer commandResponse(ImapCommand command, String message) throws IOException;
/**
* Writes a list response
@@ -160,8 +155,7 @@ public interface ImapResponseComposer {
* @param name
* mailbox name
*/
- public ImapResponseComposer listResponse(String typeName, List<String> attributes,
- char hierarchyDelimiter, String name) throws IOException;
+ public ImapResponseComposer listResponse(String typeName, List<String> attributes, char hierarchyDelimiter, String name) throws IOException;
/**
* Writes the message provided to the client, prepended with the request
@@ -170,8 +164,7 @@ public interface ImapResponseComposer {
* @param message
* The message to write to the client.
*/
- public ImapResponseComposer taggedResponse(String message, String tag)
- throws IOException;
+ public ImapResponseComposer taggedResponse(String message, String tag) throws IOException;
/**
* Writes the message provided to the client, prepended with the untagged
@@ -183,15 +176,14 @@ public interface ImapResponseComposer {
public ImapResponseComposer untaggedResponse(String message) throws IOException;
public ImapResponseComposer byeResponse(String message) throws IOException;
-
+
public ImapResponseComposer hello(String message) throws IOException;
public ImapResponseComposer untagged() throws IOException;
public ImapResponseComposer commandName(final String name) throws IOException;
- public ImapResponseComposer message(final String message)
- throws IOException;
+ public ImapResponseComposer message(final String message) throws IOException;
public ImapResponseComposer message(final long number) throws IOException;
@@ -199,13 +191,9 @@ public interface ImapResponseComposer {
public ImapResponseComposer tag(String tag) throws IOException;
- public ImapResponseComposer statusResponse(String tag, ImapCommand command,
- String type, String responseCode, Collection<String> parameters,
- boolean useParens, long number, String text) throws IOException;
-
- public ImapResponseComposer statusResponse(Long messages, Long recent,
- Long uidNext, Long uidValidity, Long unseen, String mailboxName)
- throws IOException;
+ public ImapResponseComposer statusResponse(String tag, ImapCommand command, String type, String responseCode, Collection<String> parameters, boolean useParens, long number, String text) throws IOException;
+
+ public ImapResponseComposer statusResponse(Long messages, Long recent, Long uidNext, Long uidValidity, Long unseen, String mailboxName) throws IOException;
public void quote(String message) throws IOException;
@@ -225,8 +213,7 @@ public interface ImapResponseComposer {
* @return self, not null
* @throws IOException
*/
- public ImapResponseComposer upperCaseAscii(final String message)
- throws IOException;
+ public ImapResponseComposer upperCaseAscii(final String message) throws IOException;
/**
* Appends the given message after conversion to upper case. The message may
@@ -238,8 +225,7 @@ public interface ImapResponseComposer {
* @return self, not null
* @throws IOException
*/
- public ImapResponseComposer quoteUpperCaseAscii(final String message)
- throws IOException;
+ public ImapResponseComposer quoteUpperCaseAscii(final String message) throws IOException;
/**
* Appends the given message after appropriate quoting (when not null) or
@@ -250,8 +236,7 @@ public interface ImapResponseComposer {
* @return self, not null
* @throws IOException
*/
- public ImapResponseComposer nillableQuote(String message)
- throws IOException;
+ public ImapResponseComposer nillableQuote(String message) throws IOException;
/**
* Composes a sequence of nillables quotes. When messages are null, a single
@@ -263,15 +248,14 @@ public interface ImapResponseComposer {
* @return self, not null
* @throws IOException
*/
- public ImapResponseComposer nillableQuotes(List<String> quotes)
- throws IOException;
+ public ImapResponseComposer nillableQuotes(List<String> quotes) throws IOException;
/**
* Composes a nillable composition. When the master quote is null,
- * <code>NIL</code> is appended. Otherwise, a parenthesized list is
- * created starting with the master quote. When the quotes are null,
- * <code>NIL</code> is appended only. Otherwise, each element is appended
- * in sequence as per {@link #nillableQuote(String)}
+ * <code>NIL</code> is appended. Otherwise, a parenthesized list is created
+ * starting with the master quote. When the quotes are null,
+ * <code>NIL</code> is appended only. Otherwise, each element is appended in
+ * sequence as per {@link #nillableQuote(String)}
*
* @param quote
* master, possibly null
@@ -280,20 +264,21 @@ public interface ImapResponseComposer {
* @return self, not null
* @throws IOException
*/
- public ImapResponseComposer nillableComposition(String masterQuote,
- List<String> quotes) throws IOException;
+ public ImapResponseComposer nillableComposition(String masterQuote, List<String> quotes) throws IOException;
public void skipNextSpace() throws IOException;
/**
- * Composes a <code>CAPABILITY</code> response.
- * See <code>7.2.1</code> of
- * <a href='http://james.apache.org/server/rfclist/imap4/rfc2060.txt' rel='tag'>RFC2060</a>.
- * @param capabilities not null
- * @throws IOException
+ * Composes a <code>CAPABILITY</code> response. See <code>7.2.1</code> of <a
+ * href='http://james.apache.org/server/rfclist/imap4/rfc2060.txt'
+ * rel='tag'>RFC2060</a>.
+ *
+ * @param capabilities
+ * not null
+ * @throws IOException
*/
public ImapResponseComposer capabilities(List<String> capabilities) throws IOException;
-
+
/**
* Writes a continuation response.
*
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java Thu Apr 14 11:21:11 2011
@@ -33,8 +33,7 @@ import org.apache.james.imap.message.res
* </p>
*/
public interface ImapResponseWriter {
-
-
+
/**
* Writes literal content to the client
*
@@ -43,12 +42,12 @@ public interface ImapResponseWriter {
* @throws IOException
*/
void write(Literal literal) throws IOException;
-
+
/**
* Write a ByteBuffer to the client
*
- * @param buffer
- * <code>ByteBuffer</code> to be written, not null
+ * @param buffer
+ * <code>ByteBuffer</code> to be written, not null
* @throws IOException
*/
void write(ByteBuffer buffer) throws IOException;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -36,11 +36,9 @@ public class LSubResponseEncoder extends
super(next);
}
- protected void doEncode(final ImapMessage acceptableMessage,
- final ImapResponseComposer composer, ImapSession session) throws IOException {
+ protected void doEncode(final ImapMessage acceptableMessage, final ImapResponseComposer composer, ImapSession session) throws IOException {
final AbstractListingResponse response = (AbstractListingResponse) acceptableMessage;
- ListingEncodingUtils.encodeListingResponse(
- ImapConstants.LSUB_RESPONSE_NAME, composer, response);
+ ListingEncodingUtils.encodeListingResponse(ImapConstants.LSUB_RESPONSE_NAME, composer, response);
}
protected boolean isAcceptable(ImapMessage message) {
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -36,11 +36,9 @@ public class ListResponseEncoder extends
super(next);
}
- protected void doEncode(final ImapMessage acceptableMessage,
- final ImapResponseComposer composer, ImapSession session) throws IOException {
+ protected void doEncode(final ImapMessage acceptableMessage, final ImapResponseComposer composer, ImapSession session) throws IOException {
final AbstractListingResponse response = (AbstractListingResponse) acceptableMessage;
- ListingEncodingUtils.encodeListingResponse(
- ImapConstants.LIST_RESPONSE_NAME, composer, response);
+ ListingEncodingUtils.encodeListingResponse(ImapConstants.LIST_RESPONSE_NAME, composer, response);
}
protected boolean isAcceptable(ImapMessage message) {
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java Thu Apr 14 11:21:11 2011
@@ -32,9 +32,7 @@ import org.apache.james.imap.message.res
*/
public class ListingEncodingUtils {
- public static void encodeListingResponse(final String responseTypeName,
- final ImapResponseComposer composer,
- final AbstractListingResponse response) throws IOException {
+ public static void encodeListingResponse(final String responseTypeName, final ImapResponseComposer composer, final AbstractListingResponse response) throws IOException {
final List<String> attributes = getNameAttributes(response);
final String name = response.getName();
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -35,12 +35,9 @@ public class MailboxStatusResponseEncode
super(next);
}
- protected void doEncode(ImapMessage acceptableMessage,
- ImapResponseComposer composer, ImapSession session) throws IOException {
+ protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
MailboxStatusResponse response = (MailboxStatusResponse) acceptableMessage;
- composer.statusResponse(response.getMessages(), response.getRecent(),
- response.getUidNext(), response.getUidValidity(), response
- .getUnseen(), response.getMailbox());
+ composer.statusResponse(response.getMessages(), response.getRecent(), response.getUidNext(), response.getUidValidity(), response.getUnseen(), response.getMailbox());
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -38,26 +38,22 @@ public class NamespaceResponseEncoder ex
}
@Override
- protected void doEncode(ImapMessage acceptableMessage,
- ImapResponseComposer composer, ImapSession session)
- throws IOException {
+ protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
final NamespaceResponse response = (NamespaceResponse) acceptableMessage;
composer.untagged();
composer.commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
- final List<NamespaceResponse.Namespace> personal = response
- .getPersonal();
+ final List<NamespaceResponse.Namespace> personal = response.getPersonal();
encode(personal, composer);
final List<NamespaceResponse.Namespace> users = response.getUsers();
encode(users, composer);
final List<NamespaceResponse.Namespace> shared = response.getShared();
encode(shared, composer);
-
+
composer.end();
}
- private void encode(List<Namespace> namespaces,
- ImapResponseComposer composer) throws IOException {
+ private void encode(List<Namespace> namespaces, ImapResponseComposer composer) throws IOException {
if (namespaces == null || namespaces.isEmpty()) {
composer.nil();
} else {
@@ -69,12 +65,11 @@ public class NamespaceResponseEncoder ex
}
}
- private void encode(Namespace namespace, ImapResponseComposer composer)
- throws IOException {
+ private void encode(Namespace namespace, ImapResponseComposer composer) throws IOException {
composer.openParen();
String prefix = namespace.getPrefix();
String delimiter = Character.toString(namespace.getDelimiter());
-
+
if (prefix.length() > 0) {
prefix = prefix + delimiter;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -36,8 +36,7 @@ public class RecentResponseEncoder exten
return (message instanceof RecentResponse);
}
- protected void doEncode(ImapMessage acceptableMessage,
- ImapResponseComposer composer, ImapSession session) throws IOException { // TODO
+ protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException { // TODO
// Auto-generated
// method stub
final RecentResponse recentResponse = (RecentResponse) acceptableMessage;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -34,8 +34,7 @@ public class SearchResponseEncoder exten
super(next);
}
- protected void doEncode(ImapMessage acceptableMessage,
- ImapResponseComposer composer, ImapSession session) throws IOException {
+ protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
SearchResponse response = (SearchResponse) acceptableMessage;
final long[] ids = response.getIds();
composer.searchResponse(ids);
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -38,14 +38,13 @@ import org.apache.james.imap.encode.base
public class StatusResponseEncoder extends AbstractChainedImapEncoder {
private final Localizer localizer;
-
+
public StatusResponseEncoder(ImapEncoder next, final Localizer localizer) {
super(next);
this.localizer = localizer;
}
- protected void doEncode(ImapMessage acceptableMessage,
- ImapResponseComposer composer, ImapSession session) throws IOException {
+ protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
StatusResponse response = (StatusResponse) acceptableMessage;
final Type serverResponseType = response.getServerResponseType();
final String type = asString(serverResponseType);
@@ -67,8 +66,7 @@ public class StatusResponseEncoder exten
number = responseCode.getNumber();
useParens = responseCode.useParens();
}
- composer.statusResponse(tag, command, type, code, parameters, useParens, number,
- text);
+ composer.statusResponse(tag, command, type, code, parameters, useParens, number, text);
}
private String asString(HumanReadableText text, ImapSession session) {
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -37,14 +37,11 @@ public class XListResponseEncoder extend
super(next);
}
- protected void doEncode(final ImapMessage acceptableMessage,
- final ImapResponseComposer composer, ImapSession session) throws IOException {
+ protected void doEncode(final ImapMessage acceptableMessage, final ImapResponseComposer composer, ImapSession session) throws IOException {
final AbstractListingResponse response = (AbstractListingResponse) acceptableMessage;
- ListingEncodingUtils.encodeListingResponse(
- ImapConstants.XLIST_RESPONSE_NAME, composer, response);
+ ListingEncodingUtils.encodeListingResponse(ImapConstants.XLIST_RESPONSE_NAME, composer, response);
}
-
protected boolean isAcceptable(ImapMessage message) {
return (message instanceof XListResponse);
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java Thu Apr 14 11:21:11 2011
@@ -27,11 +27,10 @@ import org.apache.james.imap.encode.Imap
import org.apache.james.imap.encode.ImapResponseComposer;
/**
- * Abstract base class for chained {@link ImapEncoder} implementations. Implementations of this
- * will check if the {@link ImapMessage} should get encoded by this Implementation or should get
- * passed to the next {@link ImapEncoder} in the chain
- *
- *
+ * Abstract base class for chained {@link ImapEncoder} implementations.
+ * Implementations of this will check if the {@link ImapMessage} should get
+ * encoded by this Implementation or should get passed to the next
+ * {@link ImapEncoder} in the chain
*/
abstract public class AbstractChainedImapEncoder implements ImapEncoder {
@@ -43,11 +42,10 @@ abstract public class AbstractChainedIma
}
/**
- * Encode the {@link ImapMessage} if {@link #isAcceptable(ImapMessage)} return true, if not pass it to the
- * next encoder in the chain
+ * Encode the {@link ImapMessage} if {@link #isAcceptable(ImapMessage)}
+ * return true, if not pass it to the next encoder in the chain
*/
- public void encode(ImapMessage message, ImapResponseComposer composer, ImapSession session)
- throws IOException {
+ public void encode(ImapMessage message, ImapResponseComposer composer, ImapSession session) throws IOException {
final boolean isAcceptable = isAcceptable(message);
if (isAcceptable) {
doEncode(message, composer, session);
@@ -64,8 +62,7 @@ abstract public class AbstractChainedIma
* @param session
* @throws IOException
*/
- protected void chainEncode(ImapMessage message,
- ImapResponseComposer composer, ImapSession session) throws IOException {
+ protected void chainEncode(ImapMessage message, ImapResponseComposer composer, ImapSession session) throws IOException {
next.encode(message, composer, session);
}
@@ -86,8 +83,8 @@ abstract public class AbstractChainedIma
* <code>ImapMessage</code>, not null
* @param composer
* <code>ImapResponseComposer</code>, not null
- * @param session TODO
+ * @param session
+ * TODO
*/
- abstract protected void doEncode(ImapMessage acceptableMessage,
- ImapResponseComposer composer, ImapSession session) throws IOException;
+ abstract protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java Thu Apr 14 11:21:11 2011
@@ -28,19 +28,21 @@ import org.apache.james.imap.encode.Imap
import org.slf4j.Logger;
/**
- * {@link ImapEncoder} which should get added to the end of the encoder chain. It will handle the response
- * to the client about the unknown {@link ImapMessage}
- *
- *
+ * {@link ImapEncoder} which should get added to the end of the encoder chain.
+ * It will handle the response to the client about the unknown
+ * {@link ImapMessage}
*/
public class EndImapEncoder implements ImapEncoder {
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapEncoder#encode(org.apache.james.imap.api.ImapMessage, org.apache.james.imap.encode.ImapResponseComposer, org.apache.james.imap.api.process.ImapSession)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapEncoder#encode(org.apache.james.imap
+ * .api.ImapMessage, org.apache.james.imap.encode.ImapResponseComposer,
+ * org.apache.james.imap.api.process.ImapSession)
*/
- public void encode(ImapMessage message, ImapResponseComposer composer, ImapSession session)
- throws IOException {
+ public void encode(ImapMessage message, ImapResponseComposer composer, ImapSession session) throws IOException {
final Logger logger = session.getLog();
logger.warn("Unknown message");
if (logger.isDebugEnabled()) {
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java Thu Apr 14 11:21:11 2011
@@ -70,21 +70,21 @@ public class ImapResponseComposerImpl im
private boolean skipNextSpace;
-
public ImapResponseComposerImpl(final ImapResponseWriter writer, final int bufferSize) {
skipNextSpace = false;
buffer = ByteBuffer.allocate(bufferSize);
usAscii = Charset.forName("US-ASCII");
this.writer = writer;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#untaggedNoResponse(java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#untaggedNoResponse(
+ * java.lang.String, java.lang.String)
*/
- public ImapResponseComposer untaggedNoResponse(String displayMessage, String responseCode)
- throws IOException {
+ public ImapResponseComposer untaggedNoResponse(String displayMessage, String responseCode) throws IOException {
untagged();
message(NO);
responseCode(responseCode);
@@ -93,21 +93,25 @@ public class ImapResponseComposerImpl im
return this;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#continuationResponse(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#continuationResponse
+ * (java.lang.String)
*/
public ImapResponseComposer continuationResponse(String message) throws IOException {
writeASCII(CONTINUATION + SP + message);
end();
return this;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#flagsResponse(javax.mail.Flags)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#flagsResponse(javax
+ * .mail.Flags)
*/
public ImapResponseComposer flagsResponse(Flags flags) throws IOException {
untagged();
@@ -118,7 +122,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#existsResponse(long)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#existsResponse(long)
*/
public ImapResponseComposer existsResponse(long count) throws IOException {
untagged();
@@ -130,7 +136,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#recentResponse(long)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#recentResponse(long)
*/
public ImapResponseComposer recentResponse(long count) throws IOException {
untagged();
@@ -142,7 +150,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#expungeResponse(long)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#expungeResponse(long)
*/
public ImapResponseComposer expungeResponse(long msn) throws IOException {
untagged();
@@ -154,10 +164,12 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#commandResponse(org.apache.james.imap.api.ImapCommand, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#commandResponse(org
+ * .apache.james.imap.api.ImapCommand, java.lang.String)
*/
- public ImapResponseComposer commandResponse(ImapCommand command, String message)
- throws IOException {
+ public ImapResponseComposer commandResponse(ImapCommand command, String message) throws IOException {
untagged();
commandName(command.getName());
message(message);
@@ -165,10 +177,12 @@ public class ImapResponseComposerImpl im
return this;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#taggedResponse(java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#taggedResponse(java
+ * .lang.String, java.lang.String)
*/
public ImapResponseComposer taggedResponse(String message, String tag) throws IOException {
tag(tag);
@@ -179,7 +193,10 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#untaggedResponse(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#untaggedResponse(java
+ * .lang.String)
*/
public ImapResponseComposer untaggedResponse(String message) throws IOException {
untagged();
@@ -190,7 +207,10 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#byeResponse(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#byeResponse(java.lang
+ * .String)
*/
public ImapResponseComposer byeResponse(String message) throws IOException {
untaggedResponse(BYE + SP + message);
@@ -199,7 +219,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#hello(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#hello(java.lang.String)
*/
public ImapResponseComposer hello(String message) throws IOException {
untaggedResponse(OK + SP + message);
@@ -208,6 +230,7 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#untagged()
*/
public ImapResponseComposer untagged() throws IOException {
@@ -217,17 +240,19 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#message(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#message(java.lang.String
+ * )
*/
- public ImapResponseComposer message(final String message)
- throws IOException {
+ public ImapResponseComposer message(final String message) throws IOException {
if (message != null) {
// TODO: consider message normalisation
// TODO: CR/NFs in message must be replaced
// TODO: probably best done in the writer
space();
writeASCII(message);
-
+
}
return this;
}
@@ -240,9 +265,9 @@ public class ImapResponseComposerImpl im
}
}
-
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#end()
*/
public ImapResponseComposer end() throws IOException {
@@ -250,10 +275,11 @@ public class ImapResponseComposerImpl im
return this;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#tag(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#tag(java.lang.String)
*/
public ImapResponseComposer tag(String tag) throws IOException {
writeASCII(tag);
@@ -262,11 +288,13 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#statusResponse(java.lang.String, org.apache.james.imap.api.ImapCommand, java.lang.String, java.lang.String, java.util.Collection, boolean, long, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#statusResponse(java
+ * .lang.String, org.apache.james.imap.api.ImapCommand, java.lang.String,
+ * java.lang.String, java.util.Collection, boolean, long, java.lang.String)
*/
- public ImapResponseComposer statusResponse(String tag, ImapCommand command, String type,
- String responseCode, Collection<String> parameters, boolean useParens, long number, String text)
- throws IOException {
+ public ImapResponseComposer statusResponse(String tag, ImapCommand command, String type, String responseCode, Collection<String> parameters, boolean useParens, long number, String text) throws IOException {
if (tag == null) {
untagged();
} else {
@@ -280,14 +308,14 @@ public class ImapResponseComposerImpl im
message(number);
}
if (parameters != null && !parameters.isEmpty()) {
- if(useParens)
+ if (useParens)
openParen();
for (Iterator<String> it = parameters.iterator(); it.hasNext();) {
final String parameter = it.next();
message(parameter);
}
- if(useParens)
- closeParen();
+ if (useParens)
+ closeParen();
}
closeSquareBracket();
}
@@ -301,14 +329,15 @@ public class ImapResponseComposerImpl im
return this;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#statusResponse(java.lang.Long, java.lang.Long, java.lang.Long, java.lang.Long, java.lang.Long, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#statusResponse(java
+ * .lang.Long, java.lang.Long, java.lang.Long, java.lang.Long,
+ * java.lang.Long, java.lang.String)
*/
- public ImapResponseComposer statusResponse(Long messages, Long recent, Long uidNext,
- Long uidValidity, Long unseen, String mailboxName)
- throws IOException {
+ public ImapResponseComposer statusResponse(Long messages, Long recent, Long uidNext, Long uidValidity, Long unseen, String mailboxName) throws IOException {
untagged();
message(STATUS_COMMAND_NAME);
quote(mailboxName);
@@ -351,16 +380,18 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#listResponse(java.lang.String, java.util.List, java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#listResponse(java.lang
+ * .String, java.util.List, java.lang.String, java.lang.String)
*/
- public ImapResponseComposer listResponse(String typeName, List<String> attributes,
- char hierarchyDelimiter, String name) throws IOException {
+ public ImapResponseComposer listResponse(String typeName, List<String> attributes, char hierarchyDelimiter, String name) throws IOException {
untagged();
message(typeName);
openParen();
if (attributes != null) {
for (Iterator<String> it = attributes.iterator(); it.hasNext();) {
- final String attribute = it.next();
+ final String attribute = it.next();
message(attribute);
}
}
@@ -379,6 +410,7 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#closeParen()
*/
public ImapResponseComposer closeParen() throws IOException {
@@ -388,6 +420,7 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#openParen()
*/
public ImapResponseComposer openParen() throws IOException {
@@ -397,7 +430,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#searchResponse(long[])
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#searchResponse(long[])
*/
public ImapResponseComposer searchResponse(long[] ids) throws IOException {
untagged();
@@ -419,7 +454,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#flags(javax.mail.Flags)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#flags(javax.mail.Flags)
*/
public ImapResponseComposer flags(Flags flags) throws IOException {
message(FLAGS);
@@ -448,7 +485,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#closeFetchResponse()
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#closeFetchResponse()
*/
public ImapResponseComposer closeFetchResponse() throws IOException {
closeParen();
@@ -458,7 +497,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#openFetchResponse(long)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#openFetchResponse(long)
*/
public ImapResponseComposer openFetchResponse(long msn) throws IOException {
untagged();
@@ -468,13 +509,14 @@ public class ImapResponseComposerImpl im
return this;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#address(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#address(java.lang.String
+ * , java.lang.String, java.lang.String, java.lang.String)
*/
- public ImapResponseComposer address(String name, String domainList, String mailbox,
- String host) throws IOException {
+ public ImapResponseComposer address(String name, String domainList, String mailbox, String host) throws IOException {
skipNextSpace();
openParen();
nillableQuote(name);
@@ -487,6 +529,7 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#endAddresses()
*/
public ImapResponseComposer endAddresses() throws IOException {
@@ -496,10 +539,12 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#endEnvelope(java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#endEnvelope(java.lang
+ * .String, java.lang.String)
*/
- public ImapResponseComposer endEnvelope(String inReplyTo, String messageId)
- throws IOException {
+ public ImapResponseComposer endEnvelope(String inReplyTo, String messageId) throws IOException {
nillableQuote(inReplyTo);
nillableQuote(messageId);
closeParen();
@@ -508,6 +553,7 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#nil()
*/
public ImapResponseComposer nil() throws IOException {
@@ -517,6 +563,7 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#startAddresses()
*/
public ImapResponseComposer startAddresses() throws IOException {
@@ -526,10 +573,12 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#startEnvelope(java.lang.String, java.lang.String, boolean)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#startEnvelope(java.
+ * lang.String, java.lang.String, boolean)
*/
- public ImapResponseComposer startEnvelope(String date, String subject,
- boolean prefixWithName) throws IOException {
+ public ImapResponseComposer startEnvelope(String date, String subject, boolean prefixWithName) throws IOException {
if (prefixWithName) {
message(ENVELOPE);
}
@@ -541,10 +590,12 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#nillableQuote(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#nillableQuote(java.
+ * lang.String)
*/
- public ImapResponseComposer nillableQuote(String message)
- throws IOException {
+ public ImapResponseComposer nillableQuote(String message) throws IOException {
if (message == null) {
nil();
} else {
@@ -553,13 +604,14 @@ public class ImapResponseComposerImpl im
return this;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#nillableComposition(java.lang.String, java.util.List)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#nillableComposition
+ * (java.lang.String, java.util.List)
*/
- public ImapResponseComposer nillableComposition(String masterQuote,
- List<String> quotes) throws IOException {
+ public ImapResponseComposer nillableComposition(String masterQuote, List<String> quotes) throws IOException {
if (masterQuote == null) {
nil();
} else {
@@ -573,15 +625,17 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#nillableQuotes(java.util.List)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#nillableQuotes(java
+ * .util.List)
*/
- public ImapResponseComposer nillableQuotes(List<String> quotes)
- throws IOException {
+ public ImapResponseComposer nillableQuotes(List<String> quotes) throws IOException {
if (quotes == null || quotes.size() == 0) {
nil();
} else {
openParen();
- for (final String string:quotes) {
+ for (final String string : quotes) {
nillableQuote(string);
}
closeParen();
@@ -591,10 +645,12 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#upperCaseAscii(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#upperCaseAscii(java
+ * .lang.String)
*/
- public ImapResponseComposer upperCaseAscii(String message)
- throws IOException {
+ public ImapResponseComposer upperCaseAscii(String message) throws IOException {
if (message == null) {
nil();
} else {
@@ -605,10 +661,12 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#quoteUpperCaseAscii(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#quoteUpperCaseAscii
+ * (java.lang.String)
*/
- public ImapResponseComposer quoteUpperCaseAscii(String message)
- throws IOException {
+ public ImapResponseComposer quoteUpperCaseAscii(String message) throws IOException {
if (message == null) {
nil();
} else {
@@ -619,19 +677,21 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#capabilities(java.util.List)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#capabilities(java.util
+ * .List)
*/
public ImapResponseComposer capabilities(List<String> capabilities) throws IOException {
untagged();
message(CAPABILITY_COMMAND_NAME);
- for(String capability:capabilities) {
+ for (String capability : capabilities) {
message(capability);
}
end();
return this;
}
-
-
+
private void writeASCII(final String string) throws IOException {
final ByteBuffer buffer = usAscii.encode(string);
writer.write(buffer);
@@ -643,13 +703,13 @@ public class ImapResponseComposerImpl im
}
private void write(byte b) throws IOException {
- final ByteBuffer wrap = ByteBuffer.wrap(new byte[] {b});
+ final ByteBuffer wrap = ByteBuffer.wrap(new byte[] { b });
writer.write(wrap);
}
-
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#message(long)
*/
public ImapResponseComposer message(long number) throws IOException {
@@ -660,7 +720,10 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#commandName(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#commandName(java.lang
+ * .String)
*/
public ImapResponseComposer commandName(String commandName) throws IOException {
space();
@@ -670,7 +733,9 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#quote(java.lang.String)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#quote(java.lang.String)
*/
public void quote(String message) throws IOException {
space();
@@ -705,14 +770,11 @@ public class ImapResponseComposerImpl im
}
}
-
-
private void closeBracket(final byte bracket) throws IOException {
write(bracket);
clearSkipNextSpace();
}
-
private void openBracket(final byte bracket) throws IOException {
space();
write(bracket);
@@ -725,6 +787,7 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapResponseComposer#skipNextSpace()
*/
public void skipNextSpace() {
@@ -741,7 +804,10 @@ public class ImapResponseComposerImpl im
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseComposer#literal(org.apache.james.imap.message.response.Literal)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseComposer#literal(org.apache.
+ * james.imap.message.response.Literal)
*/
public void literal(Literal literal) throws IOException {
space();
@@ -754,7 +820,7 @@ public class ImapResponseComposerImpl im
writer.write(literal);
}
}
-
+
private void closeSquareBracket() throws IOException {
closeBracket(BYTE_CLOSE_SQUARE_BRACKET);
}
@@ -763,9 +829,7 @@ public class ImapResponseComposerImpl im
openBracket(BYTE_OPEN_SQUARE_BRACKET);
}
-
- private void upperCaseAscii(String message, boolean quote)
- throws IOException {
+ private void upperCaseAscii(String message, boolean quote) throws IOException {
space();
final int length = message.length();
buffer.clear();
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java Thu Apr 14 11:21:11 2011
@@ -45,55 +45,48 @@ public class DefaultImapEncoderFactory i
/**
* Builds the default encoder
- * @param localizer not null
- * @param neverAddBodyStructureExtensions true to activate a workaround for broken clients who
- * cannot parse BODYSTRUCTURE extensions, false to fully support RFC3501
+ *
+ * @param localizer
+ * not null
+ * @param neverAddBodyStructureExtensions
+ * true to activate a workaround for broken clients who cannot
+ * parse BODYSTRUCTURE extensions, false to fully support RFC3501
* @return not null
*/
public static final ImapEncoder createDefaultEncoder(final Localizer localizer, final boolean neverAddBodyStructureExtensions) {
final EndImapEncoder endImapEncoder = new EndImapEncoder();
final NamespaceResponseEncoder namespaceEncoder = new NamespaceResponseEncoder(endImapEncoder);
- final StatusResponseEncoder statusResponseEncoder = new StatusResponseEncoder(
- namespaceEncoder, localizer);
- final RecentResponseEncoder recentResponseEncoder = new RecentResponseEncoder(
- statusResponseEncoder);
- final FetchResponseEncoder fetchResponseEncoder = new FetchResponseEncoder(
- recentResponseEncoder, neverAddBodyStructureExtensions);
- final ExpungeResponseEncoder expungeResponseEncoder = new ExpungeResponseEncoder(
- fetchResponseEncoder);
- final ExistsResponseEncoder existsResponseEncoder = new ExistsResponseEncoder(
- expungeResponseEncoder);
- final MailboxStatusResponseEncoder statusCommandResponseEncoder = new MailboxStatusResponseEncoder(
- existsResponseEncoder);
- final SearchResponseEncoder searchResponseEncoder = new SearchResponseEncoder(
- statusCommandResponseEncoder);
- final LSubResponseEncoder lsubResponseEncoder = new LSubResponseEncoder(
- searchResponseEncoder);
- final ListResponseEncoder listResponseEncoder = new ListResponseEncoder(
- lsubResponseEncoder);
- final XListResponseEncoder xListResponseEncoder = new XListResponseEncoder(
- listResponseEncoder);
- final FlagsResponseEncoder flagsResponseEncoder = new FlagsResponseEncoder(
- xListResponseEncoder);
- final CapabilityResponseEncoder capabilityResponseEncoder = new CapabilityResponseEncoder(
- flagsResponseEncoder);
- final ContinuationResponseEncoder continuationResponseEncoder = new ContinuationResponseEncoder(
- capabilityResponseEncoder, localizer);
+ final StatusResponseEncoder statusResponseEncoder = new StatusResponseEncoder(namespaceEncoder, localizer);
+ final RecentResponseEncoder recentResponseEncoder = new RecentResponseEncoder(statusResponseEncoder);
+ final FetchResponseEncoder fetchResponseEncoder = new FetchResponseEncoder(recentResponseEncoder, neverAddBodyStructureExtensions);
+ final ExpungeResponseEncoder expungeResponseEncoder = new ExpungeResponseEncoder(fetchResponseEncoder);
+ final ExistsResponseEncoder existsResponseEncoder = new ExistsResponseEncoder(expungeResponseEncoder);
+ final MailboxStatusResponseEncoder statusCommandResponseEncoder = new MailboxStatusResponseEncoder(existsResponseEncoder);
+ final SearchResponseEncoder searchResponseEncoder = new SearchResponseEncoder(statusCommandResponseEncoder);
+ final LSubResponseEncoder lsubResponseEncoder = new LSubResponseEncoder(searchResponseEncoder);
+ final ListResponseEncoder listResponseEncoder = new ListResponseEncoder(lsubResponseEncoder);
+ final XListResponseEncoder xListResponseEncoder = new XListResponseEncoder(listResponseEncoder);
+ final FlagsResponseEncoder flagsResponseEncoder = new FlagsResponseEncoder(xListResponseEncoder);
+ final CapabilityResponseEncoder capabilityResponseEncoder = new CapabilityResponseEncoder(flagsResponseEncoder);
+ final ContinuationResponseEncoder continuationResponseEncoder = new ContinuationResponseEncoder(capabilityResponseEncoder, localizer);
return continuationResponseEncoder;
}
private final Localizer localizer;
private final boolean neverAddBodyStructureExtensions;
-
+
public DefaultImapEncoderFactory() {
this(new DefaultLocalizer(), false);
}
-
+
/**
* Constructs the default factory for encoders
- * @param localizer not null
- * @param neverAddBodyStructureExtensions true to activate a workaround for broken clients who
- * cannot parse BODYSTRUCTURE extensions, false to fully support RFC3501
+ *
+ * @param localizer
+ * not null
+ * @param neverAddBodyStructureExtensions
+ * true to activate a workaround for broken clients who cannot
+ * parse BODYSTRUCTURE extensions, false to fully support RFC3501
*/
public DefaultImapEncoderFactory(final Localizer localizer, boolean neverAddBodyStructureExtensions) {
super();
@@ -103,6 +96,7 @@ public class DefaultImapEncoderFactory i
/*
* (non-Javadoc)
+ *
* @see org.apache.james.imap.encode.ImapEncoderFactory#buildImapEncoder()
*/
public ImapEncoder buildImapEncoder() {
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java Thu Apr 14 11:21:11 2011
@@ -24,8 +24,8 @@ import org.apache.james.imap.api.display
import org.apache.james.imap.api.display.Localizer;
/**
- * Just uses {@link HumanReadableText#getDefaultValue()}.
- * This implementation is independent of user, client and system locale.
+ * Just uses {@link HumanReadableText#getDefaultValue()}. This implementation is
+ * independent of user, client and system locale.
*/
public class DefaultLocalizer implements Localizer {
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java Thu Apr 14 11:21:11 2011
@@ -35,35 +35,25 @@ import org.slf4j.Logger;
public abstract class AbstractImapRequestHandler {
+ protected static final byte[] ABANDON_SIGNOFF = { '*', ' ', 'B', 'Y', 'E', ' ', 'A', 'b', 'a', 'n', 'd', 'o', 'n', 'e', 'd', '\r', '\n' };
- protected static final byte[] ABANDON_SIGNOFF = { '*', ' ', 'B', 'Y', 'E',
- ' ', 'A', 'b', 'a', 'n', 'd', 'o', 'n', 'e', 'd', '\r', '\n' };
+ protected static final byte[] MAILBOX_DELETED_SIGNOFF = { '*', ' ', 'B', 'Y', 'E', ' ', 'S', 'e', 'l', 'e', 'c', 't', 'e', 'd', ' ', 'm', 'a', 'i', 'l', 'b', 'o', 'x', ' ', 'h', 'a', 's', ' ', 'b', 'e', 'e', 'n', ' ', 'd', 'e', 'l', 'e', 't', 'e', 'd', '\r', '\n' };
- protected static final byte[] MAILBOX_DELETED_SIGNOFF = { '*', ' ', 'B', 'Y',
- 'E', ' ', 'S', 'e', 'l', 'e', 'c', 't', 'e', 'd', ' ', 'm', 'a',
- 'i', 'l', 'b', 'o', 'x', ' ', 'h', 'a', 's', ' ', 'b', 'e', 'e',
- 'n', ' ', 'd', 'e', 'l', 'e', 't', 'e', 'd', '\r', '\n' };
-
-
-
private final ImapDecoder decoder;
protected final ImapProcessor processor;
private final ImapEncoder encoder;
- public AbstractImapRequestHandler(final ImapDecoder decoder,
- final ImapProcessor processor, final ImapEncoder encoder) {
+ public AbstractImapRequestHandler(final ImapDecoder decoder, final ImapProcessor processor, final ImapEncoder encoder) {
this.decoder = decoder;
this.processor = processor;
this.encoder = encoder;
}
-
- protected boolean doProcessRequest(ImapRequestLineReader request,
- ImapResponseComposer response, ImapSession session) {
+
+ protected boolean doProcessRequest(ImapRequestLineReader request, ImapResponseComposer response, ImapSession session) {
ImapMessage message = decoder.decode(request, session);
- final ResponseEncoder responseEncoder = new ResponseEncoder(encoder,
- response, session);
+ final ResponseEncoder responseEncoder = new ResponseEncoder(encoder, response, session);
processor.process(message, responseEncoder, session);
-
+
final boolean result;
final IOException failure = responseEncoder.getFailure();
if (failure == null) {
@@ -79,7 +69,6 @@ public abstract class AbstractImapReques
return result;
}
-
protected boolean isSelectedMailboxDeleted(ImapSession session) {
final boolean selectedMailboxIsDeleted;
final SelectedMailbox mailbox = session.getSelected();
@@ -91,7 +80,6 @@ public abstract class AbstractImapReques
return selectedMailboxIsDeleted;
}
-
/**
* Silents swallows all responses.
*/
@@ -101,6 +89,5 @@ public abstract class AbstractImapReques
// Swallow
}
}
-
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java Thu Apr 14 11:21:11 2011
@@ -32,19 +32,19 @@ import org.apache.james.imap.message.res
*/
public class ChannelImapResponseWriter implements ImapResponseWriter {
-
private final WritableByteChannel out;
-
public ChannelImapResponseWriter(final WritableByteChannel out) {
super();
this.out = out;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseWriter#write(java.nio.ByteBuffer)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseWriter#write(java.nio.ByteBuffer
+ * )
*/
public void write(final ByteBuffer buffer) throws IOException {
while (out.write(buffer) > 0) { // NOPMD false positive
@@ -52,10 +52,12 @@ public class ChannelImapResponseWriter i
}
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james.imap.message.response.Literal)
+ *
+ * @see
+ * org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james
+ * .imap.message.response.Literal)
*/
public void write(Literal literal) throws IOException {
literal.writeTo(out);
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ContextualLog.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ContextualLog.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ContextualLog.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ContextualLog.java Thu Apr 14 11:21:11 2011
@@ -25,17 +25,16 @@ import org.slf4j.Marker;
* Decorates a log adding contextual information.
*/
public class ContextualLog implements Logger {
-
+
private final Object context;
private final Logger decoratedLog;
-
+
public ContextualLog(final Object context, final Logger decoratedLog) {
super();
this.context = context;
this.decoratedLog = decoratedLog;
}
-
public void debug(String message) {
if (isDebugEnabled()) {
if (context == null) {
@@ -143,7 +142,7 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString());
}
- }
+ }
}
public void warn(String message, Throwable t) {
@@ -153,57 +152,51 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString(), t);
}
- }
+ }
}
/**
* Renders this object suitably for logging.
*
- * @return a <code>String</code> representation
- * of this object.
+ * @return a <code>String</code> representation of this object.
*/
- public String toString()
- {
- final String result = "ContextualLog ( "
- + "context = " + this.context
- + " )";
-
+ public String toString() {
+ final String result = "ContextualLog ( " + "context = " + this.context + " )";
+
return result;
}
/**
- * Combines context with original message.
- * For logging systems which support object rendering,
- * a contextual logging aware renderer should be used.
+ * Combines context with original message. For logging systems which support
+ * object rendering, a contextual logging aware renderer should be used.
*/
public static final class Message {
private final Object context;
private final Object message;
-
+
public Message(final Object context, final Object message) {
super();
this.context = context;
this.message = message;
}
-
+
public Object getContext() {
return context;
}
-
+
public Object getMessage() {
return message;
}
-
+
public String toString() {
return context + " " + message;
}
}
public String getName() {
- return decoratedLog.getName();
+ return decoratedLog.getName();
}
-
public void trace(String message, Object arg) {
if (isTraceEnabled()) {
if (context == null) {
@@ -214,7 +207,6 @@ public class ContextualLog implements Lo
}
}
-
public void trace(String message, Object arg1, Object arg2) {
if (isTraceEnabled()) {
if (context == null) {
@@ -223,9 +215,8 @@ public class ContextualLog implements Lo
decoratedLog.trace(new Message(context, message).toString(), arg1, arg2);
}
}
-
- }
+ }
public void trace(String message, Object[] argArray) {
if (isTraceEnabled()) {
@@ -237,12 +228,10 @@ public class ContextualLog implements Lo
}
}
-
public boolean isTraceEnabled(Marker marker) {
- return decoratedLog.isTraceEnabled(marker);
+ return decoratedLog.isTraceEnabled(marker);
}
-
public void trace(Marker marker, String msg) {
if (isTraceEnabled(marker)) {
if (context == null) {
@@ -253,7 +242,6 @@ public class ContextualLog implements Lo
}
}
-
public void trace(Marker marker, String message, Object arg) {
if (isTraceEnabled(marker)) {
if (context == null) {
@@ -264,7 +252,6 @@ public class ContextualLog implements Lo
}
}
-
public void trace(Marker marker, String message, Object arg1, Object arg2) {
if (isTraceEnabled(marker)) {
if (context == null) {
@@ -275,7 +262,6 @@ public class ContextualLog implements Lo
}
}
-
public void trace(Marker marker, String message, Object[] argArray) {
if (isTraceEnabled(marker)) {
if (context == null) {
@@ -286,7 +272,6 @@ public class ContextualLog implements Lo
}
}
-
public void trace(Marker marker, String msg, Throwable t) {
if (isTraceEnabled(marker)) {
if (context == null) {
@@ -297,7 +282,6 @@ public class ContextualLog implements Lo
}
}
-
public void debug(String message, Object arg) {
if (isDebugEnabled()) {
if (context == null) {
@@ -308,7 +292,6 @@ public class ContextualLog implements Lo
}
}
-
public void debug(String message, Object arg1, Object arg2) {
if (isDebugEnabled()) {
if (context == null) {
@@ -319,7 +302,6 @@ public class ContextualLog implements Lo
}
}
-
public void debug(String message, Object[] argArray) {
if (isDebugEnabled()) {
if (context == null) {
@@ -330,12 +312,10 @@ public class ContextualLog implements Lo
}
}
-
public boolean isDebugEnabled(Marker marker) {
- return decoratedLog.isDebugEnabled(marker);
+ return decoratedLog.isDebugEnabled(marker);
}
-
public void debug(Marker marker, String msg) {
if (isDebugEnabled(marker)) {
if (context == null) {
@@ -346,7 +326,6 @@ public class ContextualLog implements Lo
}
}
-
public void debug(Marker marker, String message, Object arg) {
if (isDebugEnabled(marker)) {
if (context == null) {
@@ -357,7 +336,6 @@ public class ContextualLog implements Lo
}
}
-
public void debug(Marker marker, String message, Object arg1, Object arg2) {
if (isDebugEnabled(marker)) {
if (context == null) {
@@ -368,7 +346,6 @@ public class ContextualLog implements Lo
}
}
-
public void debug(Marker marker, String message, Object[] argArray) {
if (isDebugEnabled(marker)) {
if (context == null) {
@@ -379,7 +356,6 @@ public class ContextualLog implements Lo
}
}
-
public void debug(Marker marker, String msg, Throwable t) {
if (isDebugEnabled(marker)) {
if (context == null) {
@@ -390,7 +366,6 @@ public class ContextualLog implements Lo
}
}
-
public void info(String message, Object arg) {
if (isInfoEnabled()) {
if (context == null) {
@@ -401,7 +376,6 @@ public class ContextualLog implements Lo
}
}
-
public void info(String message, Object arg1, Object arg2) {
if (isInfoEnabled()) {
if (context == null) {
@@ -412,7 +386,6 @@ public class ContextualLog implements Lo
}
}
-
public void info(String message, Object[] argArray) {
if (isInfoEnabled()) {
if (context == null) {
@@ -423,12 +396,10 @@ public class ContextualLog implements Lo
}
}
-
public boolean isInfoEnabled(Marker marker) {
- return decoratedLog.isInfoEnabled(marker);
+ return decoratedLog.isInfoEnabled(marker);
}
-
public void info(Marker marker, String msg) {
if (isInfoEnabled(marker)) {
if (context == null) {
@@ -439,7 +410,6 @@ public class ContextualLog implements Lo
}
}
-
public void info(Marker marker, String message, Object arg) {
if (isInfoEnabled(marker)) {
if (context == null) {
@@ -450,7 +420,6 @@ public class ContextualLog implements Lo
}
}
-
public void info(Marker marker, String message, Object arg1, Object arg2) {
if (isInfoEnabled(marker)) {
if (context == null) {
@@ -461,7 +430,6 @@ public class ContextualLog implements Lo
}
}
-
public void info(Marker marker, String message, Object[] argArray) {
if (isInfoEnabled(marker)) {
if (context == null) {
@@ -472,7 +440,6 @@ public class ContextualLog implements Lo
}
}
-
public void info(Marker marker, String msg, Throwable t) {
if (isInfoEnabled(marker)) {
if (context == null) {
@@ -483,7 +450,6 @@ public class ContextualLog implements Lo
}
}
-
public void warn(String message, Object arg) {
if (isWarnEnabled()) {
if (context == null) {
@@ -491,10 +457,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString(), arg);
}
- }
+ }
}
-
public void warn(String message, Object[] argArray) {
if (isWarnEnabled()) {
if (context == null) {
@@ -502,10 +467,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString(), argArray);
}
- }
+ }
}
-
public void warn(String message, Object arg1, Object arg2) {
if (isWarnEnabled()) {
if (context == null) {
@@ -513,15 +477,13 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString(), arg1, arg2);
}
- }
+ }
}
-
public boolean isWarnEnabled(Marker marker) {
- return decoratedLog.isWarnEnabled(marker);
+ return decoratedLog.isWarnEnabled(marker);
}
-
public void warn(Marker marker, String msg) {
if (isWarnEnabled(marker)) {
if (context == null) {
@@ -529,10 +491,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, msg).toString());
}
- }
+ }
}
-
public void warn(Marker marker, String message, Object arg) {
if (isWarnEnabled(marker)) {
if (context == null) {
@@ -540,10 +501,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, message).toString(), arg);
}
- }
+ }
}
-
public void warn(Marker marker, String message, Object arg1, Object arg2) {
if (isWarnEnabled(marker)) {
if (context == null) {
@@ -551,10 +511,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, message).toString(), arg1, arg2);
}
- }
+ }
}
-
public void warn(Marker marker, String message, Object[] argArray) {
if (isWarnEnabled(marker)) {
if (context == null) {
@@ -562,10 +521,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, message).toString(), argArray);
}
- }
+ }
}
-
public void warn(Marker marker, String msg, Throwable t) {
if (isWarnEnabled(marker)) {
if (context == null) {
@@ -573,10 +531,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, msg).toString(), t);
}
- }
+ }
}
-
public void error(String message, Object arg) {
if (isErrorEnabled()) {
if (context == null) {
@@ -584,10 +541,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString(), arg);
}
- }
+ }
}
-
public void error(String message, Object arg1, Object arg2) {
if (isErrorEnabled()) {
if (context == null) {
@@ -595,10 +551,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString(), arg1, arg2);
}
- }
+ }
}
-
public void error(String message, Object[] argArray) {
if (isErrorEnabled()) {
if (context == null) {
@@ -606,15 +561,13 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(new Message(context, message).toString(), argArray);
}
- }
+ }
}
-
public boolean isErrorEnabled(Marker marker) {
- return decoratedLog.isErrorEnabled(marker);
+ return decoratedLog.isErrorEnabled(marker);
}
-
public void error(Marker marker, String msg) {
if (isErrorEnabled(marker)) {
if (context == null) {
@@ -622,10 +575,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, msg).toString());
}
- }
+ }
}
-
public void error(Marker marker, String message, Object arg) {
if (isErrorEnabled(marker)) {
if (context == null) {
@@ -633,10 +585,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, message).toString(), arg);
}
- }
+ }
}
-
public void error(Marker marker, String message, Object arg1, Object arg2) {
if (isErrorEnabled(marker)) {
if (context == null) {
@@ -644,10 +595,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, message).toString(), arg1, arg2);
}
- }
+ }
}
-
public void error(Marker marker, String message, Object[] argArray) {
if (isErrorEnabled(marker)) {
if (context == null) {
@@ -655,10 +605,9 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, message).toString(), argArray);
}
- }
+ }
}
-
public void error(Marker marker, String msg, Throwable t) {
if (isErrorEnabled(marker)) {
if (context == null) {
@@ -666,6 +615,6 @@ public class ContextualLog implements Lo
} else {
decoratedLog.warn(marker, new Message(context, msg).toString(), t);
}
- }
+ }
}
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ImapRequestStreamHandler.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ImapRequestStreamHandler.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ImapRequestStreamHandler.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ImapRequestStreamHandler.java Thu Apr 14 11:21:11 2011
@@ -36,12 +36,11 @@ import org.apache.james.imap.message.req
import org.slf4j.Logger;
/**
- * @version $Revision: 109034 $
+ *
*/
-public final class ImapRequestStreamHandler extends AbstractImapRequestHandler{
+public final class ImapRequestStreamHandler extends AbstractImapRequestHandler {
- public ImapRequestStreamHandler(final ImapDecoder decoder,
- final ImapProcessor processor, final ImapEncoder encoder) {
+ public ImapRequestStreamHandler(final ImapDecoder decoder, final ImapProcessor processor, final ImapEncoder encoder) {
super(decoder, processor, encoder);
}
@@ -56,35 +55,30 @@ public final class ImapRequestStreamHand
*
* @return whether additional commands are expected.
*/
- public boolean handleRequest(InputStream input, OutputStream output,
- ImapSession session) {
+ public boolean handleRequest(InputStream input, OutputStream output, ImapSession session) {
final boolean result;
if (isSelectedMailboxDeleted(session)) {
writeSignoff(output, session);
result = false;
} else {
- ImapRequestLineReader request = new ImapRequestStreamLineReader(input,
- output);
+ ImapRequestLineReader request = new ImapRequestStreamLineReader(input, output);
final Logger logger = session.getLog();
try {
request.nextChar();
} catch (DecodingException e) {
- logger.debug("Unexpected end of line. Cannot handle request: ",
- e);
+ logger.debug("Unexpected end of line. Cannot handle request: ", e);
abandon(output, session);
return false;
}
- ImapResponseComposerImpl response = new ImapResponseComposerImpl(
- new OutputStreamImapResponseWriter(output));
+ ImapResponseComposerImpl response = new ImapResponseComposerImpl(new OutputStreamImapResponseWriter(output));
if (doProcessRequest(request, response, session)) {
try {
// Consume the rest of the line, throwing away any extras.
- // This allows us
- // to clean up after a protocol error.
+ // This allows us to clean up after a protocol error.
request.consumeLine();
} catch (DecodingException e) {
// Cannot clean up. No recovery is therefore possible.
@@ -117,7 +111,7 @@ public final class ImapRequestStreamHand
}
private void abandon(OutputStream out, ImapSession session) {
- if (session != null){
+ if (session != null) {
try {
session.logout();
} catch (Throwable t) {
@@ -132,5 +126,4 @@ public final class ImapRequestStreamHand
processor.process(SystemMessage.FORCE_LOGOUT, new SilentResponder(), session);
}
-
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ResponseEncoder.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ResponseEncoder.java Thu Apr 14 11:21:11 2011
@@ -33,10 +33,8 @@ public class ResponseEncoder implements
private final ImapResponseComposer composer;
private IOException failure;
-
- public ResponseEncoder(final ImapEncoder encoder,
- final ImapResponseComposer composer, final ImapSession session) {
+ public ResponseEncoder(final ImapEncoder encoder, final ImapResponseComposer composer, final ImapSession session) {
super();
this.encoder = encoder;
this.composer = composer;
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java Thu Apr 14 11:21:11 2011
@@ -23,7 +23,6 @@ import org.apache.james.imap.api.message
/**
* Abstract base class for {@link ImapRequest} implementations
- *
*/
abstract public class AbstractImapRequest implements ImapRequest {
@@ -53,5 +52,5 @@ abstract public class AbstractImapReques
public final String getTag() {
return tag;
}
-
+
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java Thu Apr 14 11:21:11 2011
@@ -24,14 +24,11 @@ import org.apache.james.imap.api.message
/**
* {@link ImapRequest} which selects a Mailbox
- *
*/
-public abstract class AbstractMailboxSelectionRequest extends
- AbstractImapRequest {
+public abstract class AbstractMailboxSelectionRequest extends AbstractImapRequest {
private final String mailboxName;
- public AbstractMailboxSelectionRequest(final ImapCommand command,
- final String mailboxName, final String tag) {
+ public AbstractMailboxSelectionRequest(final ImapCommand command, final String mailboxName, final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java Thu Apr 14 11:21:11 2011
@@ -26,11 +26,8 @@ import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.request.ImapRequest;
-
/**
* {@link ImapRequest} which request the append of a message to a mailbox
- *
- *
*/
public class AppendRequest extends AbstractImapRequest {
private final String mailboxName;
@@ -41,8 +38,7 @@ public class AppendRequest extends Abstr
private final InputStream message;
- public AppendRequest(ImapCommand command, String mailboxName, Flags flags,
- Date datetime, InputStream message, String tag) {
+ public AppendRequest(ImapCommand command, String mailboxName, Flags flags, Date datetime, InputStream message, String tag) {
super(tag, command);
this.mailboxName = mailboxName;
this.flags = flags;
@@ -85,6 +81,5 @@ public class AppendRequest extends Abstr
public InputStream getMessage() {
return message;
}
-
-
+
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java Thu Apr 14 11:21:11 2011
@@ -20,13 +20,11 @@ package org.apache.james.imap.message.re
import org.apache.james.imap.api.ImapCommand;
-
public class AuthenticateRequest extends AbstractImapRequest {
private final String authType;
- public AuthenticateRequest(final ImapCommand command,
- final String authType, final String tag) {
+ public AuthenticateRequest(final ImapCommand command, final String authType, final String tag) {
super(tag, command);
this.authType = authType;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org