You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/01/10 10:14:03 UTC
[03/53] [abbrv] james-project git commit: JAMES-2277 reorder modifiers
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java
index 0d9d492..3d2aadc 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java
@@ -90,19 +90,19 @@ public class BayesianAnalyzer {
* Number of "interesting" tokens to use to compute overall spamminess
* probability.
*/
- private final static int MAX_INTERESTING_TOKENS = 15;
+ private static final int MAX_INTERESTING_TOKENS = 15;
/**
* Minimum probability distance from 0.5 to consider a token "interesting"
* to use to compute overall spamminess probability.
*/
- private final static double INTERESTINGNESS_THRESHOLD = 0.46;
+ private static final double INTERESTINGNESS_THRESHOLD = 0.46;
/**
* Default token probability to use when a token has not been encountered
* before.
*/
- final static double DEFAULT_TOKEN_PROBABILITY = 0.4;
+ static final double DEFAULT_TOKEN_PROBABILITY = 0.4;
/** Map of ham tokens and their occurrences. */
private Map<String, Integer> hamTokenCounts = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
index 20def31..ae4c863 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
@@ -48,7 +48,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
private static final Logger LOGGER = LoggerFactory.getLogger(JDBCBayesianAnalyzer.class);
/** Public object representing a lock on database activity. */
- public final static String DATABASE_LOCK = "database lock";
+ public static final String DATABASE_LOCK = "database lock";
/**
* The JDBCUtil helper class
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
index 42d05f3..d50e4fc 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
@@ -52,7 +52,7 @@ class SqlResources {
private final Map<String, String> m_dbOptions = new HashMap<>();
/** A set of all used String values */
- static private final Map<String, String> stringTable = java.util.Collections.synchronizedMap(new HashMap<String, String>());
+ private static final Map<String, String> stringTable = java.util.Collections.synchronizedMap(new HashMap<String, String>());
/**
* <p>
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/base/src/main/java/org/apache/mailet/base/RFC2822Headers.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/RFC2822Headers.java b/mailet/base/src/main/java/org/apache/mailet/base/RFC2822Headers.java
index 6822dae..4f5233b 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/RFC2822Headers.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/RFC2822Headers.java
@@ -31,146 +31,146 @@ public class RFC2822Headers {
/**
* The name of the RFC 2822 header that stores the mail date.
*/
- public final static String DATE = "Date";
+ public static final String DATE = "Date";
// See Section 3.6.2 of RFC 2822
/**
* The name of the RFC 2822 header that stores the mail author(s).
*/
- public final static String FROM = "From";
+ public static final String FROM = "From";
/**
* The name of the RFC 2822 header that stores the actual mail transmission agent,
* if this differs from the author of the message.
*/
- public final static String SENDER = "Sender";
+ public static final String SENDER = "Sender";
/**
* The name of the RFC 2822 header that stores the reply-to address.
*/
- public final static String REPLY_TO = "Reply-To";
+ public static final String REPLY_TO = "Reply-To";
// See Section 3.6.3 of RFC 2822
/**
* The name of the RFC 2822 header that stores the primary mail recipients.
*/
- public final static String TO = "To";
+ public static final String TO = "To";
/**
* The name of the RFC 2822 header that stores the carbon copied mail recipients.
*/
- public final static String CC = "Cc";
+ public static final String CC = "Cc";
/**
* The name of the RFC 2822 header that stores the blind carbon copied mail recipients.
*/
- public final static String BCC = "Bcc";
+ public static final String BCC = "Bcc";
// See Section 3.6.4 of RFC 2822
/**
* The name of the RFC 2822 header that stores the message id.
*/
- public final static String MESSAGE_ID = "Message-ID";
+ public static final String MESSAGE_ID = "Message-ID";
/**
* A common variation on the name of the RFC 2822 header that
* stores the message id. This is needed for certain filters and
* processing of incoming mail.
*/
- public final static String MESSAGE_ID_VARIATION = "Message-Id";
+ public static final String MESSAGE_ID_VARIATION = "Message-Id";
/**
* The name of the RFC 2822 header that stores the message id of the message
* that to which this email is a reply.
*/
- public final static String IN_REPLY_TO = "In-Reply-To";
+ public static final String IN_REPLY_TO = "In-Reply-To";
/**
* The name of the RFC 2822 header that is used to identify the thread to
* which this message refers.
*/
- public final static String REFERENCES = "References";
+ public static final String REFERENCES = "References";
// See Section 3.6.5 of RFC 2822
/**
* The name of the RFC 2822 header that stores the subject.
*/
- public final static String SUBJECT = "Subject";
+ public static final String SUBJECT = "Subject";
/**
* The name of the RFC 2822 header that stores human-readable comments.
*/
- public final static String COMMENTS = "Comments";
+ public static final String COMMENTS = "Comments";
/**
* The name of the RFC 2822 header that stores human-readable keywords.
*/
- public final static String KEYWORDS = "Keywords";
+ public static final String KEYWORDS = "Keywords";
// See Section 3.6.6 of RFC 2822
/**
* The name of the RFC 2822 header that stores the date the message was resent.
*/
- public final static String RESENT_DATE = "Resent-Date";
+ public static final String RESENT_DATE = "Resent-Date";
/**
* The name of the RFC 2822 header that stores the originator of the resent message.
*/
- public final static String RESENT_FROM = "Resent-From";
+ public static final String RESENT_FROM = "Resent-From";
/**
* The name of the RFC 2822 header that stores the transmission agent
* of the resent message.
*/
- public final static String RESENT_SENDER = "Resent-Sender";
+ public static final String RESENT_SENDER = "Resent-Sender";
/**
* The name of the RFC 2822 header that stores the recipients
* of the resent message.
*/
- public final static String RESENT_TO = "Resent-To";
+ public static final String RESENT_TO = "Resent-To";
/**
* The name of the RFC 2822 header that stores the carbon copied recipients
* of the resent message.
*/
- public final static String RESENT_CC = "Resent-Cc";
+ public static final String RESENT_CC = "Resent-Cc";
/**
* The name of the RFC 2822 header that stores the blind carbon copied recipients
* of the resent message.
*/
- public final static String RESENT_BCC = "Resent-Bcc";
+ public static final String RESENT_BCC = "Resent-Bcc";
/**
* The name of the RFC 2822 header that stores the message id
* of the resent message.
*/
- public final static String RESENT_MESSAGE_ID = "Resent-Message-ID";
+ public static final String RESENT_MESSAGE_ID = "Resent-Message-ID";
// See Section 3.6.7 of RFC 2822
/**
* The name of the RFC 2822 headers that store the tracing data for the return path.
*/
- public final static String RETURN_PATH = "Return-Path";
+ public static final String RETURN_PATH = "Return-Path";
/**
* The name of the RFC 2822 headers that store additional tracing data.
*/
- public final static String RECEIVED = "Received";
+ public static final String RECEIVED = "Received";
// MIME headers
/**
* The name of the MIME header that stores the content type.
*/
- public final static String CONTENT_TYPE = "Content-Type";
+ public static final String CONTENT_TYPE = "Content-Type";
/**
* Private constructor to prevent instantiation
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
index 9a1c85d..5d27c99 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
@@ -60,7 +60,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler
*
* @return A new ActivationDataFlavor
*/
- abstract protected ActivationDataFlavor computeDataFlavor();
+ protected abstract ActivationDataFlavor computeDataFlavor();
protected void setDataFlavor(ActivationDataFlavor aDataFlavor)
{
@@ -91,7 +91,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler
* @return new Content built from the DataSource
* @throws MessagingException
*/
- abstract protected Object computeContent(DataSource aDataSource)
+ protected abstract Object computeContent(DataSource aDataSource)
throws MessagingException;
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
index e8a8c6c..28cfaf7 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
@@ -379,10 +379,10 @@ public class ClassifyBounce extends GenericMailet {
private final String subject;
private final String text;
- public final static int TYPE_NORMAL = 1;
- public final static int TYPE_OUT_OF_OFFICE = 3;
- public final static int TYPE_DELIVERY_FAILURE = 4;
- public final static int TYPE_MAILBOX_FULL = 5;
+ public static final int TYPE_NORMAL = 1;
+ public static final int TYPE_OUT_OF_OFFICE = 3;
+ public static final int TYPE_DELIVERY_FAILURE = 4;
+ public static final int TYPE_MAILBOX_FULL = 5;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
index 5b3abc7..e35a9d5 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
@@ -55,7 +55,7 @@ import org.apache.mailet.base.GenericMailet;
*/
@Experimental
public class UnwrapText extends GenericMailet {
- public final static String PARAMETER_NAME_QUOTEWIDTH = "quotewidth";
+ public static final String PARAMETER_NAME_QUOTEWIDTH = "quotewidth";
private int quotewidth;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
index b0109e3..e103c10 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
* @since 2.2.0
*/
@Experimental
-abstract public class AbstractQuotaMatcher extends GenericMatcher {
+public abstract class AbstractQuotaMatcher extends GenericMatcher {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractQuotaMatcher.class);
/**
@@ -116,8 +116,8 @@ abstract public class AbstractQuotaMatcher extends GenericMatcher {
*
* @param address the address holding the quota if applicable
* @param mail the mail involved if needed
- */
- abstract protected long getQuota(MailAddress address, Mail mail) throws MessagingException;
+ */
+ protected abstract long getQuota(MailAddress address, Mail mail) throws MessagingException;
/**
* Gets the used amount to check against the quota.
@@ -125,7 +125,7 @@ abstract public class AbstractQuotaMatcher extends GenericMatcher {
* @param address the address involved
* @param mail the mail involved if needed
*/
- abstract protected long getUsed(MailAddress address, Mail mail) throws MessagingException;
+ protected abstract long getUsed(MailAddress address, Mail mail) throws MessagingException;
/**
* Utility method that parses an amount string.
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
index b4e9aa3..a836f6b 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
@@ -58,11 +58,11 @@ public class CompareNumericHeaderValue extends GenericMatcher {
private String headerName = null;
private int comparisonOperator;
- private final static int LT = -2;
- private final static int LE = -1;
- private final static int EQ = 0;
- private final static int GE = +1;
- private final static int GT = +2;
+ private static final int LT = -2;
+ private static final int LE = -1;
+ private static final int EQ = 0;
+ private static final int GE = +1;
+ private static final int GT = +2;
private Double headerValue;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
index 6896967..ff100aa 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
@@ -44,7 +44,7 @@ import org.apache.mailet.base.GenericMatcher;
*
*/
-abstract public class GenericRegexMatcher extends GenericMatcher {
+public abstract class GenericRegexMatcher extends GenericMatcher {
protected Object[][] patterns;
public void compile(Object[][] patterns) throws PatternSyntaxException {
@@ -59,7 +59,7 @@ abstract public class GenericRegexMatcher extends GenericMatcher {
/**
* @see org.apache.mailet.GenericMatcher#GenericMatcher()
*/
- abstract public void init() throws MessagingException;
+ public abstract void init() throws MessagingException;
/**
* @see org.apache.mailet.GenericMatcher#match(Mail)
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
index 1411f17..416a214 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
@@ -179,7 +179,7 @@ public class DiscardProtocol {
/**
* Basic server.
*/
- private final static class Server implements Runnable, Record {
+ private static final class Server implements Runnable, Record {
private static final int COMPLETION_TIMEOUT = 60000;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
index 5d5dd3f..97ee6bd 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
@@ -37,7 +37,7 @@ import org.apache.james.protocols.api.future.FutureResponse;
*/
public abstract class AbstractProtocolTransport implements ProtocolTransport{
- private final static String CRLF = "\r\n";
+ private static final String CRLF = "\r\n";
// TODO: Should we limit the size ?
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
index 67859a8..0d07b76 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
@@ -37,8 +37,8 @@ public class ProtocolSessionImpl implements ProtocolSession {
private final Map<String, Object> sessionState;
private String user;
protected final ProtocolConfiguration config;
- private final static Charset CHARSET = Charset.forName("US-ASCII");
- private final static String DELIMITER = "\r\n";
+ private static final Charset CHARSET = Charset.forName("US-ASCII");
+ private static final String DELIMITER = "\r\n";
public ProtocolSessionImpl(ProtocolTransport transport, ProtocolConfiguration config) {
this.transport = transport;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 25a00b6..e9fed0a 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
@@ -36,7 +36,7 @@ public abstract class UnknownCommandHandler<S extends ProtocolSession> implement
/**
* Identifier which is used in {@link #getImplCommands()}
*/
- public final static 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/a9f462d5/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
index b2bd786..29c5bf9 100644
--- a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
+++ b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
@@ -44,7 +44,7 @@ import com.github.steveash.guavate.Guavate;
*/
public class AbstractProtocolTransportTest {
- private final static String US_ASCII = "US-ASCII";
+ private static final String US_ASCII = "US-ASCII";
@Test
public void testWriteOrder() throws InterruptedException, UnsupportedEncodingException {
@@ -207,7 +207,7 @@ public class AbstractProtocolTransportTest {
}
}
- private final static class TestResponse implements Response {
+ private static final class TestResponse implements Response {
private final String msg;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 850e70c..6f7d408 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
@@ -23,15 +23,15 @@ import java.net.ServerSocket;
public class TestUtils {
- private final static int START_PORT = 20000;
- private final static int END_PORT = 30000;
+ private static final int START_PORT = 20000;
+ private static final int END_PORT = 30000;
/**
* Return a free port which can be used to bind to
*
* @return port
*/
- public synchronized static int getFreePort() {
+ public static synchronized int getFreePort() {
for(int start = START_PORT; start <= END_PORT; start++) {
try {
ServerSocket socket = new ServerSocket(start);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
index 0d3c491..6b3e81e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
@@ -31,9 +31,9 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
public class ImapConfiguration {
- public final static boolean DEFAULT_ENABLE_IDLE = true;
- public final static long DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS = 2 * 60;
- public final static TimeUnit DEFAULT_HEARTBEAT_INTERVAL_UNIT = TimeUnit.SECONDS;
+ public static final boolean DEFAULT_ENABLE_IDLE = true;
+ public static final long DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS = 2 * 60;
+ public static final TimeUnit DEFAULT_HEARTBEAT_INTERVAL_UNIT = TimeUnit.SECONDS;
public static Builder builder() {
return new Builder();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 49bfe08..d7eb70e 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
@@ -62,7 +62,7 @@ public class CharsetUtil {
*
* @return supportedCharsetNames
*/
- public final static Set<String> getAvailableCharsetNames() {
+ public static final Set<String> getAvailableCharsetNames() {
return charsetNames;
}
@@ -71,7 +71,7 @@ public class CharsetUtil {
*
* @return supportedCharsets
*/
- public final static Set<Charset> getAvailableCharsets() {
+ public static final Set<Charset> getAvailableCharsets() {
return charsets;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
index 2e5ee3b..4741a3e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
@@ -345,7 +345,7 @@ public interface StatusResponse extends ImapResponseMessage {
return new ResponseCode(buffer.toString());
}
- public final static int NO_NUMBER = -1;
+ public static final int NO_NUMBER = -1;
private final String code;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/api/process/SearchResUtil.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/process/SearchResUtil.java b/protocols/imap/src/main/java/org/apache/james/imap/api/process/SearchResUtil.java
index aafa8cb..9931322 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/process/SearchResUtil.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/process/SearchResUtil.java
@@ -29,7 +29,7 @@ import org.apache.james.imap.api.message.IdRange;
*/
public class SearchResUtil {
- private final static String SEARCHRES_SAVED_SET = "SEARCHRES_SAVED_SET";
+ private static final String SEARCHRES_SAVED_SET = "SEARCHRES_SAVED_SET";
/**
* Return the saved sequence-set which you can refer to with $. This method will
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
index 1638b8b..d1945de 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
@@ -45,8 +45,8 @@ public class DefaultImapDecoder implements ImapDecoder {
private final int maxInvalidCommands;
- private final static String INVALID_COMMAND_COUNT = "INVALID_COMMAND_COUNT";
- public final static int DEFAULT_MAX_INVALID_COMMANDS = 9;
+ private static final String INVALID_COMMAND_COUNT = "INVALID_COMMAND_COUNT";
+ public static final int DEFAULT_MAX_INVALID_COMMANDS = 9;
public DefaultImapDecoder(StatusResponseFactory responseFactory, ImapCommandParserFactory imapCommands) {
this(responseFactory, imapCommands, DEFAULT_MAX_INVALID_COMMANDS);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
index 0a2f81b..27b4e8c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
@@ -40,6 +40,6 @@ public abstract class AbstractMessageRangeCommandParser extends AbstractUidComma
return createRequest(command, tag, useUids, idSet, mailboxName);
}
- abstract protected AbstractMessageRangeRequest createRequest(ImapCommand command, String tag, boolean useUids, IdRange[] idSet, String mailboxName);
+ protected abstract AbstractMessageRangeRequest createRequest(ImapCommand command, String tag, boolean useUids, IdRange[] idSet, String mailboxName);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 91313fc..879290e 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
@@ -33,8 +33,8 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.protocols.imap.DecodingException;
public abstract class AbstractSelectionCommandParser extends AbstractImapCommandParser{
- private final static byte[] CONDSTORE = ImapConstants.SUPPORTS_CONDSTORE.getBytes();
- private final static byte[] QRESYNC = ImapConstants.SUPPORTS_QRESYNC.getBytes();
+ private static final byte[] CONDSTORE = ImapConstants.SUPPORTS_CONDSTORE.getBytes();
+ private static final byte[] QRESYNC = ImapConstants.SUPPORTS_QRESYNC.getBytes();
public AbstractSelectionCommandParser(ImapCommand command) {
super(command);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
index 039c815..0b927c6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
@@ -38,8 +38,8 @@ import org.apache.james.protocols.imap.DecodingException;
* Parse FETCH commands
*/
public class FetchCommandParser extends AbstractUidCommandParser {
- private final static byte[] CHANGEDSINCE = "CHANGEDSINCE".getBytes();
- private final static byte[] VANISHED = "VANISHED".getBytes();
+ private static final byte[] CHANGEDSINCE = "CHANGEDSINCE".getBytes();
+ private static final byte[] VANISHED = "VANISHED".getBytes();
public FetchCommandParser() {
super(ImapCommand.selectedStateCommand(ImapConstants.FETCH_COMMAND_NAME));
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
index bbac87a..4528d81 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
@@ -36,7 +36,7 @@ import org.apache.james.protocols.imap.DecodingException;
*/
public class StoreCommandParser extends AbstractUidCommandParser {
- private final static byte[] UNCHANGEDSINCE = "UNCHANGEDSINCE".getBytes();
+ private static final byte[] UNCHANGEDSINCE = "UNCHANGEDSINCE".getBytes();
public StoreCommandParser() {
super(ImapCommand.selectedStateCommand(ImapConstants.STORE_COMMAND_NAME));
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
index 7154386..177dbec 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
@@ -32,7 +32,7 @@ import org.apache.james.imap.encode.ImapResponseComposer;
* encoded by this Implementation or should get passed to the next
* {@link ImapEncoder} in the chain
*/
-abstract public class AbstractChainedImapEncoder implements ImapEncoder {
+public abstract class AbstractChainedImapEncoder implements ImapEncoder {
private final ImapEncoder next;
@@ -73,7 +73,7 @@ abstract public class AbstractChainedImapEncoder implements ImapEncoder {
* <code>ImapMessage</code>, not null
* @return true if the given message is encodable by this encoder
*/
- abstract protected boolean isAcceptable(ImapMessage message);
+ protected abstract boolean isAcceptable(ImapMessage message);
/**
* Processes an acceptable message. Only messages passing
@@ -86,5 +86,5 @@ abstract public class AbstractChainedImapEncoder implements ImapEncoder {
* @param session
* TODO
*/
- abstract protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException;
+ protected abstract void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 9904af2..2b27631 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
@@ -44,7 +44,7 @@ public class ImapResponseComposerImpl implements ImapConstants, ImapResponseComp
public static final String FAILED = "failed.";
private static final int LOWER_CASE_OFFSET = 'a' - 'A';
- public final static int DEFAULT_BUFFER_SIZE = 2048;
+ public static final int DEFAULT_BUFFER_SIZE = 2048;
private final ImapResponseWriter writer;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
index eb5b64d..d10a2f6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
@@ -24,7 +24,7 @@ import org.apache.james.imap.api.message.request.ImapRequest;
/**
* Abstract base class for {@link ImapRequest} implementations
*/
-abstract public class AbstractImapRequest implements ImapRequest {
+public abstract class AbstractImapRequest implements ImapRequest {
private final String tag;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 56a2653..81e4c1e 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
@@ -68,7 +68,7 @@ import org.apache.james.metrics.api.TimeMetric;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-abstract public class AbstractMailboxProcessor<M extends ImapRequest> extends AbstractChainedProcessor<M> {
+public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends AbstractChainedProcessor<M> {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMailboxProcessor.class);
public static final String IMAP_PREFIX = "IMAP-";
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
index 0860d46..d76c76e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
@@ -52,13 +52,13 @@ public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRan
super(acceptableClass, next, mailboxManager, factory, metricFactory);
}
- abstract protected List<MessageRange> process(final MailboxPath targetMailbox,
- final SelectedMailbox currentMailbox,
- final MailboxSession mailboxSession,
- final MailboxManager mailboxManager,
- MessageRange messageSet) throws MailboxException;
+ protected abstract List<MessageRange> process(final MailboxPath targetMailbox,
+ final SelectedMailbox currentMailbox,
+ final MailboxSession mailboxSession,
+ final MailboxManager mailboxManager,
+ MessageRange messageSet) throws MailboxException;
- abstract protected String getOperationName();
+ protected abstract String getOperationName();
@Override
protected void doProcess(M request, ImapSession session, String tag, ImapCommand command, Responder responder) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 0d2ab3b..0ada512 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
@@ -65,7 +65,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ
final StatusResponseFactory statusResponseFactory;
private final boolean openReadOnly;
- private final static List<String> CAPS = ImmutableList.of(ImapConstants.SUPPORTS_QRESYNC, ImapConstants.SUPPORTS_CONDSTORE);
+ private static final List<String> CAPS = ImmutableList.of(ImapConstants.SUPPORTS_QRESYNC, ImapConstants.SUPPORTS_CONDSTORE);
public AbstractSelectionProcessor(Class<M> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory statusResponseFactory, boolean openReadOnly,
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 89e2531..170881f 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
@@ -49,7 +49,7 @@ import com.google.common.collect.ImmutableList;
*/
public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateRequest> implements CapabilityImplementingProcessor{
private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticateProcessor.class);
- private final static String PLAIN = "PLAIN";
+ private static final String PLAIN = "PLAIN";
public AuthenticateProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
index cb6a61c..eba6757 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
@@ -48,7 +48,7 @@ import com.google.common.collect.ImmutableList;
public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequest> implements CapabilityImplementingProcessor {
- private final static List<String> CAPS;
+ private static final List<String> CAPS;
static {
List<String> caps = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
index ac033a9..45d125e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
@@ -36,10 +36,10 @@ import org.apache.james.util.MDCBuilder;
import com.google.common.collect.ImmutableList;
public class CompressProcessor extends AbstractChainedProcessor<CompressRequest> implements CapabilityImplementingProcessor {
- private final static String ALGO = "DEFLATE";
- private final static List<String> CAPA = ImmutableList.of(ImapConstants.COMPRESS_COMMAND_NAME + "=" + ALGO);
+ private static final String ALGO = "DEFLATE";
+ private static final List<String> CAPA = ImmutableList.of(ImapConstants.COMPRESS_COMMAND_NAME + "=" + ALGO);
private final StatusResponseFactory factory;
- private final static String COMPRESSED = "COMPRESSED";
+ private static final String COMPRESSED = "COMPRESSED";
public CompressProcessor(ImapProcessor next, StatusResponseFactory factory) {
super(CompressRequest.class, next);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 4f64b8b..f69319f 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
@@ -48,9 +48,9 @@ import com.google.common.collect.ImmutableList;
public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> implements CapabilityImplementingProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(EnableProcessor.class);
- private final static List<PermitEnableCapabilityProcessor> capabilities = new ArrayList<>();
- public final static String ENABLED_CAPABILITIES = "ENABLED_CAPABILITIES";
- private final static List<String> CAPS = ImmutableList.of(SUPPORTS_ENABLE);
+ private static final List<PermitEnableCapabilityProcessor> capabilities = new ArrayList<>();
+ public static final String ENABLED_CAPABILITIES = "ENABLED_CAPABILITIES";
+ private static final List<String> CAPS = ImmutableList.of(SUPPORTS_ENABLE);
private final CapabilityProcessor capabilityProcessor;
public EnableProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, List<PermitEnableCapabilityProcessor> capabilities,
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
index c100cf2..2649d5f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
@@ -53,7 +53,7 @@ import com.google.common.collect.ImmutableList;
public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> implements CapabilityImplementingProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(ExpungeProcessor.class);
- private final static List<String> UIDPLUS = ImmutableList.of("UIDPLUS");
+ private static final List<String> UIDPLUS = ImmutableList.of("UIDPLUS");
public ExpungeProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
index 4895d7e..2a0c0d2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
@@ -56,9 +56,9 @@ import com.google.common.collect.ImmutableList;
public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> implements CapabilityImplementingProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(IdleProcessor.class);
- private final static List<String> CAPS = ImmutableList.of(SUPPORTS_IDLE);
- public final static int DEFAULT_SCHEDULED_POOL_CORE_SIZE = 5;
- private final static String DONE = "DONE";
+ private static final List<String> CAPS = ImmutableList.of(SUPPORTS_IDLE);
+ public static final int DEFAULT_SCHEDULED_POOL_CORE_SIZE = 5;
+ private static final String DONE = "DONE";
private TimeUnit heartbeatIntervalUnit;
private long heartbeatInterval;
private boolean enableIdle;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 3011bda..160aa03 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
@@ -40,7 +40,7 @@ import com.google.common.collect.ImmutableList;
*/
public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implements CapabilityImplementingProcessor{
- private final static List<String> LOGINDISABLED_CAPS = ImmutableList.of("LOGINDISABLED");
+ private static final List<String> LOGINDISABLED_CAPS = ImmutableList.of("LOGINDISABLED");
public LoginProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
super(LoginRequest.class, next, mailboxManager, factory, metricFactory);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
index fecabd3..2da6173 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
@@ -43,7 +43,7 @@ import org.apache.james.util.MDCBuilder;
* Processes a NAMESPACE command into a suitable set of responses.
*/
public class NamespaceProcessor extends AbstractMailboxProcessor<NamespaceRequest> implements CapabilityImplementingProcessor {
- private final static List<String> CAPS = Collections.unmodifiableList(Arrays.asList(SUPPORTS_NAMESPACES));
+ private static final List<String> CAPS = Collections.unmodifiableList(Arrays.asList(SUPPORTS_NAMESPACES));
public NamespaceProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 d5d1a52..e22b747 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
@@ -72,8 +72,8 @@ import com.google.common.collect.ImmutableList;
public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> implements CapabilityImplementingProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(SearchProcessor.class);
- protected final static String SEARCH_MODSEQ = "SEARCH_MODSEQ";
- private final static List<String> CAPS = ImmutableList.of("WITHIN", "ESEARCH", "SEARCHRES");
+ protected static final String SEARCH_MODSEQ = "SEARCH_MODSEQ";
+ private static final List<String> CAPS = ImmutableList.of("WITHIN", "ESEARCH", "SEARCHRES");
public SearchProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
index a89b665..5d9f1f4 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
@@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableList;
* Processing STARTLS commands
*/
public class StartTLSProcessor extends AbstractChainedProcessor<StartTLSRequest> implements CapabilityImplementingProcessor {
- private final static List<String> STARTTLS_CAP = ImmutableList.of(ImapConstants.SUPPORTS_STARTTLS);
+ private static final List<String> STARTTLS_CAP = ImmutableList.of(ImapConstants.SUPPORTS_STARTTLS);
private final StatusResponseFactory factory;
public StartTLSProcessor(ImapProcessor next, StatusResponseFactory factory) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 339fa37..ec4a559 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
@@ -67,7 +67,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
/**
* The {@link ImapCommand} which should be used for the response if some CONDSTORE option is used
*/
- private final static ImapCommand CONDSTORE_COMMAND = ImapCommand.selectedStateCommand("Conditional STORE");
+ private static final ImapCommand CONDSTORE_COMMAND = ImapCommand.selectedStateCommand("Conditional STORE");
public StoreProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
index f392ea5..6d99d46 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
@@ -40,7 +40,7 @@ import org.apache.james.util.MDCBuilder;
*/
public class UnselectProcessor extends AbstractMailboxProcessor<UnselectRequest> implements CapabilityImplementingProcessor {
- private final static List<String> UNSELECT = Collections.unmodifiableList(Arrays.asList("UNSELECT"));
+ private static final List<String> UNSELECT = Collections.unmodifiableList(Arrays.asList("UNSELECT"));
public UnselectProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
index 6ec007c..df4322a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
@@ -45,7 +45,7 @@ import com.google.common.collect.ImmutableList;
*/
public class XListProcessor extends ListProcessor implements CapabilityImplementingProcessor {
- private final static List<String> XLIST_CAPS = ImmutableList.of(SUPPORTS_XLIST);
+ private static final List<String> XLIST_CAPS = ImmutableList.of(SUPPORTS_XLIST);
private final MailboxTyper mailboxTyper;
// some interface
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
index eed48c1..2efb535 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
-abstract public class AbstractChainedProcessor<M extends ImapMessage> implements ImapProcessor {
+public abstract class AbstractChainedProcessor<M extends ImapMessage> implements ImapProcessor {
public static final Logger LOGGER = LoggerFactory.getLogger(AbstractChainedProcessor.class);
private final ImapProcessor next;
@@ -102,10 +102,10 @@ abstract public class AbstractChainedProcessor<M extends ImapMessage> implements
* @param session
* <code>ImapSession</code>, not null
*/
- abstract protected void doProcess(M acceptableMessage, Responder responder, ImapSession session);
+ protected abstract void doProcess(M acceptableMessage, Responder responder, ImapSession session);
/**
* Add request specific information to the MDC, for contextual logging
*/
- abstract protected Closeable addContextToMDC(M message);
+ protected abstract Closeable addContextToMDC(M message);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 0d20160..329bd23 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
@@ -233,7 +233,7 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{
* @return true if any flag changes from current session will be ignored,
* false otherwise
*/
- public synchronized final boolean isSilentFlagChanges() {
+ public final synchronized boolean isSilentFlagChanges() {
return silentFlagChanges;
}
@@ -244,7 +244,7 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{
* true if any flag changes from current session should be
* ignored, false otherwise
*/
- public synchronized final void setSilentFlagChanges(boolean silentFlagChanges) {
+ public final synchronized void setSilentFlagChanges(boolean silentFlagChanges) {
this.silentFlagChanges = silentFlagChanges;
}
@@ -253,8 +253,8 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{
*
* @return true if new messages have been added, false otherwise
*/
-
- public synchronized final boolean isSizeChanged() {
+
+ public final synchronized boolean isSizeChanged() {
return sizeChanged;
}
@@ -264,8 +264,8 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{
* @return true when the mailbox has been deleted by another session, false
* otherwise
*/
-
- public synchronized final boolean isDeletedByOtherSession() {
+
+ public final synchronized boolean isDeletedByOtherSession() {
return isDeletedByOtherSession;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 073f847..78b6cba 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
@@ -35,7 +35,7 @@ import org.apache.james.protocols.imap.IMAPSession;
public class IMAPCommandDispatcher extends CommandDispatcher<IMAPSession>{
- private final static Pattern LITERAL_PATTERN = Pattern.compile(".*\\{(\\d+)\\}.*");
+ private static final Pattern LITERAL_PATTERN = Pattern.compile(".*\\{(\\d+)\\}.*");
@Override
protected Request parseRequest(IMAPSession session, ByteBuffer buffer) throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java b/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
index 4d91518..c2ea59b 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
@@ -30,7 +30,7 @@ import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.junit.Before;
import org.junit.Test;
-abstract public class AbstractTestForStatusResponseFactory {
+public abstract class AbstractTestForStatusResponseFactory {
private static final String TAG = "ATAG";
@@ -44,7 +44,7 @@ abstract public class AbstractTestForStatusResponseFactory {
StatusResponseFactory factory;
- abstract protected StatusResponseFactory createInstance();
+ protected abstract StatusResponseFactory createInstance();
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/WelcomeMessageHandler.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/WelcomeMessageHandler.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/WelcomeMessageHandler.java
index 26a1145..c0ffb73 100644
--- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/WelcomeMessageHandler.java
+++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/WelcomeMessageHandler.java
@@ -28,7 +28,7 @@ import org.apache.james.protocols.smtp.SMTPSession;
*/
public class WelcomeMessageHandler extends org.apache.james.protocols.smtp.core.WelcomeMessageHandler {
- private final static String SERVICE_TYPE = "LMTP";
+ private static final String SERVICE_TYPE = "LMTP";
@Override
protected String getServiceType(SMTPSession session) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 a09e665..f75d542 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
@@ -35,7 +35,7 @@ import org.jboss.netty.util.HashedWheelTimer;
*
*/
public abstract class AbstractChannelPipelineFactory implements ChannelPipelineFactory, ExternalResourceReleasable{
- public final static int MAX_LINE_LENGTH = 8192;
+ public static final int MAX_LINE_LENGTH = 8192;
protected final ConnectionLimitUpstreamHandler connectionLimitHandler;
protected final ConnectionPerIpLimitUpstreamHandler connectionPerIpLimitHandler;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 510bb1e..914b778 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
@@ -31,15 +31,15 @@ import org.apache.james.protocols.api.Response;
public class POP3Response extends AbstractResponse {
/** OK response. Requested content will follow */
- public final static String OK_RESPONSE = "+OK";
+ public static final String OK_RESPONSE = "+OK";
/**
* Error response. Requested content will not be provided. This prefix is
* followed by a more detailed error message.
*/
- public final static String ERR_RESPONSE = "-ERR";
+ public static final String ERR_RESPONSE = "-ERR";
- public final static String WS = " ";
+ public static final String WS = " ";
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java
index 624a659..1704f57 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java
@@ -99,7 +99,7 @@ public abstract class AbstractAddHeadersFilter extends SeparatingDataLineFilter{
*/
protected abstract Collection<Header> headers(SMTPSession session);
- public final static class Header {
+ public static final class Header {
public static final String MULTI_LINE_PREFIX = " ";
public final String name;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
index 485cb21..f8e03b2 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
@@ -115,7 +115,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
}
}
- public final static String MAILENV = "MAILENV";
+ public static final String MAILENV = "MAILENV";
private final MetricFactory metricFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
index 8deb4e0..52966c2 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
@@ -33,7 +33,7 @@ import org.apache.james.protocols.smtp.SMTPSession;
*/
public class WelcomeMessageHandler implements ConnectHandler<SMTPSession> {
- private final static String SERVICE_TYPE = "SMTP";
+ private static final String SERVICE_TYPE = "SMTP";
/**
* @see org.apache.james.protocols.api.handler.ConnectHandler#onConnect(org.apache.james.protocols.api.ProtocolSession)
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index acacc70..9fc16d9 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -121,12 +121,12 @@ public class AuthCmdHandler
/**
* The text string for the SMTP AUTH type PLAIN.
*/
- protected final static String AUTH_TYPE_PLAIN = "PLAIN";
+ protected static final String AUTH_TYPE_PLAIN = "PLAIN";
/**
* The text string for the SMTP AUTH type LOGIN.
*/
- protected final static String AUTH_TYPE_LOGIN = "LOGIN";
+ protected static final String AUTH_TYPE_LOGIN = "LOGIN";
/**
* The AuthHooks
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
index 4e8a964..0902edb 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
@@ -48,10 +48,10 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme
/**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "EHLO";
- private final static Collection<String> COMMANDS = ImmutableSet.of(COMMAND_NAME);
+ private static final String COMMAND_NAME = "EHLO";
+ private static final Collection<String> COMMANDS = ImmutableSet.of(COMMAND_NAME);
// see http://issues.apache.org/jira/browse/JAMES-419
- private final static List<String> ESMTP_FEATURES = ImmutableList.of("PIPELINING", "ENHANCEDSTATUSCODES", "8BITMIME");
+ private static final List<String> ESMTP_FEATURES = ImmutableList.of("PIPELINING", "ENHANCEDSTATUSCODES", "8BITMIME");
private static final Response DOMAIN_ADDRESS_REQUIRED = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) + " Domain address required: " + COMMAND_NAME).immutable();
private List<EhloExtension> ehloExtensions;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
index 0158422..614d471 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
@@ -49,9 +49,9 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
private static final Logger LOGGER = LoggerFactory.getLogger(MailSizeEsmtpExtension.class);
- private final static String MESG_SIZE = "MESG_SIZE"; // The size of the
- private final static String MESG_FAILED = "MESG_FAILED"; // Message failed flag
- private final static String[] MAIL_PARAMS = { "SIZE" };
+ private static final String MESG_SIZE = "MESG_SIZE"; // The size of the
+ private static final String MESG_FAILED = "MESG_FAILED"; // Message failed flag
+ private static final String[] MAIL_PARAMS = { "SIZE" };
private static final HookResult SYNTAX_ERROR = new HookResult(HookReturnCode.DENY, SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) + " Syntactically incorrect value for SIZE parameter");
private static final HookResult QUOTA_EXCEEDED = new HookResult(HookReturnCode.DENY, SMTPRetCode.QUOTA_EXCEEDED, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.SYSTEM_MSG_TOO_BIG) + " Message size exceeds fixed maximum message size");
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
index 5fb3964..2878d0c 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
@@ -44,9 +44,9 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte
/**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "STARTTLS";
- private final static Collection<String> COMMANDS = ImmutableSet.of(COMMAND_NAME);
- private final static List<String> FEATURES = ImmutableList.of(COMMAND_NAME);
+ private static final String COMMAND_NAME = "STARTTLS";
+ private static final Collection<String> COMMANDS = ImmutableSet.of(COMMAND_NAME);
+ private static final List<String> FEATURES = ImmutableList.of(COMMAND_NAME);
private static final Response TLS_ALREADY_ACTIVE = new SMTPResponse("500", DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD) + " TLS already active RFC2487 5.2").immutable();
private static final Response READY_FOR_STARTTLS = new SMTPStartTlsResponse("220", DSNStatus.getStatus(DSNStatus.SUCCESS, DSNStatus.UNDEFINED_STATUS) + " Ready to start TLS").immutable();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
index f182b7d..2c70cd0 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
@@ -20,8 +20,8 @@
package org.apache.james.protocols.smtp.core.fastfail;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.api.ProtocolSession.State;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -35,21 +35,21 @@ import org.apache.james.protocols.smtp.hook.UnknownHook;
*/
public class MaxUnknownCmdHandler implements UnknownHook{
- public final static int DEFAULT_MAX_UNKOWN = 5;
+ public static final int DEFAULT_MAX_UNKOWN = 5;
- private final static String UNKOWN_COMMAND_COUNT = "UNKNOWN_COMMAND_COUNT";
- private int maxUnknown = DEFAULT_MAX_UNKOWN;
-
- @Override
- public void init(Configuration config) throws ConfigurationException {
-
- }
-
- @Override
- public void destroy() {
-
- }
-
+ private static final String UNKOWN_COMMAND_COUNT = "UNKNOWN_COMMAND_COUNT";
+ private int maxUnknown = DEFAULT_MAX_UNKOWN;
+
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public void setMaxUnknownCmdCount(int maxUnknown) {
this.maxUnknown = maxUnknown;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
index 5450773..ce2354b 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
@@ -40,7 +40,7 @@ import org.apache.james.protocols.smtp.hook.RcptHook;
*/
public class ResolvableEhloHeloHandler implements RcptHook, HeloHook {
- public final static String BAD_EHLO_HELO = "BAD_EHLO_HELO";
+ public static final String BAD_EHLO_HELO = "BAD_EHLO_HELO";
@Override
public void init(Configuration config) throws ConfigurationException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java
index 76558c5..a11bc37 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java
@@ -23,9 +23,9 @@
package org.apache.james.protocols.smtp.hook;
public class HookReturnCode {
- public final static int OK = 0x1;
- public final static int DENY = 0x1 << 1;
- public final static int DENYSOFT = 0x1 << 2;
- public final static int DECLINED = 0x1 << 3;
- public final static int DISCONNECT = 0x1 << 4;
+ public static final int OK = 0x1;
+ public static final int DENY = 0x1 << 1;
+ public static final int DENYSOFT = 0x1 << 2;
+ public static final int DECLINED = 0x1 << 3;
+ public static final int DISCONNECT = 0x1 << 4;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
index ad774b1..5be6f4e 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
@@ -60,10 +60,10 @@ import com.google.common.io.CharStreams;
public abstract class AbstractSMTPServerTest {
- protected final static String MSG1 = "Subject: Testmessage\r\n\r\nThis is a message\r\n";
- protected final static String SENDER = "me@sender";
- protected final static String RCPT1 ="rpct1@domain";
- protected final static String RCPT2 ="rpct2@domain";
+ protected static final String MSG1 = "Subject: Testmessage\r\n\r\nThis is a message\r\n";
+ protected static final String SENDER = "me@sender";
+ protected static final String RCPT1 ="rpct1@domain";
+ protected static final String RCPT2 ="rpct2@domain";
@Test
public void testSimpleDelivery() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
index e5cee47..8d6193a 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
@@ -37,9 +37,9 @@ import org.junit.Test;
public class ResolvableEhloHeloHandlerTest {
- public final static String INVALID_HOST = "foo.bar";
+ public static final String INVALID_HOST = "foo.bar";
- public final static String VALID_HOST = "james.apache.org";
+ public static final String VALID_HOST = "james.apache.org";
private SMTPSession setupMockSession(String argument,
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
index 5a92492..70cd71b 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
@@ -40,9 +40,9 @@ import org.apache.james.mailbox.store.probe.MailboxProbe;
public class JmxMailboxProbe implements MailboxProbe, JmxProbe {
- private final static String MAILBOXCOPIER_OBJECT_NAME = "org.apache.james:type=component,name=mailboxcopier";
- private final static String MAILBOXMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=mailboxmanagerbean";
- private final static String REINDEXER_OBJECT_NAME = "org.apache.james:type=component,name=reindexerbean";
+ private static final String MAILBOXCOPIER_OBJECT_NAME = "org.apache.james:type=component,name=mailboxcopier";
+ private static final String MAILBOXMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=mailboxmanagerbean";
+ private static final String REINDEXER_OBJECT_NAME = "org.apache.james:type=component,name=reindexerbean";
private MailboxCopierManagementMBean mailboxCopierManagement;
private MailboxManagerManagementMBean mailboxManagerManagement;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
index 48191bb..05d35b2 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
@@ -29,7 +29,7 @@ import org.apache.james.mailbox.store.mail.model.SerializableQuota;
import org.apache.james.mailbox.store.probe.QuotaProbe;
public class JmxQuotaProbe implements QuotaProbe, JmxProbe {
- private final static String QUOTAMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=quotamanagerbean";
+ private static final String QUOTAMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=quotamanagerbean";
private QuotaManagementMBean quotaManagement;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
index 2e5529d..3aea481 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
@@ -28,7 +28,7 @@ import org.apache.james.sieverepository.api.SieveRepositoryManagementMBean;
public class JmxSieveProbe implements SieveProbe, JmxProbe {
- private final static String SIEVEMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=sievemanagerbean";
+ private static final String SIEVEMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=sievemanagerbean";
private SieveRepositoryManagementMBean sieveRepositoryManagement;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org