http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java index 8c71cba..de2d74b 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java @@ -25,7 +25,7 @@ import org.apache.james.protocols.api.handler.ProtocolHandlerChain; * Basic {@link Protocol} implementation * */ -public abstract class ProtocolImpl implements Protocol{ +public abstract class ProtocolImpl implements Protocol { private final ProtocolHandlerChain chain; private final ProtocolConfiguration config;
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java b/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java index 192419e..2b621c0 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/StreamResponse.java @@ -26,7 +26,7 @@ import java.io.InputStream; * * */ -public interface StreamResponse extends Response{ +public interface StreamResponse extends Response { /** * Return the stream which needs to get written to the remote peer. This method should only be called one time (when the data is written to the client) as it returns http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java index 422cac2..02701f1 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponse.java @@ -27,7 +27,7 @@ import org.apache.james.protocols.api.Response; * * */ -public interface FutureResponse extends Response{ +public interface FutureResponse extends Response { /** * Add a {@link ResponseListener} which will get notified once {@link #isReady()} is true http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java index 5019344..2539ec3 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * * */ -public class FutureResponseImpl implements FutureResponse{ +public class FutureResponseImpl implements FutureResponse { private final Logger logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStartTlsResponse.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStartTlsResponse.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStartTlsResponse.java index 80c68fe..d852871 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStartTlsResponse.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStartTlsResponse.java @@ -27,7 +27,7 @@ import org.apache.james.protocols.api.StartTlsResponse; * * */ -public class FutureStartTlsResponse extends FutureResponseImpl implements StartTlsResponse{ +public class FutureStartTlsResponse extends FutureResponseImpl implements StartTlsResponse { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java index c621b86..d09388e 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java @@ -29,7 +29,7 @@ import org.apache.james.protocols.api.StreamResponse; * * */ -public class FutureStreamResponseImpl extends FutureResponseImpl implements StreamResponse{ +public class FutureStreamResponseImpl extends FutureResponseImpl implements StreamResponse { /** * Set the {@link StreamResponse} to wrap. If a non {@link StreamResponse} is set this implementation will throw an {@link IllegalArgumentException} http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java index 23c1f08..14ea246 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; * * */ -public abstract class AbstractProtocolHandlerChain implements ProtocolHandlerChain{ +public abstract class AbstractProtocolHandlerChain implements ProtocolHandlerChain { /** * Return an immutable List of all Handlers http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java index 63e3ad7..24bcc9a 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java @@ -82,7 +82,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten */ protected void addToMap(String commandName, CommandHandler<Session> cmdHandler) { List<CommandHandler<Session>> handlers = commandHandlerMap.get(commandName); - if(handlers == null) { + if (handlers == null) { handlers = new ArrayList<>(); commandHandlerMap.put(commandName, handlers); } @@ -103,7 +103,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten } LOGGER.debug("Lookup command handler for command: {}", command); List<CommandHandler<Session>> handlers = commandHandlerMap.get(command); - if(handlers == null) { + if (handlers == null) { handlers = commandHandlerMap.get(getUnknownCommandHandlerIdentifier()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java index 47b65e3..4ee8bcf 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java @@ -35,7 +35,7 @@ import org.apache.james.protocols.api.Response; * therefore the command handlers must store all the state information * in the Session object */ - public interface CommandHandler<Session extends ProtocolSession> extends ProtocolHandler{ + public interface CommandHandler<Session extends ProtocolSession> extends ProtocolHandler { /** * Handle the command **/ http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java index 139da65..7bcfddf 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java @@ -30,7 +30,7 @@ import org.apache.james.protocols.api.Response; * therefore the handlers must store all the state information * in the Session object */ -public interface ConnectHandler<Session extends ProtocolSession> extends ProtocolHandler{ +public interface ConnectHandler<Session extends ProtocolSession> extends ProtocolHandler { /** * Handle connection and disconnect if true is returned * http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java index e8f6ac5..4690b81 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java @@ -29,7 +29,7 @@ import org.apache.james.protocols.api.ProtocolSession; * * @param <S> */ -public interface DisconnectHandler<S extends ProtocolSession> extends ProtocolHandler{ +public interface DisconnectHandler<S extends ProtocolSession> extends ProtocolHandler { /** * Get called on disconnect http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java index 22a4821..585813d 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java @@ -29,7 +29,7 @@ import org.apache.james.protocols.api.Response; * * Only one {@link LineHandler} will get called per line */ -public interface LineHandler<Session extends ProtocolSession> extends ProtocolHandler{ +public interface LineHandler<Session extends ProtocolSession> extends ProtocolHandler { /** * Processing the give line. The line includes the {@link ProtocolSession#getLineDelimiter()} delimiter. http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java index 2315f7c..511881e 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java @@ -34,7 +34,7 @@ import org.apache.james.protocols.api.Response; * * @param <S> */ -public abstract class MultiLineHandler<S extends ProtocolSession> implements LineHandler<S>{ +public abstract class MultiLineHandler<S extends ProtocolSession> implements LineHandler<S> { private static final String BUFFERED_LINES = "BUFFERED_LINES"; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerResultHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerResultHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerResultHandler.java index faefaa5..c4fbff2 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerResultHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerResultHandler.java @@ -31,7 +31,7 @@ import org.apache.james.protocols.api.Response; * @param <R> * @param <S> */ -public interface ProtocolHandlerResultHandler<R extends Response, S extends ProtocolSession> extends ProtocolHandler{ +public interface ProtocolHandlerResultHandler<R extends Response, S extends ProtocolSession> extends ProtocolHandler { /** * Get called when a {@link Response} was returned from the {@link ProtocolHandler} http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java index e9fed0a..11f0c95 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java @@ -31,12 +31,12 @@ import com.google.common.collect.ImmutableSet; * * @param <S> */ -public abstract class UnknownCommandHandler<S extends ProtocolSession> implements CommandHandler<S>{ +public abstract class UnknownCommandHandler<S extends ProtocolSession> implements CommandHandler<S> { /** * Identifier which is used in {@link #getImplCommands()} */ - public static final String COMMAND_IDENTIFIER ="UNKNOWN_CMD"; + public static final String COMMAND_IDENTIFIER = "UNKNOWN_CMD"; private static final Collection<String> COMMANDS = ImmutableSet.of(COMMAND_IDENTIFIER); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/TestUtils.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/TestUtils.java b/protocols/api/src/test/java/org/apache/james/protocols/api/utils/TestUtils.java index 6f7d408..e3bb2b6 100644 --- a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/TestUtils.java +++ b/protocols/api/src/test/java/org/apache/james/protocols/api/utils/TestUtils.java @@ -32,7 +32,7 @@ public class TestUtils { * @return port */ public static synchronized int getFreePort() { - for(int start = START_PORT; start <= END_PORT; start++) { + for (int start = START_PORT; start <= END_PORT; start++) { try { ServerSocket socket = new ServerSocket(start); socket.setReuseAddress(true); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java b/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java index d7eb70e..bdb32db 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java @@ -43,7 +43,7 @@ public class CharsetUtil { // build the sets which holds the charsets and names static { - Set<String>cNames = new HashSet<>(); + Set<String> cNames = new HashSet<>(); Set<Charset> sets = new HashSet<>(); for (Charset charset : Charset.availableCharsets().values()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java index 8185cad..92c96d2 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java @@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableList; /** * Represents a range of UID or MSN values. */ -public final class IdRange implements Iterable<Long>, Comparable<IdRange>{ +public final class IdRange implements Iterable<Long>, Comparable<IdRange> { public static String toString(IdRange[] ranges) { return Optional.ofNullable(ranges) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java index 9a0c44d..f53c086 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java @@ -67,7 +67,7 @@ public class DayMonthYear { */ public final Date toDate() { Calendar cal = getGMT(); - cal.set(getYear(), getMonth() -1, getDay()); + cal.set(getYear(), getMonth() - 1, getDay()); return cal.getTime(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java ---------------------------------------------------------------------- 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 879290e..474e937 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 @@ -32,7 +32,7 @@ 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{ +public abstract class AbstractSelectionCommandParser extends AbstractImapCommandParser { private static final byte[] CONDSTORE = ImapConstants.SUPPORTS_CONDSTORE.getBytes(); private static final byte[] QRESYNC = ImapConstants.SUPPORTS_QRESYNC.getBytes(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SetQuotaCommandParser.java ---------------------------------------------------------------------- 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 baf45d3..ee081d4 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 @@ -44,7 +44,7 @@ public class SetQuotaCommandParser extends AbstractImapCommandParser { // We now parse resource limit declaration // It has the following shape : (RESOURCE1 1024000) (RESOURCE2 2048000)\n request.nextWordChar(); - while ( request.nextChar() == '(') { + while (request.nextChar() == '(') { request.consume(); String resource = request.atom(); request.nextWordChar(); @@ -54,7 +54,7 @@ public class SetQuotaCommandParser extends AbstractImapCommandParser { setQuotaRequest.addResourceLimit(resource, limit); // Consume white spaces // Do not use nextWorldChar as it throws an exception on end of lines - while(request.nextChar() == ' ') { + while (request.nextChar() == ' ') { request.consume(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java index 7d776ef..5ad13d1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java @@ -49,8 +49,8 @@ public class CapabilityResponseEncoder extends AbstractChainedImapEncoder { Iterator<String> capabilities = response.getCapabilities().iterator(); composer.untagged(); composer.message(ImapConstants.CAPABILITY_COMMAND_NAME); - while(capabilities.hasNext()) { - composer.message(capabilities.next()); + while (capabilities.hasNext()) { + composer.message(capabilities.next()); } composer.end(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java index 33a185a..6055aff 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java @@ -51,8 +51,8 @@ public class QuotaResponseEncoder extends AbstractChainedImapEncoder { composer.message(quotaResponse.getResourceName()); // See RFC 2087 : response for STORAGE should be in KB. For more accuracy, we stores B, so conversion should be made if (quotaResponse.getResourceName().equalsIgnoreCase(ImapConstants.STORAGE_QUOTA_RESOURCE)) { - composer.message(quota.getUsed()/1024); - composer.message(quota.getMax()/1024); + composer.message(quota.getUsed() / 1024); + composer.message(quota.getMax() / 1024); } else { composer.message(quota.getUsed()); composer.message(quota.getMax()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java ---------------------------------------------------------------------- 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 2b27631..7594834 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 @@ -404,7 +404,7 @@ public class ImapResponseComposerImpl implements ImapConstants, ImapResponseComp public ImapResponseComposer sequenceSet(UidRange[] ranges) throws IOException { StringBuilder sb = new StringBuilder(); - for (int i = 0; i< ranges.length; i++) { + for (int i = 0; i < ranges.length; i++) { UidRange range = ranges[i]; sb.append(range.getFormattedString()); if (i + 1 < ranges.length) { @@ -416,7 +416,7 @@ public class ImapResponseComposerImpl implements ImapConstants, ImapResponseComp public ImapResponseComposer sequenceSet(IdRange[] ranges) throws IOException { StringBuilder sb = new StringBuilder(); - for (int i = 0; i< ranges.length; i++) { + for (int i = 0; i < ranges.length; i++) { IdRange range = ranges[i]; sb.append(range.getFormattedString()); if (i + 1 < ranges.length) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java index 909ff60..ddb6b49 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/EnableRequest.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.james.imap.api.ImapCommand; -public class EnableRequest extends AbstractImapRequest{ +public class EnableRequest extends AbstractImapRequest { private final List<String> capabilities; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java index 4d9411a..3f04c67 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/IRAuthenticateRequest.java @@ -24,7 +24,7 @@ import org.apache.james.imap.api.ImapCommand; * A {@link AuthenticateRequest} which also contains the initialClientResponse as stated in RFC4959 * */ -public class IRAuthenticateRequest extends AuthenticateRequest{ +public class IRAuthenticateRequest extends AuthenticateRequest { private final String initialClientResponse; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/message/response/ESearchResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/ESearchResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/ESearchResponse.java index 3244853..af7772a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/ESearchResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/ESearchResponse.java @@ -26,7 +26,7 @@ import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.api.message.request.SearchResultOption; import org.apache.james.imap.api.message.response.ImapResponseMessage; -public class ESearchResponse implements ImapResponseMessage{ +public class ESearchResponse implements ImapResponseMessage { private final long minUid; private final long maxUid; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/message/response/EnableResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/EnableResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/EnableResponse.java index c0e3df9..d3dd4ac 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/EnableResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/EnableResponse.java @@ -20,7 +20,7 @@ package org.apache.james.imap.message.response; import java.util.Set; -public class EnableResponse extends CapabilityResponse{ +public class EnableResponse extends CapabilityResponse { public EnableResponse(Set<String> capabilities) { super(capabilities); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java index 7dbadee..086aa10 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java @@ -32,7 +32,7 @@ public class QuotaRootResponse implements ImapResponseMessage { public QuotaRootResponse(String mailboxName, String quotaRoot) { super(); this.mailboxName = mailboxName; - this.quotaRoot= quotaRoot; + this.quotaRoot = quotaRoot; } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/message/response/VanishedResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/VanishedResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/VanishedResponse.java index c3f0917..5e3f2d8 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/VanishedResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/VanishedResponse.java @@ -23,7 +23,7 @@ import org.apache.james.imap.api.message.UidRange; import org.apache.james.imap.api.message.response.ImapResponseMessage; -public class VanishedResponse implements ImapResponseMessage{ +public class VanishedResponse implements ImapResponseMessage { private final UidRange[] uids; private final boolean earlier; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java index a891aa9..1b7f59a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -public abstract class AbstractAuthProcessor<M extends ImapRequest> extends AbstractMailboxProcessor<M>{ +public abstract class AbstractAuthProcessor<M extends ImapRequest> extends AbstractMailboxProcessor<M> { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAuthProcessor.class); private static final String ATTRIBUTE_NUMBER_OF_FAILURES = "org.apache.james.imap.processor.imap4rev1.NUMBER_OF_FAILURES"; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java index 1a0bbf8..9eefdd4 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java @@ -222,7 +222,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab final Collection<MessageUid> flagUpdateUids = selected.flagUpdateUids(); if (!flagUpdateUids.isEmpty()) { Iterator<MessageRange> ranges = MessageRange.toRanges(flagUpdateUids).iterator(); - while(ranges.hasNext()) { + while (ranges.hasNext()) { if (messageManager == null) { messageManager = getMailbox(session, selected); } @@ -569,7 +569,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab } MessageUid from = nr.getLowValue(); MessageUid to = nr.getHighValue(); - while(from.compareTo(to) <= 0) { + while (from.compareTo(to) <= 0) { vanishedUids.add(from); from = from.next(); } @@ -579,7 +579,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab searchQuery.andCriteria(SearchQuery.uid(nRanges)); searchQuery.andCriteria(SearchQuery.modSeqGreaterThan(changedSince)); Iterator<MessageUid> uids = mailbox.search(searchQuery, session); - while(uids.hasNext()) { + while (uids.hasNext()) { vanishedUids.remove(uids.next()); } UidRange[] vanishedIdRanges = uidRanges(MessageRange.toRanges(vanishedUids)); @@ -595,7 +595,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab UidRange[] idRanges = new UidRange[mRanges.size()]; Iterator<MessageRange> mIt = mRanges.iterator(); int i = 0; - while(mIt.hasNext()) { + while (mIt.hasNext()) { MessageRange mr = mIt.next(); UidRange ir; if (mr.getType() == Type.ONE) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java index 0ada512..95b4470 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java @@ -137,7 +137,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ // // See IMAP-345 int retryCount = 0; - while(unseen(responder, firstUnseen, selected, ImapSessionUtils.getMailboxSession(session)) == false) { + while (unseen(responder, firstUnseen, selected, ImapSessionUtils.getMailboxSession(session)) == false) { // if we not was able to get find the unseen within 5 retries we should just not send it if (retryCount == 5) { LOGGER.info("Unable to uid for unseen message {} in mailbox {}", firstUnseen, selected.getPath()); @@ -459,14 +459,14 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ // QRESYNC or CONDSTORE // // See http://www.dovecot.org/list/dovecot/2008-March/029561.html - if (capability.equalsIgnoreCase(ImapConstants.SUPPORTS_CONDSTORE)|| capability.equalsIgnoreCase(ImapConstants.SUPPORTS_QRESYNC)) { + if (capability.equalsIgnoreCase(ImapConstants.SUPPORTS_CONDSTORE) || capability.equalsIgnoreCase(ImapConstants.SUPPORTS_QRESYNC)) { try { MetaData metaData = null; boolean send = false; if (sm != null) { MessageManager mailbox = getSelectedMailbox(session); metaData = mailbox.getMetaData(false, ImapSessionUtils.getMailboxSession(session), FetchGroup.NO_COUNT); - send= true; + send = true; } condstoreEnablingCommand(session, responder, metaData, send); } catch (MailboxException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java index 170881f..8963e2c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java @@ -47,7 +47,7 @@ import com.google.common.collect.ImmutableList; * * */ -public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateRequest> implements CapabilityImplementingProcessor{ +public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateRequest> implements CapabilityImplementingProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticateProcessor.class); private static final String PLAIN = "PLAIN"; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java index 6459656..5e2fc78 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java @@ -86,9 +86,8 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques */ if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) { no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND); - } - /* RFC 4314 section 4. */ - else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + } else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + /* RFC 4314 section 4. */ Object[] params = new Object[] { MailboxACL.Right.Administer.toString(), command.getName(), @@ -96,8 +95,7 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques }; HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params); no(command, tag, responder, text); - } - else { + } else { EntryKey key = EntryKey.deserialize(identifier); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java index f69319f..488ea9d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java @@ -90,7 +90,7 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp public Set<String> enable(ImapRequest request, Responder responder, ImapSession session, Iterator<String> caps) throws EnableException { Set<String> enabledCaps = new HashSet<>(); - while(caps.hasNext()) { + while (caps.hasNext()) { String cap = caps.next(); // Check if the CAPABILITY is supported at all if (capabilityProcessor.getSupportedCapabilities(session).contains(cap)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java index 207c2b7..000efbc 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java @@ -85,9 +85,8 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp */ if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) { no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND); - } - /* RFC 4314 section 4. */ - else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + } else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + /* RFC 4314 section 4. */ Object[] params = new Object[] { MailboxACL.Right.Administer.toString(), command.getName(), @@ -95,8 +94,7 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp }; HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params); no(command, tag, responder, text); - } - else { + } else { MetaData metaData = messageManager.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT); ACLResponse aclResponse = new ACLResponse(mailboxName, metaData.getACL()); responder.respond(aclResponse); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java index 5553755..64d323c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java @@ -75,7 +75,7 @@ public class GetQuotaProcessor extends AbstractMailboxProcessor<GetQuotaRequest> @Override protected void doProcess(GetQuotaRequest message, ImapSession session, String tag, ImapCommand command, Responder responder) { try { - if(hasRight(message.getQuotaRoot(), session)) { + if (hasRight(message.getQuotaRoot(), session)) { QuotaRoot quotaRoot = quotaRootResolver.createQuotaRoot(message.getQuotaRoot()); Quota messageQuota = quotaManager.getMessageQuota(quotaRoot); Quota storageQuota = quotaManager.getStorageQuota(quotaRoot); @@ -91,7 +91,7 @@ public class GetQuotaProcessor extends AbstractMailboxProcessor<GetQuotaRequest> HumanReadableText humanReadableText = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params); no(command, tag, responder, humanReadableText); } - } catch(MailboxException me) { + } catch (MailboxException me) { taggedBad(command, tag, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX); } } @@ -100,8 +100,8 @@ public class GetQuotaProcessor extends AbstractMailboxProcessor<GetQuotaRequest> // If any of the mailboxes owned by quotaRoot user can be read by the current user, then we should respond to him. final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); List<MailboxPath> mailboxList = quotaRootResolver.retrieveAssociatedMailboxes(quotaRootResolver.createQuotaRoot(quotaRoot), mailboxSession); - for(MailboxPath mailboxPath : mailboxList) { - if(getMailboxManager().hasRight(mailboxPath, MailboxACL.Right.Read, mailboxSession)) { + for (MailboxPath mailboxPath : mailboxList) { + if (getMailboxManager().hasRight(mailboxPath, MailboxACL.Right.Read, mailboxSession)) { return true; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java index 27f06d5..15f2a12 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java @@ -94,7 +94,7 @@ public class GetQuotaRootProcessor extends AbstractMailboxProcessor<GetQuotaRoot HumanReadableText humanReadableText = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params); no(command, tag, responder, humanReadableText); } - } catch(MailboxException me) { + } catch (MailboxException me) { taggedBad(command, tag, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java index bcbaf94..0fe39ee 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java @@ -178,8 +178,7 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> { basePath.getName(), CharsetUtil.decodeModifiedUTF7(mailboxName), mailboxSession.getPathDelimiter())) - .build() - , mailboxSession); + .build(), mailboxSession); } for (MailboxMetaData metaData : results) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java index f0d66cd..753077b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java @@ -87,9 +87,8 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ */ if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) { no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND); - } - /* RFC 4314 section 4. */ - else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + } else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + /* RFC 4314 section 4. */ Object[] params = new Object[] { MailboxACL.Right.Administer.toString(), command.getName(), @@ -97,8 +96,7 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ }; HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params); no(command, tag, responder, text); - } - else { + } else { EntryKey key = EntryKey.deserialize(identifier); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java index 160aa03..59a8bd1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java @@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableList; /** * Processes a <code>LOGIN</code> command. */ -public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implements CapabilityImplementingProcessor{ +public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implements CapabilityImplementingProcessor { private static final List<String> LOGINDISABLED_CAPS = ImmutableList.of("LOGINDISABLED"); public LoginProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/PermitEnableCapabilityProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/PermitEnableCapabilityProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/PermitEnableCapabilityProcessor.java index 0aaac59..3c02fb4 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/PermitEnableCapabilityProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/PermitEnableCapabilityProcessor.java @@ -26,7 +26,7 @@ import org.apache.james.imap.api.process.ImapSession; /** * {@link CapabilityImplementingProcessor} which allows to ENABLE one ore more Capabilities */ -public interface PermitEnableCapabilityProcessor extends CapabilityImplementingProcessor{ +public interface PermitEnableCapabilityProcessor extends CapabilityImplementingProcessor { /** * Return the capabilities which supports to get ENABLED. http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java index e22b747..b6586ac 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java @@ -165,7 +165,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp if (ids.length > 0) { min = ids[0]; - max = ids[ids.length -1]; + max = ids[ids.length - 1]; } @@ -240,7 +240,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp int size = ranges.size(); for (int i = size - 1; i > 0; i--) { MessageResultIterator results = mailbox.getMessages(ranges.get(i), FetchGroupImpl.MINIMAL, session); - while(results.hasNext()) { + while (results.hasNext()) { long modSeq = results.next().getModSeq(); if (highestModSeq == null || modSeq > highestModSeq) { highestModSeq = modSeq; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java index 8d8c2b0..414563a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java @@ -104,9 +104,8 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp */ if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Lookup, mailboxSession)) { no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND); - } - /* RFC 4314 section 4. */ - else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + } else if (!mailboxManager.hasRight(mailboxPath, MailboxACL.Right.Administer, mailboxSession)) { + /* RFC 4314 section 4. */ Object[] params = new Object[] { MailboxACL.Right.Administer.toString(), command.getName(), @@ -114,8 +113,7 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp }; HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params); no(command, tag, responder, text); - } - else { + } else { EntryKey key = EntryKey.deserialize(identifier); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java index ec4a559..b93c2bf 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java @@ -98,7 +98,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { // See RFC4551 3.1.2. NOMODSEQ Response Code taggedBad(command, tag, responder, HumanReadableText.NO_MOD_SEQ); return; - } else if (unchangedSince == 0){ + } else if (unchangedSince == 0) { Flags.Flag[] systemFlags = flags.getSystemFlags(); if (systemFlags != null && systemFlags.length != 0) { // we need to return all sequences as failed when using a UNCHANGEDSINCE 0 and the request specify a SYSTEM flags @@ -279,7 +279,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { // if (unchangedSince != -1 || qresyncEnabled || condstoreEnabled) { MessageResultIterator results = mailbox.getMessages(messageSet, FetchGroupImpl.MINIMAL, mailboxSession); - while(results.hasNext()) { + while (results.hasNext()) { MessageResult r = results.next(); // Store the modseq for the uid for later usage in the response modSeqs.put(r.getUid(),r.getModSeq()); @@ -323,7 +323,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { if (silent && (unchangedSince != -1 || qresyncEnabled || condstoreEnabled)) { // We need to return an FETCH response which contains the mod-sequence of the message even if FLAGS.SILENT was used response = new FetchResponse(msn, null, resultUid, modSeqs.get(uid), null, null, null, null, null, null); - } else if (!silent && (unchangedSince != -1 || qresyncEnabled || condstoreEnabled)){ + } else if (!silent && (unchangedSince != -1 || qresyncEnabled || condstoreEnabled)) { // // Use a FETCH response which contains the mod-sequence and the flags response = new FetchResponse(msn, resultFlags, resultUid, modSeqs.get(uid), null, null, null, null, null, null); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java index 329bd23..6cf098e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java @@ -50,7 +50,7 @@ import com.google.common.collect.ImmutableList; /** * Default implementation of {@link SelectedMailbox} */ -public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{ +public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener { private static final Logger LOGGER = LoggerFactory.getLogger(SelectedMailboxImpl.class); private final Set<MessageUid> recentUids = new TreeSet<>(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 67bbdf7..53c3978 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 @@ -28,7 +28,7 @@ import org.apache.james.mailbox.model.Content; * Just an Empty {@link Content} * */ -public class EmptyContent implements Content{ +public class EmptyContent implements Content { /** * Return 0 as this {@link Content} is empty http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java index 039a65f..f11375e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.james.mailbox.model.Content; -public class HeadersBodyElement extends ContentBodyElement{ +public class HeadersBodyElement extends ContentBodyElement { private boolean noBody = false; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 1994601..b8892ac 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 @@ -80,7 +80,7 @@ public class IMAPRequest implements Request { StringBuilder sb = new StringBuilder(); Iterator<ByteBuffer> linesIt = lines.iterator(); - while (linesIt.hasNext()){ + while (linesIt.hasNext()) { ByteBuffer line = linesIt.next(); byte[] buf; if (line.hasArray()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java index 3e36ca1..0ad94dc 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java @@ -29,7 +29,7 @@ import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.protocols.imap.utils.EolInputStream; import org.apache.james.protocols.imap.utils.FixedLengthInputStream; -public class IMAPRequestLineReader extends ImapRequestLineReader{ +public class IMAPRequestLineReader extends ImapRequestLineReader { private final Iterator<ByteBuffer> args; private final byte[] prefix; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 9bfa086..6b0439e 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 @@ -23,7 +23,7 @@ import org.apache.james.imap.api.process.SelectedMailbox; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.handler.LineHandler; -public interface IMAPSession extends ProtocolSession{ +public interface IMAPSession extends ProtocolSession { /** * Pop the last command handler http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 78b6cba..2bedae6 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 @@ -33,7 +33,7 @@ import org.apache.james.protocols.api.handler.MultiLineHandler; import org.apache.james.protocols.imap.IMAPRequest; import org.apache.james.protocols.imap.IMAPSession; -public class IMAPCommandDispatcher extends CommandDispatcher<IMAPSession>{ +public class IMAPCommandDispatcher extends CommandDispatcher<IMAPSession> { private static final Pattern LITERAL_PATTERN = Pattern.compile(".*\\{(\\d+)\\}.*"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java ---------------------------------------------------------------------- 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/protocols/imap/utils/DecoderUtils.java index 8606274..18d1397 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java @@ -64,7 +64,7 @@ public final class DecoderUtils { private static final int ALL_MONTH_BITS = JAN_BIT | FEB_BIT | MAR_BIT | APR_BIT | MAY_BIT | JUN_BIT | JUL_BIT | AUG_BIT | SEP_BIT | OCT_BIT | NOV_BIT | DEC_BIT; - public static void setFlag(String flagString, Flags flags) throws DecodingException{ + public static void setFlag(String flagString, Flags flags) throws DecodingException { if (flagString.equalsIgnoreCase(MessageFlags.ANSWERED_ALL_CAPS)) { flags.add(Flags.Flag.ANSWERED); } else if (flagString.equalsIgnoreCase(MessageFlags.DELETED_ALL_CAPS)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java index 44fa027..bd6e859 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java @@ -121,7 +121,7 @@ public class SearchCommandParserNotTest { @Test public void testUserFlagsParsing() throws Exception { - ImapRequestLineReader reader = new ImapRequestStreamLineReader( + ImapRequestLineReader reader = new ImapRequestStreamLineReader( new ByteArrayInputStream("NOT (KEYWORD bar KEYWORD foo)".getBytes("US-ASCII")), new ByteArrayOutputStream()); SearchKey key = parser.searchKey(null, reader, null, false); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java index cac5659..f129b03 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java @@ -106,7 +106,7 @@ public class FetchResponseEncoderNoExtensionsTest { null, null, null, null, stubStructure, null); final Map<String, String> parameters = new HashMap<>(); parameters.put("CHARSET", "US-ASCII"); - final List<String> parameterList= new ArrayList<>(); + final List<String> parameterList = new ArrayList<>(); parameterList.add("CHARSET"); parameterList.add("US-ASCII"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java index 0456e52..77ffa4a 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java @@ -46,7 +46,7 @@ public class QuotaResponseEncoderTest { @Test public void quotaStorageResponseShouldBeWellFormatted() throws Exception { - QuotaResponse response = new QuotaResponse("STORAGE", "root", QuotaImpl.quota(231*1024, 1024*1024)); + QuotaResponse response = new QuotaResponse("STORAGE", "root", QuotaImpl.quota(231 * 1024, 1024 * 1024)); ByteImapResponseWriter byteImapResponseWriter = new ByteImapResponseWriter(); ImapResponseComposer composer = new ImapResponseComposerImpl(byteImapResponseWriter, 1024); QuotaResponseEncoder encoder = new QuotaResponseEncoder(new EndImapEncoder()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java index 97adf70..5ba4461 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java @@ -156,7 +156,7 @@ public class NamespaceProcessorTest { private Responder expectResponse(final NamespaceResponse response) { final Responder responderMock = mockery.mock(Responder.class); - mockery.checking(new Expectations(){{ + mockery.checking(new Expectations() {{ oneOf(responderMock).respond(with(equal(response))); oneOf(responderMock).respond(with(any(StatusResponse.class))); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java index 6709b39..ff0e8ac 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java @@ -228,7 +228,7 @@ public class SearchProcessorTest { private Date getDate(int day, int month, int year) { Calendar cal = getGMT(); - cal.set(year, month -1, day); + cal.set(year, month - 1, day); return cal.getTime(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java index 55298ef..a401be8 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java @@ -161,6 +161,6 @@ public class SelectedMailboxImplTest { private void emitEvent(MailboxListener mailboxListener) { TreeMap<MessageUid, MessageMetaData> result = new TreeMap<>(); result.put(EMITTED_EVENT_UID, new SimpleMessageMetaData(EMITTED_EVENT_UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId())); - mailboxListener.event(new EventFactory().added(mock(MailboxSession.class), result, mailbox, ImmutableMap.<MessageUid, MailboxMessage> of())); + mailboxListener.event(new EventFactory().added(mock(MailboxSession.class), result, mailbox, ImmutableMap.<MessageUid, MailboxMessage>of())); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 6457e65..2645aaf 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 @@ -26,7 +26,7 @@ import org.apache.james.protocols.smtp.SMTPConfiguration; * A {@link ProtocolConfigurationImpl} which is used in the context of LMTP * */ -public abstract class LMTPConfiguration extends ProtocolConfigurationImpl implements SMTPConfiguration{ +public abstract class LMTPConfiguration extends ProtocolConfigurationImpl implements SMTPConfiguration { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 75a3601..8bcd064 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 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.protocols.lmtp; -public class LMTPConfigurationImpl extends LMTPConfiguration{ +public class LMTPConfigurationImpl extends LMTPConfiguration { private long maxMessageSize = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java index 64179bd..5af64b8 100644 --- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java +++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java @@ -51,7 +51,7 @@ import org.apache.james.protocols.smtp.hook.Hook; * * */ -public class LMTPProtocolHandlerChain extends SMTPProtocolHandlerChain{ +public class LMTPProtocolHandlerChain extends SMTPProtocolHandlerChain { public LMTPProtocolHandlerChain() { super(new NoopMetricFactory()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/DataLineMessageHookHandler.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/DataLineMessageHookHandler.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/DataLineMessageHookHandler.java index 51251de..8429d5e 100644 --- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/DataLineMessageHookHandler.java +++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/DataLineMessageHookHandler.java @@ -40,7 +40,7 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus; * * */ -public class DataLineMessageHookHandler extends org.apache.james.protocols.smtp.core.DataLineMessageHookHandler{ +public class DataLineMessageHookHandler extends org.apache.james.protocols.smtp.core.DataLineMessageHookHandler { private final List<DeliverToRecipientHook> handlers = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 009fdcf..6d23734 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 @@ -31,7 +31,7 @@ import org.apache.commons.net.smtp.SMTPSClient; import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; -public abstract class AbstractLMTPSServerTest extends AbstractLMTPServerTest{ +public abstract class AbstractLMTPSServerTest extends AbstractLMTPServerTest { @Override protected SMTPClient createClient() { @@ -41,7 +41,7 @@ public abstract class AbstractLMTPSServerTest extends AbstractLMTPServerTest{ return client; } - protected final class LMTPSClient extends SMTPSClient implements LMTPClient{ + protected final class LMTPSClient extends SMTPSClient implements LMTPClient { private final List<Integer> replies = new ArrayList<>(); private int rcptCount = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 b2978c2..10d58c7 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 @@ -52,7 +52,7 @@ import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.junit.Ignore; import org.junit.Test; -public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ +public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { @Override protected Protocol createProtocol(ProtocolHandler... handlers) throws WiringException { @@ -111,10 +111,10 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ assertTrue(SMTPReply.isPositiveCompletion(client.getReplyCode())); client.mail(SENDER); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.quit(); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -146,12 +146,12 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ assertTrue(SMTPReply.isPositiveCompletion(client.getReplyCode())); client.setSender(SENDER); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.rcpt(RCPT1); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.quit(); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -182,7 +182,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ assertTrue(SMTPReply.isNegativePermanent(client.getReplyCode())); client.quit(); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -213,13 +213,13 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ assertTrue(SMTPReply.isPositiveCompletion(client.getReplyCode())); client.setSender(SENDER); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.addRecipient(RCPT1); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.addRecipient(RCPT2); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); assertTrue(client.sendShortMessageData(MSG1)); @@ -231,7 +231,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ assertTrue(SMTPReply.isPositiveCompletion(replies[1])); client.quit(); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertTrue("Reply=" + client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); client.disconnect(); Iterator<MailEnvelope> queued = deliverHook.getDelivered().iterator(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java index 8dc4650..529bf08 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java @@ -9,7 +9,7 @@ import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.lmtp.AbstractLMTPSServerTest; import org.apache.james.protocols.netty.NettyServer; -public class NettyLMTPSServerTest extends AbstractLMTPSServerTest{ +public class NettyLMTPSServerTest extends AbstractLMTPSServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int RANDOM_PORT = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java index 9169110..988f311 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java @@ -105,7 +105,7 @@ public class CoreProcessor implements CoreCommands { private String computeCapabilityEntryString(Map.Entry<Capabilities, String> entry) { return "\"" + entry.getKey().toString() + "\"" + - ( entry.getValue() == null ? "" : " \"" + entry.getValue() + "\""); + (entry.getValue() == null ? "" : " \"" + entry.getValue() + "\""); } @Override @@ -197,7 +197,7 @@ public class CoreProcessor implements CoreCommands { @Override public String noop(String tag) { - if(Strings.isNullOrEmpty(tag)) { + if (Strings.isNullOrEmpty(tag)) { return "OK \"NOOP completed\""; } return "OK " + taggify(tag) + " \"DONE\""; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java index e076b6e..17508fe 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java @@ -174,7 +174,7 @@ public class ArgumentParser { try { ParserUtils.getSize(arguments.next()); } catch (ArgumentException e) { - return "NO \""+ e.getMessage() + "\""; + return "NO \"" + e.getMessage() + "\""; } } if (arguments.hasNext()) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
