http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java index 527bef3..018d519 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java @@ -41,30 +41,22 @@ final class AddressImpl implements FetchResponse.Envelope.Address { this.personalName = personalName; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getAtDomainList() - */ + @Override public String getAtDomainList() { return atDomainList; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getHostName() - */ + @Override public String getHostName() { return hostName; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getMailboxName() - */ + @Override public String getMailboxName() { return mailboxName; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getPersonalName() - */ + @Override public String getPersonalName() { return personalName; }
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java index 5d87729..93dda65 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java @@ -40,17 +40,12 @@ class ContentBodyElement implements BodyElement { this.content = content; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#getName() - */ + @Override public String getName() { return name; } - /** - * @throws MailboxException - * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#size() - */ + @Override public long size() throws IOException { try { return content.size(); @@ -60,9 +55,7 @@ class ContentBodyElement implements BodyElement { } - /** - * @see org.apache.james.imap.message.response.Literal#getInputStream() - */ + @Override public InputStream getInputStream() throws IOException { return content.getInputStream(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java index 53c3978..a92e646 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java @@ -33,13 +33,12 @@ public class EmptyContent implements Content { /** * Return 0 as this {@link Content} is empty */ + @Override public long size() { return 0; } - /** - * @see org.apache.james.mailbox.Content#getInputStream() - */ + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream("".getBytes()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java index dc25a2c..615558f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java @@ -60,72 +60,52 @@ final class EnvelopeImpl implements FetchResponse.Envelope { this.to = to; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getBcc() - */ + @Override public Address[] getBcc() { return bcc; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getCc() - */ + @Override public Address[] getCc() { return cc; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getDate() - */ + @Override public String getDate() { return date; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getFrom() - */ + @Override public Address[] getFrom() { return from; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getInReplyTo() - */ + @Override public String getInReplyTo() { return inReplyTo; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getMessageId() - */ + @Override public String getMessageId() { return messageId; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getReplyTo() - */ + @Override public Address[] getReplyTo() { return replyTo; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getSender() - */ + @Override public Address[] getSender() { return sender; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getSubject() - */ + @Override public String getSubject() { return subject; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getTo() - */ + @Override public Address[] getTo() { return to; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java index bd95d25..611f2f1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java @@ -63,13 +63,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { super(FetchRequest.class, next, mailboxManager, factory, metricFactory); } - /** - * @see - * org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest, - * org.apache.james.imap.api.process.ImapSession, java.lang.String, - * org.apache.james.imap.api.ImapCommand, - * org.apache.james.imap.api.process.ImapProcessor.Responder) - */ + @Override protected void doProcess(FetchRequest request, ImapSession session, String tag, ImapCommand command, Responder responder) { final boolean useUids = request.isUseUids(); final IdRange[] idSet = request.getIdSet(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java index 7e2afa2..9d8466a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java @@ -52,10 +52,7 @@ public class MimeBodyElement implements BodyElement { } - /** - * @see - * org.apache.james.imap.message.response.FetchResponse.BodyElement#getName() - */ + @Override public String getName() { return name; } @@ -75,18 +72,13 @@ public class MimeBodyElement implements BodyElement { return result; } - /** - * @see - * org.apache.james.imap.message.response.FetchResponse.BodyElement#size() - */ + @Override public long size() { return size; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#getInputStream() - */ + @Override public InputStream getInputStream() throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java index 6e723ec..59c01ae 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java @@ -97,114 +97,82 @@ final class MimeDescriptorStructure implements FetchResponse.Structure { return results; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getDescription() - */ + @Override public String getDescription() { return descriptor.getContentDescription(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getEncoding() - */ + @Override public String getEncoding() { return descriptor.getTransferContentEncoding(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getId() - */ + @Override public String getId() { return descriptor.getContentID(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getLines() - */ + @Override public long getLines() { return descriptor.getLines(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getMediaType() - */ + @Override public String getMediaType() { return descriptor.getMimeType(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getOctets() - */ + @Override public long getOctets() { return descriptor.getBodyOctets(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getParameters() - */ + @Override public List<String> getParameters() { return parameters; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getSubType() - */ + @Override public String getSubType() { return descriptor.getMimeSubType(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#parts() - */ + @Override public Iterator<Structure> parts() { return parts.iterator(); } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getDisposition() - */ + @Override public String getDisposition() { return disposition; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getLocation() - */ + @Override public String getLocation() { return location; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getMD5() - */ + @Override public String getMD5() { return md5; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getLanguages() - */ + @Override public List<String> getLanguages() { return languages; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getBody() - */ + @Override public Structure getBody() { return embeddedMessageStructure; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getDispositionParams() - */ + @Override public Map<String, String> getDispositionParams() { return dispositionParams; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.Structure#getEnvelope() - */ + @Override public Envelope getEnvelope() { return envelope; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java index 538c104..b7204a3 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java @@ -34,9 +34,7 @@ final class MimePathImpl implements MessageResult.MimePath { this.positions = positions; } - /** - * @see org.apache.james.mailbox.MessageResult.MimePath#getPositions() - */ + @Override public int[] getPositions() { return positions; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java index 3ae50fc..e8ff860 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java @@ -46,16 +46,12 @@ final class PartialFetchBodyElement implements BodyElement { name = delegate.getName() + "<" + firstOctet + ">"; } - /** - * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#getName() - */ + @Override public String getName() { return name; } - /** - * @see org.apache.james.imap.message.response.Literal#size() - */ + @Override public long size() throws IOException { final long size = delegate.size(); final long lastOctet = this.numberOfOctets + firstOctet; @@ -70,9 +66,7 @@ final class PartialFetchBodyElement implements BodyElement { return result; } - /** - * @see org.apache.james.imap.message.response.Literal#getInputStream() - */ + @Override public InputStream getInputStream() throws IOException { return new LimitingInputStream(delegate.getInputStream(), firstOctet, size()); } @@ -115,6 +109,7 @@ final class PartialFetchBodyElement implements BodyElement { /** * @see java.io.FilterInputStream#read() */ + @Override public int read() throws IOException { checkOffset(); if (pos >= length) { @@ -127,6 +122,7 @@ final class PartialFetchBodyElement implements BodyElement { /** * @see java.io.FilterInputStream#read(byte[]) */ + @Override public int read(byte[] b) throws IOException { return read(b, 0, b.length); } @@ -134,6 +130,7 @@ final class PartialFetchBodyElement implements BodyElement { /** * @see java.io.FilterInputStream#read(byte[], int, int) */ + @Override public int read(byte[] b, int off, int len) throws IOException { checkOffset(); @@ -156,6 +153,7 @@ final class PartialFetchBodyElement implements BodyElement { /** * Throws {@link IOException} */ + @Override public long skip(long n) throws IOException { throw new IOException("Not implemented"); } @@ -163,6 +161,7 @@ final class PartialFetchBodyElement implements BodyElement { /** * @see java.io.FilterInputStream#available() */ + @Override public int available() throws IOException { // Correctly calculate in available bytes. // See IMAP-295 @@ -179,10 +178,12 @@ final class PartialFetchBodyElement implements BodyElement { } } + @Override public void mark(int readlimit) { // Don't do anything. } + @Override public void reset() throws IOException { throw new IOException("mark not supported"); } @@ -190,6 +191,7 @@ final class PartialFetchBodyElement implements BodyElement { /** * Return false as mark is not supported */ + @Override public boolean markSupported() { return false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java index 9766785..7abd964 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java @@ -95,6 +95,7 @@ public class DecodingException extends IOException { return key; } + @Override public Throwable getCause() { return t; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java index b8892ac..85025a2 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java @@ -71,10 +71,7 @@ public class IMAPRequest implements Request { return tag; } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.Request#getArgument() - */ + @Override public String getArgument() { int tagOffeset = tag.length() + command.length() + 2; StringBuilder sb = new StringBuilder(); @@ -103,10 +100,7 @@ public class IMAPRequest implements Request { return sb.toString(); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.Request#getCommand() - */ + @Override public String getCommand() { return command; } @@ -122,10 +116,12 @@ public class IMAPRequest implements Request { boolean first = true; Iterator<ByteBuffer> buffIt = lines.iterator(); + @Override public boolean hasNext() { return buffIt.hasNext(); } + @Override public ByteBuffer next() { ByteBuffer buf = buffIt.next(); buf.rewind(); @@ -138,6 +134,7 @@ public class IMAPRequest implements Request { return buf; } + @Override public void remove() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java index 6b0439e..2e01134 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java @@ -28,12 +28,14 @@ public interface IMAPSession extends ProtocolSession { /** * Pop the last command handler */ + @Override void popLineHandler(); /** * Return the size of the pushed {@link LineHandler} * @return size of the pushed line handler */ + @Override int getPushedLineHandlerCount(); /** http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java index 2bedae6..8093f78 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java @@ -61,6 +61,7 @@ public class IMAPCommandDispatcher extends CommandDispatcher<IMAPSession> { * (non-Javadoc) * @see org.apache.james.protocols.api.handler.MultiLineHandler#isReady(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer) */ + @Override protected boolean isReady(IMAPSession session, ByteBuffer line) { long bytesRead = (Long) session.setAttachment(BYTES_READ, null, State.Transaction); bytesRead += line.remaining(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java ---------------------------------------------------------------------- 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/protocols/imap/utils/FixedLengthInputStream.java index df36784..8950823 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java @@ -40,6 +40,7 @@ public class FixedLengthInputStream extends FilterInputStream { this.length = length; } + @Override public int read() throws IOException { if (pos >= length) { return -1; @@ -48,11 +49,13 @@ public class FixedLengthInputStream extends FilterInputStream { return super.read(); } + @Override public int read(byte[] b) throws IOException { return read(b, 0, b.length); } + @Override public int read(byte[] b, int off, int len) throws IOException { if (pos >= length) { @@ -72,27 +75,33 @@ public class FixedLengthInputStream extends FilterInputStream { } + @Override public long skip(long n) throws IOException { throw new IOException("Not implemented"); // return super.skip( n ); } + @Override public int available() throws IOException { return (int) (length - pos); } + @Override public void close() throws IOException { // Don't do anything to the underlying stream. } + @Override public void mark(int readlimit) { // Don't do anything. } + @Override public synchronized void reset() throws IOException { throw new IOException("mark not supported"); } + @Override public boolean markSupported() { return false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java index f7fe593..4fedc02 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java @@ -52,6 +52,7 @@ public class ImapRequestStreamLineReader extends ImapRequestLineReader { * @throws DecodingException * If the end-of-stream is reached. */ + @Override public char nextChar() throws DecodingException { if (!nextSeen) { int next = -1; @@ -71,9 +72,7 @@ public class ImapRequestStreamLineReader extends ImapRequestLineReader { return nextChar; } - /** - * @see ImapRequestLineReader#read(int, boolean) - */ + @Override public InputStream read(int size, boolean extraCRLF) throws DecodingException { // Unset the next char. @@ -91,6 +90,7 @@ public class ImapRequestStreamLineReader extends ImapRequestLineReader { * Sends a server command continuation request '+' back to the client, * requesting more data to be sent. */ + @Override protected void commandContinuationRequest() throws DecodingException { try { output.write('+'); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java index 9b6d708..4ceaad6 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java @@ -44,10 +44,7 @@ public class OutputStreamImapResponseWriter implements ImapResponseWriter { - /** - * @see - * org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james.imap.message.response.Literal) - */ + @Override public void write(Literal literal) throws IOException { InputStream in = null; try { @@ -65,9 +62,7 @@ public class OutputStreamImapResponseWriter implements ImapResponseWriter { } - /** - * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[]) - */ + @Override public void write(byte[] buffer) throws IOException { output.write(buffer); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java index cbccd1b..bd7d053 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java @@ -38,30 +38,36 @@ public class FakeImapSession implements ImapSession { this.attributesByKey = new ConcurrentHashMap<>(); } + @Override public void logout() { closeMailbox(); state = ImapSessionState.LOGOUT; } + @Override public void authenticated() { this.state = ImapSessionState.AUTHENTICATED; } + @Override public void deselect() { this.state = ImapSessionState.AUTHENTICATED; closeMailbox(); } + @Override public void selected(SelectedMailbox mailbox) { this.state = ImapSessionState.SELECTED; closeMailbox(); this.selectedMailbox = mailbox; } + @Override public SelectedMailbox getSelected() { return this.selectedMailbox; } + @Override public ImapSessionState getState() { return this.state; } @@ -73,10 +79,12 @@ public class FakeImapSession implements ImapSession { } } + @Override public Object getAttribute(String key) { return attributesByKey.get(key); } + @Override public void setAttribute(String key, Object value) { if (value == null) { attributesByKey.remove(key); @@ -85,41 +93,51 @@ public class FakeImapSession implements ImapSession { } } + @Override public boolean startTLS() { return false; } + @Override public boolean supportStartTLS() { return false; } + @Override public boolean isCompressionSupported() { return false; } + @Override public boolean startCompression() { return false; } - public void pushLineHandler(ImapLineHandler lineHandler) { + @Override + public void pushLineHandler(ImapLineHandler lineHandler) { } + @Override public void popLineHandler() { } + @Override public boolean isPlainAuthDisallowed() { return false; } + @Override public boolean isTLSActive() { return false; } + @Override public boolean supportMultipleNamespaces() { return false; } + @Override public boolean isCompressionActive() { return false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java index e6ddb97..3d28708 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java @@ -54,6 +54,7 @@ public class ByteImapResponseWriter implements ImapConstants, ImapResponseWriter this.out = new ByteArrayOutputStream(); } + @Override public void write(Literal literal) throws IOException { InputStream in = null; try { @@ -70,9 +71,7 @@ public class ByteImapResponseWriter implements ImapConstants, ImapResponseWriter } } - /** - * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[]) - */ + @Override public void write(byte[] buffer) throws IOException { out.write(buffer); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java b/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java index 0625443..0efc955 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java @@ -26,6 +26,7 @@ import org.apache.james.imap.message.response.UnpooledStatusResponseFactory; public class UnpooledStatusResponseFactoryTest extends AbstractTestForStatusResponseFactory { + @Override protected StatusResponseFactory createInstance() { return new UnpooledStatusResponseFactory(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java index 76595a2..7a377a3 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java @@ -71,6 +71,7 @@ public class LSubProcessorTest { /** * @see MailboxSession.User#getLocalePreferences() */ + @Override public List<Locale> getLocalePreferences() { return new ArrayList<>(); } @@ -78,6 +79,7 @@ public class LSubProcessorTest { /** * @see MailboxSession.User#getPassword() */ + @Override public String getPassword() { return "test"; } @@ -85,6 +87,7 @@ public class LSubProcessorTest { /** * @see MailboxSession.User#getUserName() */ + @Override public String getUserName() { return "test"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java index 0cdc650..d1557e4 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java @@ -43,9 +43,7 @@ public class StatusResponseTypeMatcher extends BaseMatcher<StatusResponse> { this.serverResponseType = responseCode; } - /** - * @see org.hamcrest.Matcher#matches(java.lang.Object) - */ + @Override public boolean matches(Object o) { if (o instanceof StatusResponse) { StatusResponse sr = (StatusResponse) o; @@ -54,9 +52,7 @@ public class StatusResponseTypeMatcher extends BaseMatcher<StatusResponse> { return false; } - /** - * @see org.hamcrest.SelfDescribing#describeTo(org.hamcrest.Description) - */ + @Override public void describeTo(Description d) { d.appendText(StatusResponse.class.getName()); d.appendText(" with serverResponseType.equals(" + serverResponseType.name() + ")"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java index 38e5588..eb794bd 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java @@ -39,9 +39,7 @@ public class FakeMailboxListenerFlagsUpdate extends FlagsUpdated { this.flags = flags; } - /** - * @see org.apache.james.mailbox.MailboxListener.FlagsUpdated#getUpdatedFlags() - */ + @Override public List<UpdatedFlags> getUpdatedFlags() { return flags; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java index 5040ed2..183d816 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java @@ -58,19 +58,23 @@ public class MailboxEventAnalyserTest { done = false; } + @Override public void remove() { throw new NotImplementedException("Not implemented"); } + @Override public MessageResult next() { done = true; return messageResult; } + @Override public boolean hasNext() { return !done; } + @Override public MailboxException getException() { throw new NotImplementedException("Not implemented"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java index 8959869..182cd7e 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java @@ -54,19 +54,23 @@ public class MailboxMessageResultUtilsTest { value = "Value"; } + @Override public long size() { return 0; } + @Override public String getName() { return name; } + @Override public String getValue() { return value; } + @Override public InputStream getInputStream() throws IOException { return null; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java index 2645aaf..d397699 100644 --- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java +++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java @@ -30,30 +30,22 @@ public abstract class LMTPConfiguration extends ProtocolConfigurationImpl implem - /** - * Return <code>false</code> - */ + @Override public boolean isRelayingAllowed(String remoteIP) { return false; } - /** - * Return <code>false</code> - */ + @Override public boolean isAuthRequired(String remoteIP) { return false; } - /** - * Return <code>false</code> - */ + @Override public boolean useHeloEhloEnforcement() { return false; } - /** - * Return <code>false</code> - */ + @Override public boolean useAddressBracketsEnforcement() { return false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java index 8bcd064..3bc5d2d 100644 --- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java +++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java @@ -26,10 +26,7 @@ public class LMTPConfigurationImpl extends LMTPConfiguration { setSoftwareName("JAMES Protocols LMTP Server"); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize() - */ + @Override public long getMaxMessageSize() { return maxMessageSize; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java index f6efd59..6c3f0c0 100644 --- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java +++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java @@ -42,18 +42,12 @@ public class LMTPMultiResponse implements Response { } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.Response#getRetCode() - */ + @Override public String getRetCode() { return responses.get(0).getRetCode(); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.Response#getLines() - */ + @Override public List<CharSequence> getLines() { List<CharSequence> lines = new ArrayList<>(); for (Response response: responses) { @@ -63,10 +57,7 @@ public class LMTPMultiResponse implements Response { } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.Response#isEndSession() - */ + @Override public boolean isEndSession() { for (Response response: responses) { if (response.isEndSession()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java index a0192dd..87e04a2 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java @@ -78,6 +78,7 @@ public abstract class AbstractLMTPSServerTest extends AbstractLMTPServerTest { return sendCommand("LHLO", hostname); } + @Override public int[] getReplies() throws IOException { int[] codes = new int[replies.size()]; for (int i = 0; i < codes.length; i++) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java index 19a82b2..ee05ced 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java @@ -249,6 +249,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { } + @Override protected SMTPClient createClient() { return new LMTPClientImpl(); } @@ -285,6 +286,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { return sendCommand("LHLO", hostname); } + @Override public int[] getReplies() throws IOException { int[] codes = new int[replies.size()]; for (int i = 0; i < codes.length; i++) { @@ -320,6 +322,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { * (non-Javadoc) * @see org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook#deliver(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailAddress, org.apache.james.protocols.smtp.MailEnvelope) */ + @Override public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) { if (result == null) { result = hook.onMessage(session, envelope); @@ -346,6 +349,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { * (non-Javadoc) * @see org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook#deliver(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailAddress, org.apache.james.protocols.smtp.MailEnvelope) */ + @Override public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) { if (RCPT1.equals(recipient.toString())) { return new HookResult(HookReturnCode.DENY); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java index c83846c..f6972d1 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java @@ -56,10 +56,12 @@ public class Parser implements SieveParser { sieveFactory = manager.build(); } + @Override public List<String> getExtensions() { return sieveFactory.getExtensions(); } + @Override public List<String> parse(String content) throws SyntaxException { try { sieveFactory.parse(new ByteArrayInputStream(content.getBytes())); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java index b6d679c..5955b35 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java @@ -35,38 +35,47 @@ public class SettableSession implements Session { this.sslEnabled = false; } + @Override public String getUser() { return user; } + @Override public boolean isAuthenticated() { return state == State.AUTHENTICATED; } + @Override public void setUser(String user) { this.user = user; } + @Override public State getState() { return state; } + @Override public void setState(State state) { this.state = state; } + @Override public Authenticate.SupportedMechanism getChoosedAuthenticationMechanism() { return choosedAuthenticationMechanism; } + @Override public void setChoosedAuthenticationMechanism(Authenticate.SupportedMechanism choosedAuthenticationMechanism) { this.choosedAuthenticationMechanism = choosedAuthenticationMechanism; } + @Override public void setSslEnabled(boolean sslEnabled) { this.sslEnabled = sslEnabled; } + @Override public boolean isSslEnabled() { return sslEnabled; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java index f690abd..faddde6 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java @@ -86,10 +86,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer { } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolServer#bind() - */ + @Override public synchronized void bind() throws Exception { if (started) { throw new IllegalStateException("Server running already"); @@ -130,10 +127,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer { } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolServer#unbind() - */ + @Override public synchronized void unbind() { if (started == false) { return; @@ -147,10 +141,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer { started = false; } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolServer#getListenAddresses() - */ + @Override public synchronized List<InetSocketAddress> getListenAddresses() { ImmutableList.Builder<InetSocketAddress> builder = ImmutableList.builder(); for (Channel channel : ImmutableList.copyOf(channels.iterator())) { @@ -194,19 +185,13 @@ public abstract class AbstractAsyncServer implements ProtocolServer { } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolServer#getBacklog() - */ + @Override public int getBacklog() { return backlog; } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolServer#getTimeout() - */ + @Override public int getTimeout() { return timeout; } @@ -231,10 +216,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer { } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolServer#isBound() - */ + @Override public boolean isBound() { return started; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java index 4de5f3e..67377d8 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java @@ -63,9 +63,7 @@ public abstract class AbstractChannelPipelineFactory implements ChannelPipelineF } - /** - * @see org.jboss.netty.channel.ChannelPipelineFactory#getPipeline() - */ + @Override public ChannelPipeline getPipeline() throws Exception { // Create a default pipeline implementation. ChannelPipeline pipeline = pipeline(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java index a05f3aa..f3752ac 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java @@ -53,38 +53,28 @@ public class NettyProtocolTransport extends AbstractProtocolTransport { this.engine = engine; } - /** - * @see org.apache.james.protocols.api.ProtocolTransport#getRemoteAddress() - */ + @Override public InetSocketAddress getRemoteAddress() { return (InetSocketAddress) channel.getRemoteAddress(); } - /** - * @see org.apache.james.protocols.api.ProtocolTransport#getId() - */ + @Override public String getId() { return Integer.toString(channel.getId()); } - /** - * @see org.apache.james.protocols.api.ProtocolTransport#isTLSStarted() - */ + @Override public boolean isTLSStarted() { return channel.getPipeline().get(SslHandler.class) != null; } - /** - * @see org.apache.james.protocols.api.ProtocolTransport#isStartTLSSupported() - */ + @Override public boolean isStartTLSSupported() { return engine != null; } - /** - * @see org.apache.james.protocols.api.ProtocolTransport#popLineHandler() - */ + @Override public void popLineHandler() { if (lineHandlerCount > 0) { channel.getPipeline().remove("lineHandler" + lineHandlerCount); @@ -92,9 +82,7 @@ public class NettyProtocolTransport extends AbstractProtocolTransport { } } - /** - * @see org.apache.james.protocols.api.ProtocolTransport#getPushedLineHandlerCount() - */ + @Override public int getPushedLineHandlerCount() { return lineHandlerCount; } @@ -164,30 +152,22 @@ public class NettyProtocolTransport extends AbstractProtocolTransport { channel.write(new ChunkedStream(in)); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolTransport#setReadable(boolean) - */ + @Override public void setReadable(boolean readable) { channel.setReadable(readable); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolTransport#isReadable() - */ + @Override public boolean isReadable() { return channel.isReadable(); } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolTransport#getLocalAddress() - */ + @Override public InetSocketAddress getLocalAddress() { return (InetSocketAddress) channel.getLocalAddress(); } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void pushLineHandler(LineHandler<? extends ProtocolSession> overrideCommandHandler, ProtocolSession session) { lineHandlerCount++; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java index ef8923a..451161d 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java @@ -83,6 +83,7 @@ public class POP3Response extends AbstractResponse { * * @return all responseLines */ + @Override public List<CharSequence> getLines() { List<CharSequence> responseList = new ArrayList<>(); if (lines.isEmpty()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java index 2ac4be1..81cc68a 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java @@ -39,16 +39,12 @@ public class POP3SessionImpl extends ProtocolSessionImpl implements POP3Session super(transport, configData); } - /** - * @see org.apache.james.pop3server.POP3Session#getHandlerState() - */ + @Override public int getHandlerState() { return handlerState; } - /** - * @see org.apache.james.pop3server.POP3Session#setHandlerState(int) - */ + @Override public void setHandlerState(int handlerState) { this.handlerState = handlerState; } @@ -60,17 +56,12 @@ public class POP3SessionImpl extends ProtocolSessionImpl implements POP3Session setHandlerState(AUTHENTICATION_READY); } - /** - * @see org.apache.james.pop3server.POP3Session#getUserMailbox() - */ + @Override public Mailbox getUserMailbox() { return mailbox; } - /** - * @see - * org.apache.james.pop3server.POP3Session#setUserMailbox(Mailbox) - */ + @Override public void setUserMailbox(Mailbox mailbox) { this.mailbox = mailbox; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java index 07e227d..1c98cd0 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java @@ -47,14 +47,17 @@ public class POP3StartTlsResponse extends POP3Response implements StartTlsRespon // We need to override this and return a StartTlsResponse. See ROTOCOLS-89 return new StartTlsResponse() { + @Override public boolean isEndSession() { return POP3StartTlsResponse.this.isEndSession(); } + @Override public String getRetCode() { return POP3StartTlsResponse.this.getRetCode(); } + @Override public List<CharSequence> getLines() { return POP3StartTlsResponse.this.getLines(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java index b54f9a3..28745a2 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java @@ -39,17 +39,11 @@ public class POP3StreamResponse extends POP3Response implements StreamResponse { this.stream = stream; } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.StreamResponse#getStream() - */ + @Override public InputStream getStream() { return new SequenceInputStream(stream, new ByteArrayInputStream(".\r\n".getBytes())); } - /** - * Throws {@link UnsupportedOperationException} - */ @Override public Response immutable() { throw new UnsupportedOperationException("POP3StreamResponse can only be used once, so its not supported to reuse it"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java index 11eea14..9aff450 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java @@ -80,10 +80,7 @@ public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler { } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.pop3.core.AbstractPassCmdHandler#auth(org.apache.james.protocols.pop3.POP3Session, java.lang.String, java.lang.String) - */ + @Override protected final Mailbox auth(POP3Session session, String username, String password) throws Exception { return auth(session, (String)session.getAttachment(POP3Session.APOP_TIMESTAMP, State.Connection), username, password); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java index d88a444..e099700 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java @@ -44,6 +44,7 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler { * Handler method called upon receipt of a PASS command. Reads in and * validates the password. */ + @Override public Response onCommand(POP3Session session, Request request) { String parameters = request.getArgument(); if (session.getHandlerState() == POP3Session.AUTHENTICATION_USERSET && parameters != null) { @@ -87,9 +88,7 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java index bd3411d..90ca459 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java @@ -54,11 +54,7 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa } - /** - * @see - * org.apache.james.protocols.api.handler.CommandHandler - * #onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request) - */ + @Override public Response onCommand(POP3Session session, Request request) { POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, "Capability list follows"); @@ -71,9 +67,7 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa return response; } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public List<Class<?>> getMarkerInterfaces() { List<Class<?>> mList = new ArrayList(); @@ -81,10 +75,7 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa return mList; } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, - * java.util.List) - */ + @Override @SuppressWarnings("unchecked") public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(CapaCapability.class)) { @@ -92,16 +83,12 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } - /** - * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) - */ + @Override public Set<String> getImplementedCapabilities(POP3Session session) { return CAPS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java index 76a706c..ceff5b0 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java @@ -57,6 +57,7 @@ public class DeleCmdHandler implements CommandHandler<POP3Session> { * Handler method called upon receipt of a DELE command. This command * deletes a particular mail message from the mailbox. */ + @Override @SuppressWarnings("unchecked") public Response onCommand(POP3Session session, Request request) { if (session.getHandlerState() == POP3Session.TRANSACTION) { @@ -94,9 +95,7 @@ public class DeleCmdHandler implements CommandHandler<POP3Session> { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java index ea5f3e3..58ab6ac 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java @@ -63,6 +63,7 @@ public class ListCmdHandler implements CommandHandler<POP3Session> { * the request to process */ + @Override @SuppressWarnings("unchecked") public Response onCommand(POP3Session session, Request request) { String parameters = request.getArgument(); @@ -127,9 +128,7 @@ public class ListCmdHandler implements CommandHandler<POP3Session> { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java index 2184732..7184502 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java @@ -52,6 +52,7 @@ public class NoopCmdHandler implements CommandHandler<POP3Session> { * Handler method called upon receipt of a NOOP command. Like all good * NOOPs, does nothing much. */ + @Override public Response onCommand(POP3Session session, Request request) { if (session.getHandlerState() == POP3Session.TRANSACTION) { return POP3Response.OK; @@ -60,9 +61,7 @@ public class NoopCmdHandler implements CommandHandler<POP3Session> { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java index 4c12f60..f068aa1 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java @@ -70,6 +70,7 @@ public class QuitCmdHandler implements CommandHandler<POP3Session> { * Handler method called upon receipt of a QUIT command. This method handles * cleanup of the POP3Handler state. */ + @Override @SuppressWarnings("unchecked") public Response onCommand(POP3Session session, Request request) { Response response = null; @@ -94,9 +95,7 @@ public class QuitCmdHandler implements CommandHandler<POP3Session> { return response; } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java index 15c1922..53b84d7 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java @@ -60,6 +60,7 @@ public class RetrCmdHandler implements CommandHandler<POP3Session> { * Handler method called upon receipt of a RETR command. This command * retrieves a particular mail message from the mailbox. */ + @Override @SuppressWarnings("unchecked") public Response onCommand(POP3Session session, Request request) { POP3Response response = null; @@ -106,9 +107,7 @@ public class RetrCmdHandler implements CommandHandler<POP3Session> { return response; } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java index f99385f..999fd3f 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java @@ -59,6 +59,7 @@ public class RsetCmdHandler implements CommandHandler<POP3Session> { * Handler method called upon receipt of a RSET command. Calls stat() to * reset the mailbox. */ + @Override public Response onCommand(POP3Session session, Request request) { if (session.getHandlerState() == POP3Session.TRANSACTION) { stat(session); @@ -89,9 +90,7 @@ public class RsetCmdHandler implements CommandHandler<POP3Session> { } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java index 2d9d2fb..95641a0 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java @@ -55,6 +55,7 @@ public class StatCmdHandler implements CommandHandler<POP3Session> { * Handler method called upon receipt of a STAT command. Returns the number * of messages in the mailbox and its aggregate size. */ + @Override @SuppressWarnings("unchecked") public Response onCommand(POP3Session session, Request request) { if (session.getHandlerState() == POP3Session.TRANSACTION) { @@ -81,9 +82,7 @@ public class StatCmdHandler implements CommandHandler<POP3Session> { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java index 8f5a5c2..77761fe 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java @@ -55,9 +55,7 @@ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapabili } - /** - * @see CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, Request) - */ + @Override public Response onCommand(POP3Session session, Request request) { // check if starttls is supported, the state is the right one and it was // not started before @@ -68,9 +66,7 @@ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapabili } } - /** - * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) - */ + @Override @SuppressWarnings("unchecked") public Set<String> getImplementedCapabilities(POP3Session session) { if (session.isStartTLSSupported() && session.getHandlerState() == POP3Session.AUTHENTICATION_READY) { @@ -80,9 +76,7 @@ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapabili } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java index 4d9f4b4..976f859 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java @@ -112,9 +112,7 @@ public class TopCmdHandler extends RetrCmdHandler implements CapaCapability { } - /** - * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) - */ + @Override @SuppressWarnings("unchecked") public Set<String> getImplementedCapabilities(POP3Session session) { if (session.getHandlerState() == POP3Session.TRANSACTION) { @@ -124,9 +122,6 @@ public class TopCmdHandler extends RetrCmdHandler implements CapaCapability { } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ @Override public Collection<String> getImplCommands() { return COMMANDS; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java index 1314399..9800af3 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java @@ -58,6 +58,7 @@ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapabili * Handler method called upon receipt of a UIDL command. Returns a listing * of message ids to the client. */ + @Override @SuppressWarnings("unchecked") public Response onCommand(POP3Session session, Request request) { POP3Response response = null; @@ -116,9 +117,7 @@ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapabili return response; } - /** - * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) - */ + @Override @SuppressWarnings("unchecked") public Set<String> getImplementedCapabilities(POP3Session session) { if (session.getHandlerState() == POP3Session.TRANSACTION) { @@ -128,9 +127,7 @@ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapabili } } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java index 39576e9..b477cad 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java @@ -35,6 +35,7 @@ public class UnknownCmdHandler extends UnknownCommandHandler<POP3Session> { * Handler method called upon receipt of an unrecognized command. Returns an * error response and logs the command. */ + @Override public Response onCommand(POP3Session session, Request request) { return POP3Response.ERR; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java index 17183ca..854e0bd 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java @@ -54,6 +54,7 @@ public class UserCmdHandler implements CommandHandler<POP3Session>, CapaCapabili * Handler method called upon receipt of a USER command. Reads in the user * id. */ + @Override public Response onCommand(POP3Session session, Request request) { String parameters = request.getArgument(); if (session.getHandlerState() == POP3Session.AUTHENTICATION_READY && parameters != null) { @@ -65,16 +66,12 @@ public class UserCmdHandler implements CommandHandler<POP3Session>, CapaCapabili } } - /** - * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session) - */ + @Override public Set<String> getImplementedCapabilities(POP3Session session) { return CAPS; } - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + @Override public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java index ac0d0c4..91eb396 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java @@ -39,10 +39,7 @@ public class WelcomeMessageHandler implements ConnectHandler<POP3Session> { } - /** - * @see org.apache.james.protocols.api.handler.ConnectHandler - * #onConnect(org.apache.james.pop3server.POP3Session) - */ + @Override public Response onConnect(POP3Session session) { StringBuilder responseBuffer = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java index f4d0f75..5e5b6ee 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java @@ -31,11 +31,7 @@ import org.apache.james.protocols.api.CombinedInputStream; */ public abstract class AbstractMailbox implements Mailbox { - /* - * (non-Javadoc) - * - * @see org.apache.james.protocols.pop3.mailbox.Mailbox#getMessage(String) - */ + @Override public InputStream getMessage(String uid) throws IOException { return new CombinedInputStream(getMessageHeaders(uid), getMessageBody(uid)); } @@ -43,6 +39,7 @@ public abstract class AbstractMailbox implements Mailbox { /** * Does nothing */ + @Override public void close() throws IOException { // do nothing } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java index ec41080..05af522 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java @@ -40,6 +40,7 @@ public abstract class ImapMailbox implements Mailbox { */ public abstract InputStream getMessageBody(long uid) throws IOException; + @Override public InputStream getMessageBody(String uid) throws NumberFormatException, IOException { return this.getMessageBody(Long.parseLong(uid)); } @@ -54,6 +55,7 @@ public abstract class ImapMailbox implements Mailbox { */ public abstract InputStream getMessageHeaders(long uid) throws IOException; + @Override public InputStream getMessageHeaders(String uid) throws NumberFormatException, IOException { return this.getMessageHeaders(Long.parseLong(uid)); } @@ -69,6 +71,7 @@ public abstract class ImapMailbox implements Mailbox { */ public abstract InputStream getMessage(long uid) throws IOException; + @Override public InputStream getMessage(String uid) throws NumberFormatException, IOException { return this.getMessage(Long.parseLong(uid)); } @@ -80,6 +83,7 @@ public abstract class ImapMailbox implements Mailbox { */ public abstract void remove(long... uids) throws IOException; + @Override public void remove(String... uids) throws NumberFormatException, IOException { long[] imapUids = Arrays.stream(uids) .mapToLong(Long::parseLong) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
