This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ebea6a8a98a0f132a36257b44d7b8c3fa8c229a0 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Nov 7 12:22:56 2019 +0700 [REFACTORING] Move used class of package protocols.imap in their right imap counterpart --- .../james/{protocols/imap/utils => imap/decode}/DecoderUtils.java | 3 +-- .../james/{protocols/imap => imap/decode}/DecodingException.java | 2 +- .../java/org/apache/james/imap/decode/FetchPartPathDecoder.java | 1 - .../java/org/apache/james/imap/decode/ImapRequestLineReader.java | 4 +--- .../org/apache/james/imap/decode/ImapRequestStreamLineReader.java | 5 ++--- .../apache/james/imap/decode/base/AbstractImapCommandParser.java | 2 +- .../java/org/apache/james/imap/decode/main/DefaultImapDecoder.java | 2 +- .../org/apache/james/imap/decode/main/ImapRequestStreamHandler.java | 2 +- .../james/imap/decode/parser/AbstractMessageRangeCommandParser.java | 2 +- .../james/imap/decode/parser/AbstractSelectionCommandParser.java | 2 +- .../apache/james/imap/decode/parser/AbstractUidCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/AppendCommandParser.java | 2 +- .../apache/james/imap/decode/parser/AuthenticateCommandParser.java | 2 +- .../apache/james/imap/decode/parser/CapabilityCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/CheckCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/CloseCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/CompressCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/CreateCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/DeleteACLCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/DeleteCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/EnableCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/ExpungeCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/FetchCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/GetACLCommandParser.java | 2 +- .../apache/james/imap/decode/parser/GetAnnotationCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/GetQuotaCommandParser.java | 2 +- .../apache/james/imap/decode/parser/GetQuotaRootCommandParser.java | 2 +- .../java/org/apache/james/imap/decode/parser/IdleCommandParser.java | 2 +- .../java/org/apache/james/imap/decode/parser/ListCommandParser.java | 2 +- .../apache/james/imap/decode/parser/ListRightsCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/LoginCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/LogoutCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/MyRightsCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/NamespaceCommandParser.java | 2 +- .../java/org/apache/james/imap/decode/parser/NoopCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/RenameCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/SearchCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/SetACLCommandParser.java | 2 +- .../apache/james/imap/decode/parser/SetAnnotationCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/SetQuotaCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/StartTLSCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/StatusCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/StoreCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/SubscribeCommandParser.java | 2 +- .../java/org/apache/james/imap/decode/parser/UidCommandParser.java | 2 +- .../org/apache/james/imap/decode/parser/UnselectCommandParser.java | 2 +- .../apache/james/imap/decode/parser/UnsubscribeCommandParser.java | 2 +- .../org/apache/james/imap/encode/base/ImapResponseComposerImpl.java | 2 +- .../org/apache/james/{protocols => }/imap/utils/EolInputStream.java | 2 +- .../james/{protocols => }/imap/utils/FastByteArrayOutputStream.java | 2 +- .../james/{protocols => }/imap/utils/FixedLengthInputStream.java | 2 +- .../imap/utils => imap/decode}/DecoderUtilsLocaleDateTest.java | 2 +- .../{protocols/imap/utils => imap/decode}/DecoderUtilsTest.java | 3 +-- .../java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java | 1 - .../org/apache/james/imap/decode/ImapRequestLineReaderTest.java | 1 - .../java/org/apache/james/imap/decode/main/IdRangeParseTest.java | 2 +- .../java/org/apache/james/imap/decode/parser/CopyParserTest.java | 2 +- .../apache/james/imap/decode/parser/CreateCommandParserTest.java | 2 +- .../imap/decode/parser/FetchCommandParserPartialFetchTest.java | 2 +- .../james/imap/decode/parser/GetAnnotationCommandParserTest.java | 2 +- .../org/apache/james/imap/decode/parser/GetQuotaParserTest.java | 2 +- .../org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java | 2 +- .../java/org/apache/james/imap/decode/parser/MoveParserTest.java | 2 +- .../imap/decode/parser/SearchCommandParserAndParenthesesTest.java | 2 +- .../imap/decode/parser/SearchCommandParserQuotedCharsetTest.java | 2 +- .../james/imap/decode/parser/SearchCommandParserSearchKeyTest.java | 2 +- .../imap/decode/parser/SearchCommandParserTopLevelAndTest.java | 2 +- .../james/imap/decode/parser/SetAnnotationCommandParserTest.java | 2 +- .../apache/james/imap/decode/parser/SetQuotaCommandParserTest.java | 2 +- .../james/imapserver/netty/AbstractNettyImapRequestLineReader.java | 2 +- .../apache/james/imapserver/netty/NettyImapRequestLineReader.java | 4 ++-- .../james/imapserver/netty/NettyStreamImapRequestLineReader.java | 6 +++--- 72 files changed, 73 insertions(+), 81 deletions(-) diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/DecoderUtils.java similarity index 99% rename from protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java rename to protocols/imap/src/main/java/org/apache/james/imap/decode/DecoderUtils.java index e819816..3ce137c 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/DecoderUtils.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.protocols.imap.utils; +package org.apache.james.imap.decode; import java.util.Calendar; import java.util.Date; @@ -29,7 +29,6 @@ import javax.mail.Flags; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.MessageFlags; -import org.apache.james.protocols.imap.DecodingException; /** * Utility procedures. diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/DecodingException.java similarity index 98% rename from protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java rename to protocols/imap/src/main/java/org/apache/james/imap/decode/DecodingException.java index 7abd964..db323ff 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/DecodingException.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.protocols.imap; +package org.apache.james.imap.decode; import java.io.IOException; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java index 3cbac01..ebc8099 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.james.imap.api.display.HumanReadableText; -import org.apache.james.protocols.imap.DecodingException; public class FetchPartPathDecoder { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java index 121ec3b..233d450 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java @@ -42,10 +42,8 @@ import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.api.message.request.DayMonthYear; import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.api.process.SearchResUtil; +import org.apache.james.imap.utils.FastByteArrayOutputStream; import org.apache.james.mailbox.MessageUid; -import org.apache.james.protocols.imap.DecodingException; -import org.apache.james.protocols.imap.utils.DecoderUtils; -import org.apache.james.protocols.imap.utils.FastByteArrayOutputStream; /** * Wraps the client input reader with a bunch of convenience methods, allowing diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java index c00aae1..1b1114b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java @@ -24,9 +24,8 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.james.imap.api.display.HumanReadableText; -import org.apache.james.protocols.imap.DecodingException; -import org.apache.james.protocols.imap.utils.EolInputStream; -import org.apache.james.protocols.imap.utils.FixedLengthInputStream; +import org.apache.james.imap.utils.EolInputStream; +import org.apache.james.imap.utils.FixedLengthInputStream; /** * {@link ImapRequestLineReader} which use normal IO Streaming diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java index babb6dc..a89f023 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java @@ -24,9 +24,9 @@ import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.MessagingImapCommandParser; -import org.apache.james.protocols.imap.DecodingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java index a89b2b9..b8095d7 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java @@ -23,11 +23,11 @@ import org.apache.james.imap.api.ImapSessionState; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapCommandParser; import org.apache.james.imap.decode.ImapCommandParserFactory; import org.apache.james.imap.decode.ImapDecoder; import org.apache.james.imap.decode.ImapRequestLineReader; -import org.apache.james.protocols.imap.DecodingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java index f720a6a..ce8567b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java @@ -26,6 +26,7 @@ import java.io.OutputStream; import org.apache.james.imap.api.ImapSessionState; import org.apache.james.imap.api.process.ImapProcessor; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapDecoder; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; @@ -33,7 +34,6 @@ import org.apache.james.imap.encode.ImapEncoder; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.main.AbstractImapRequestHandler; import org.apache.james.imap.message.request.SystemMessage; -import org.apache.james.protocols.imap.DecodingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java index 0970406..11642c8 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java @@ -23,9 +23,9 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.message.request.AbstractMessageRangeRequest; -import org.apache.james.protocols.imap.DecodingException; public abstract class AbstractMessageRangeCommandParser extends AbstractUidCommandParser { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java index d83a855..59bf7aa 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java @@ -25,12 +25,12 @@ import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.AbstractMailboxSelectionRequest; import org.apache.james.mailbox.MessageUid; -import org.apache.james.protocols.imap.DecodingException; public abstract class AbstractSelectionCommandParser extends AbstractImapCommandParser { private static final byte[] CONDSTORE = ImapConstants.SUPPORTS_CONDSTORE.getBytes(); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java index e845d66..cf48876 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java @@ -22,9 +22,9 @@ package org.apache.james.imap.decode.parser; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; -import org.apache.james.protocols.imap.DecodingException; abstract class AbstractUidCommandParser extends AbstractImapCommandParser { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java index c15b307..52a09c2 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java @@ -26,10 +26,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.AppendRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parses APPEND command diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java index a7058ce..dcaa3ca 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java @@ -22,11 +22,11 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.AuthenticateRequest; import org.apache.james.imap.message.request.IRAuthenticateRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parses AUTHENTICATE commands and also support SASL-IR (RFC4959) diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java index efc667d..69f9378 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.CapabilityRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parses CAPABILITY commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java index af447f7..3b249b4 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.CheckRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parses CHECK commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java index 585db77..a130a23 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.CloseRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse CLOSE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java index 15f5f94..c9681f3 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.CompressRequest; -import org.apache.james.protocols.imap.DecodingException; public class CompressCommandParser extends AbstractImapCommandParser { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java index 55ca7c6..9752423 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java @@ -24,11 +24,11 @@ import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.ImapSessionUtils; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.CreateRequest; import org.apache.james.mailbox.MailboxSession; -import org.apache.james.protocols.imap.DecodingException; import com.google.common.base.Splitter; import com.google.common.base.Strings; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java index 61bb63c..f5fa22e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteACLCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.DeleteACLRequest; -import org.apache.james.protocols.imap.DecodingException; /** * DELETEACL Parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java index 5e3e75f..a0a99cd 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.DeleteRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse DELETE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java index 7b747af..dca83f3 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java @@ -26,10 +26,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.EnableRequest; -import org.apache.james.protocols.imap.DecodingException; public class EnableCommandParser extends AbstractImapCommandParser { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java index a004646..afbc48c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java @@ -23,9 +23,9 @@ import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.message.request.ExpungeRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse EXPUNGE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java index a061d7f..65c5929 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java @@ -28,11 +28,11 @@ import org.apache.james.imap.api.message.BodyFetchElement; import org.apache.james.imap.api.message.FetchData; import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.FetchPartPathDecoder; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator; import org.apache.james.imap.message.request.FetchRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse FETCH commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java index 7f6b168..da5e3f1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.GetACLRequest; -import org.apache.james.protocols.imap.DecodingException; /** * GETACL Parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java index 1e32fac..153b7a3 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParser.java @@ -26,12 +26,12 @@ import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.GetAnnotationRequest; import org.apache.james.imap.message.request.GetAnnotationRequest.Depth; import org.apache.james.mailbox.model.MailboxAnnotationKey; -import org.apache.james.protocols.imap.DecodingException; import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableSet; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java index 76980c5..a216561 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.GetQuotaRequest; -import org.apache.james.protocols.imap.DecodingException; /** * GETQUOTA command parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java index 5737290..9c051ca 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/GetQuotaRootCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.GetQuotaRootRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Get Quota root command parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java index ecf43bd..91d33c8 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.IdleRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parses IDLE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java index b5f7f9a..569a815 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestLineReader.AtomCharValidator; import org.apache.james.imap.message.request.ListRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse LIST commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java index 2fa89d5..ef1437b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListRightsCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.ListRightsRequest; -import org.apache.james.protocols.imap.DecodingException; /** * LISTRIGHTS Parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java index dc02f54..fd9de6d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.LoginRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse LOGIN commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java index 8cf0705..23b94fd 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.LogoutRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse LOGOUT commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java index e289f80..c52ebfe 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/MyRightsCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.MyRightsRequest; -import org.apache.james.protocols.imap.DecodingException; /** * MYRIGHTS Parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java index a3aeb52..2901173 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.NamespaceRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse NAMESPACE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java index 6632089..d79cded 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.NoopRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parses NOOP commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java index 692e040..39cba01 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.RenameRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parses RENAME command diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java index 1724e73..22dc639 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java @@ -40,9 +40,9 @@ import org.apache.james.imap.api.message.response.StatusResponse; import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode; import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.message.request.SearchRequest; -import org.apache.james.protocols.imap.DecodingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java index bcbdc94..bb692cf 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetACLCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.SetACLRequest; -import org.apache.james.protocols.imap.DecodingException; /** * SETACL Parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java index b7ea830..1de124d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParser.java @@ -27,12 +27,12 @@ import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.SetAnnotationRequest; import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; -import org.apache.james.protocols.imap.DecodingException; import com.google.common.collect.ImmutableList; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java index ee081d4..42f5e6a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java @@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.SetQuotaRequest; -import org.apache.james.protocols.imap.DecodingException; /** * SETQUOTA command parser diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java index 8cd9e74..990ac5b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.StartTLSRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse STARTTLS commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java index 33e1b85..6157c97 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java @@ -24,11 +24,11 @@ import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.StatusDataItems; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.StatusRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse STATUS commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java index 1e320f0..b5c7460 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java @@ -26,10 +26,10 @@ import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator; import org.apache.james.imap.message.request.StoreRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse STORE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java index 4b5573c..f3829de 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.SubscribeRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse SUBSCRIBE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java index aad0faa..8865bf5 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java @@ -23,12 +23,12 @@ import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.DelegatingImapCommandParser; import org.apache.james.imap.decode.ImapCommandParser; import org.apache.james.imap.decode.ImapCommandParserFactory; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; -import org.apache.james.protocols.imap.DecodingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java index 78481e3..b0dcc7f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.UnselectRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse UNSELECT commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java index eed5bdf..7f69bbd 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java @@ -22,10 +22,10 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.base.AbstractImapCommandParser; import org.apache.james.imap.message.request.UnsubscribeRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse UNSUBSCRIBE commands diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java index 5707af5..ce7e575 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java @@ -32,7 +32,7 @@ import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.encode.ImapResponseComposer; import org.apache.james.imap.encode.ImapResponseWriter; import org.apache.james.imap.message.response.Literal; -import org.apache.james.protocols.imap.utils.FastByteArrayOutputStream; +import org.apache.james.imap.utils.FastByteArrayOutputStream; /** * Class providing methods to send response messages from the server to the diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java b/protocols/imap/src/main/java/org/apache/james/imap/utils/EolInputStream.java similarity index 98% rename from protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java rename to protocols/imap/src/main/java/org/apache/james/imap/utils/EolInputStream.java index 53b8134..a7cc6db 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/utils/EolInputStream.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.protocols.imap.utils; +package org.apache.james.imap.utils; import java.io.FileInputStream; import java.io.FilterInputStream; diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java b/protocols/imap/src/main/java/org/apache/james/imap/utils/FastByteArrayOutputStream.java similarity index 99% rename from protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java rename to protocols/imap/src/main/java/org/apache/james/imap/utils/FastByteArrayOutputStream.java index 1a06738..9df9496 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/utils/FastByteArrayOutputStream.java @@ -1,4 +1,4 @@ -package org.apache.james.protocols.imap.utils; +package org.apache.james.imap.utils; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java b/protocols/imap/src/main/java/org/apache/james/imap/utils/FixedLengthInputStream.java similarity index 98% rename from protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java rename to protocols/imap/src/main/java/org/apache/james/imap/utils/FixedLengthInputStream.java index 8950823..fda5184 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/utils/FixedLengthInputStream.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.protocols.imap.utils; +package org.apache.james.imap.utils; import java.io.FilterInputStream; import java.io.IOException; diff --git a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java similarity index 99% rename from protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java rename to protocols/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java index 91bde58..dea3c1b 100644 --- a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.protocols.imap.utils; +package org.apache.james.imap.decode; import static org.assertj.core.api.Assertions.assertThat; diff --git a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java similarity index 99% rename from protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java rename to protocols/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java index 70fb2ab..677f44c 100644 --- a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.protocols.imap.utils; +package org.apache.james.imap.decode; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -30,7 +30,6 @@ import java.util.TimeZone; import javax.mail.Flags; import org.apache.commons.lang3.time.FastDateFormat; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; public class DecoderUtilsTest { diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java index 569f5ba..7f78757 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java @@ -25,7 +25,6 @@ import static org.assertj.core.api.Fail.fail; import java.util.Collection; import java.util.Iterator; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java index 0c0fc5f..6628bb6 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java @@ -26,7 +26,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; public class ImapRequestLineReaderTest { diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java index 6f302b6..0d1dc1f 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java @@ -26,9 +26,9 @@ import java.io.ByteArrayOutputStream; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.message.IdRange; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; public class IdRangeParseTest { diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java index 05a5bfc..79b08fd 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CopyParserTest.java @@ -26,9 +26,9 @@ import java.io.InputStream; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.message.IdRange; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.CopyRequest; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; public class CopyParserTest { diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java index 852dc16..9305a89 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java @@ -32,11 +32,11 @@ import java.nio.charset.StandardCharsets; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapSessionUtils; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.CreateRequest; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSessionUtil; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java index 197efd2..ebc079d 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java @@ -30,9 +30,9 @@ import org.apache.james.imap.api.message.BodyFetchElement; import org.apache.james.imap.api.message.FetchData; import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java index 6f7d729..e14b816 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java @@ -28,11 +28,11 @@ import java.nio.charset.StandardCharsets; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.GetAnnotationRequest; import org.apache.james.imap.message.request.GetAnnotationRequest.Depth; import org.apache.james.mailbox.model.MailboxAnnotationKey; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java index 409e4ac..fb3bf35 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java @@ -25,9 +25,9 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import org.apache.james.imap.api.ImapCommand; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.GetQuotaRequest; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; /** diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java index 90a07aa..56d2db0 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java @@ -25,9 +25,9 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import org.apache.james.imap.api.ImapCommand; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.GetQuotaRootRequest; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; /** diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java index c17b379..3157314 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MoveParserTest.java @@ -26,9 +26,9 @@ import java.io.InputStream; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.message.IdRange; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.MoveRequest; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; public class MoveParserTest { diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java index 64a8937..0e81a16 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java @@ -33,10 +33,10 @@ import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.api.message.request.DayMonthYear; import org.apache.james.imap.api.message.request.SearchKey; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java index 4efb78e..1fe6191 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java @@ -40,9 +40,9 @@ import org.apache.james.imap.api.message.request.SearchKey; import org.apache.james.imap.api.message.response.StatusResponse; import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java index 2efee6a..774914c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java @@ -31,10 +31,10 @@ import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.api.message.request.DayMonthYear; import org.apache.james.imap.api.message.request.SearchKey; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java index 0457fcd..4417f38 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java @@ -33,10 +33,10 @@ import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.api.message.request.DayMonthYear; import org.apache.james.imap.api.message.request.SearchKey; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java index 5d40072..c6e6e7c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java @@ -26,11 +26,11 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import org.apache.james.imap.api.ImapCommand; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.SetAnnotationRequest; import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; public class SetAnnotationCommandParserTest { diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java index 095badc..2d2adaa 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java @@ -26,9 +26,9 @@ import java.io.InputStream; import java.util.List; import org.apache.james.imap.api.ImapCommand; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.SetQuotaRequest; -import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; /** diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java index 60a5f38..d489d44 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.imapserver.netty; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; -import org.apache.james.protocols.imap.DecodingException; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java index c090da0..2513d6a 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java @@ -23,9 +23,9 @@ import java.io.InputStream; import org.apache.commons.io.input.BoundedInputStream; import org.apache.james.imap.api.display.HumanReadableText; +import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; -import org.apache.james.protocols.imap.DecodingException; -import org.apache.james.protocols.imap.utils.EolInputStream; +import org.apache.james.imap.utils.EolInputStream; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferInputStream; import org.jboss.netty.channel.Channel; diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java index bda86b0..8e7481d 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.io.InputStream; import org.apache.james.imap.api.display.HumanReadableText; -import org.apache.james.protocols.imap.DecodingException; -import org.apache.james.protocols.imap.utils.EolInputStream; -import org.apache.james.protocols.imap.utils.FixedLengthInputStream; +import org.apache.james.imap.decode.DecodingException; +import org.apache.james.imap.utils.EolInputStream; +import org.apache.james.imap.utils.FixedLengthInputStream; import org.jboss.netty.channel.Channel; public class NettyStreamImapRequestLineReader extends AbstractNettyImapRequestLineReader { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
