JAMES-2277 reorder modifiers
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a9f462d5 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a9f462d5 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a9f462d5 Branch: refs/heads/master Commit: a9f462d5d84fc58007cf8e9a8d041fd6a06e8fb2 Parents: fb8d627 Author: Matthieu Baechler <[email protected]> Authored: Fri Dec 22 16:20:56 2017 +0100 Committer: Matthieu Baechler <[email protected]> Committed: Tue Jan 9 15:16:02 2018 +0100 ---------------------------------------------------------------------- .../backends/cassandra/init/ClusterBuilder.java | 2 +- .../init/ClusterWithKeyspaceCreatedFactory.java | 2 +- .../SessionWithInitializedTablesFactory.java | 2 +- .../utils/FunctionRunnerWithRetryTest.java | 2 +- .../java/org/apache/james/core/MailAddress.java | 2 +- .../apache/james/mailbox/model/SearchQuery.java | 2 +- .../AbstractSubscriptionManagerTest.java | 6 +- .../james/mailbox/MailboxManagerStressTest.java | 2 +- .../james/mailbox/MailboxManagerTest.java | 4 +- .../james/mailbox/mock/MockMailboxSession.java | 2 +- .../CassandraMailboxSessionMapperFactory.java | 2 +- ...lasticSearchListeningMessageSearchIndex.java | 4 +- .../HBaseMailboxSessionMapperFactoryTest.java | 2 +- .../mailbox/jcr/AbstractJCRScalingMapper.java | 4 +- .../jcr/JCRMailboxSessionMapperFactory.java | 2 +- .../jcr/MailboxSessionJCRRepository.java | 2 +- .../mailbox/jcr/mail/JCRMessageMapper.java | 12 +- .../mailbox/jcr/mail/model/JCRMailbox.java | 12 +- .../jcr/mail/model/JCRMailboxMessage.java | 36 +++--- .../mailbox/jcr/mail/model/JCRProperty.java | 8 +- .../mailbox/jcr/user/model/JCRSubscription.java | 4 +- .../search/LenientImapSearchAnalyzer.java | 2 +- .../lucene/search/LuceneMessageSearchIndex.java | 126 +++++++++---------- .../mailbox/maildir/MaildirMessageName.java | 2 +- .../maildir/mail/MaildirMessageMapper.java | 2 +- .../store/MailboxSessionMapperFactory.java | 10 +- .../james/mailbox/store/MimeDescriptorImpl.java | 2 +- .../store/RandomMailboxSessionIdGenerator.java | 2 +- .../james/mailbox/store/ResultHeader.java | 2 +- .../mailbox/store/StoreMailboxManager.java | 2 +- .../mailbox/store/StoreMessageManager.java | 2 +- .../BroadcastDelegatingMailboxListener.java | 2 +- .../store/json/event/MailboxConverter.java | 2 +- .../james/mailbox/store/quota/QuotaImpl.java | 2 +- .../james/mailbox/store/search/SearchUtil.java | 22 ++-- .../comparator/AbstractHeaderComparator.java | 6 +- .../comparator/BaseSubjectComparator.java | 4 +- .../comparator/HeaderDisplayComparator.java | 4 +- .../comparator/HeaderMailboxComparator.java | 6 +- .../comparator/InternalDateComparator.java | 2 +- .../search/comparator/SentDateComparator.java | 2 +- .../store/search/comparator/SizeComparator.java | 2 +- .../store/search/comparator/UidComparator.java | 2 +- .../store/streaming/CountingInputStream.java | 2 +- .../store/mail/model/MailboxAssertTests.java | 4 +- .../store/mail/model/MailboxMapperACLTest.java | 2 +- .../store/mail/model/MailboxMapperTest.java | 6 +- .../store/mail/model/MessageIdMapperTest.java | 4 +- .../store/mail/model/MessageMapperTest.java | 2 +- .../store/mail/model/MessageMoveTest.java | 2 +- .../james/mailbox/copier/MailboxCopierImpl.java | 2 +- .../james/ai/classic/BayesianAnalyzer.java | 6 +- .../james/ai/classic/JDBCBayesianAnalyzer.java | 2 +- .../apache/james/ai/classic/SqlResources.java | 2 +- .../org/apache/mailet/base/RFC2822Headers.java | 48 +++---- .../base/mail/AbstractDataContentHandler.java | 4 +- .../james/transport/mailets/ClassifyBounce.java | 8 +- .../james/transport/mailets/UnwrapText.java | 2 +- .../matchers/AbstractQuotaMatcher.java | 8 +- .../matchers/CompareNumericHeaderValue.java | 10 +- .../transport/matchers/GenericRegexMatcher.java | 4 +- .../org/apache/james/mpt/DiscardProtocol.java | 2 +- .../api/AbstractProtocolTransport.java | 2 +- .../protocols/api/ProtocolSessionImpl.java | 4 +- .../api/handler/UnknownCommandHandler.java | 2 +- .../api/AbstractProtocolTransportTest.java | 4 +- .../james/protocols/api/utils/TestUtils.java | 6 +- .../james/imap/api/ImapConfiguration.java | 6 +- .../james/imap/api/display/CharsetUtil.java | 4 +- .../api/message/response/StatusResponse.java | 2 +- .../james/imap/api/process/SearchResUtil.java | 2 +- .../imap/decode/main/DefaultImapDecoder.java | 4 +- .../AbstractMessageRangeCommandParser.java | 2 +- .../parser/AbstractSelectionCommandParser.java | 4 +- .../imap/decode/parser/FetchCommandParser.java | 4 +- .../imap/decode/parser/StoreCommandParser.java | 2 +- .../encode/base/AbstractChainedImapEncoder.java | 6 +- .../encode/base/ImapResponseComposerImpl.java | 2 +- .../message/request/AbstractImapRequest.java | 2 +- .../processor/AbstractMailboxProcessor.java | 2 +- .../AbstractMessageRangeProcessor.java | 12 +- .../processor/AbstractSelectionProcessor.java | 2 +- .../imap/processor/AuthenticateProcessor.java | 2 +- .../imap/processor/CapabilityProcessor.java | 2 +- .../james/imap/processor/CompressProcessor.java | 6 +- .../james/imap/processor/EnableProcessor.java | 6 +- .../james/imap/processor/ExpungeProcessor.java | 2 +- .../james/imap/processor/IdleProcessor.java | 6 +- .../james/imap/processor/LoginProcessor.java | 2 +- .../imap/processor/NamespaceProcessor.java | 2 +- .../james/imap/processor/SearchProcessor.java | 4 +- .../james/imap/processor/StartTLSProcessor.java | 2 +- .../james/imap/processor/StoreProcessor.java | 2 +- .../james/imap/processor/UnselectProcessor.java | 2 +- .../james/imap/processor/XListProcessor.java | 2 +- .../base/AbstractChainedProcessor.java | 6 +- .../processor/base/SelectedMailboxImpl.java | 12 +- .../imap/core/IMAPCommandDispatcher.java | 2 +- .../AbstractTestForStatusResponseFactory.java | 4 +- .../lmtp/core/WelcomeMessageHandler.java | 2 +- .../netty/AbstractChannelPipelineFactory.java | 2 +- .../james/protocols/pop3/POP3Response.java | 6 +- .../smtp/core/AbstractAddHeadersFilter.java | 2 +- .../protocols/smtp/core/DataCmdHandler.java | 2 +- .../smtp/core/WelcomeMessageHandler.java | 2 +- .../smtp/core/esmtp/AuthCmdHandler.java | 4 +- .../smtp/core/esmtp/EhloCmdHandler.java | 6 +- .../smtp/core/esmtp/MailSizeEsmtpExtension.java | 6 +- .../smtp/core/esmtp/StartTlsCmdHandler.java | 6 +- .../core/fastfail/MaxUnknownCmdHandler.java | 32 ++--- .../fastfail/ResolvableEhloHeloHandler.java | 2 +- .../protocols/smtp/hook/HookReturnCode.java | 10 +- .../protocols/smtp/AbstractSMTPServerTest.java | 8 +- .../fastfail/ResolvableEhloHeloHandlerTest.java | 4 +- .../james/cli/probe/impl/JmxMailboxProbe.java | 6 +- .../james/cli/probe/impl/JmxQuotaProbe.java | 2 +- .../james/cli/probe/impl/JmxSieveProbe.java | 2 +- .../server/core/InternetHeadersInputStream.java | 2 +- .../core/MimeMessageInputStreamSource.java | 4 +- .../james/server/core/MimeMessageWrapper.java | 2 +- .../james/modules/server/JMXServerModule.java | 4 +- .../context/JamesServerApplicationContext.java | 2 +- .../spring/lifecycle/LogProviderImpl.java | 2 +- ...AbstractOSGIAnnotationBeanPostProcessor.java | 2 +- .../james/util/bayesian/BayesianAnalyzer.java | 6 +- .../util/bayesian/JDBCBayesianAnalyzer.java | 2 +- .../james/util/retry/ExceptionRetryHandler.java | 4 +- .../util/retry/naming/LoggingRetryHandler.java | 2 +- .../naming/NamingExceptionRetryHandler.java | 2 +- .../util/retry/naming/RetryingContext.java | 4 +- .../naming/directory/RetryingDirContext.java | 2 +- .../retry/naming/ldap/RetryingLdapContext.java | 2 +- .../james/util/scanner/SpamAssassinInvoker.java | 4 +- .../org/apache/james/util/sql/SqlResources.java | 2 +- .../file/SieveFileRepository.java | 4 +- .../mailrepository/jcr/JCRMailRepository.java | 2 +- .../rrt/lib/RecipientRewriteTableUtil.java | 4 +- .../lib/AbstractRecipientRewriteTableTest.java | 8 +- .../mailets/AbstractRecipientRewriteTable.java | 2 +- .../org/apache/james/transport/mailets/SPF.java | 4 +- .../transport/mailets/jsieve/ActionUtils.java | 2 +- .../EnhancedMessagingException.java | 2 +- .../RemoteDeliveryConfiguration.java | 2 +- .../matchers/AbstractStorageQuota.java | 2 +- .../matchers/InSpammerBlacklistTest.java | 4 +- .../org/apache/james/fetchmail/FetchMail.java | 4 +- .../james/fetchmail/MessageProcessor.java | 2 +- .../james/fetchmail/ProcessorAbstract.java | 4 +- .../org/apache/james/jmap/model/Keyword.java | 28 ++--- .../jmap/methods/GetMessagesMethodTest.java | 2 +- .../apache/james/jmap/model/KeywordTest.java | 4 +- .../jmap/model/UpdateMessagePatchTest.java | 2 +- .../jmap/utils/FilterToSearchQueryTest.java | 2 +- .../james/imapserver/netty/IMAPServer.java | 8 +- .../netty/ImapRequestFrameDecoder.java | 8 +- .../netty/NettyImapRequestLineReader.java | 2 +- .../apache/james/protocols/lib/PortUtil.java | 2 +- .../ManageSieveChannelUpstreamHandler.java | 2 +- .../netty/ManageSieveServer.java | 18 +-- .../pop3server/core/CoreCmdHandlerLoader.java | 36 +++--- .../pop3server/mailbox/MailboxAdapter.java | 10 +- .../smtpserver/JamesWelcomeMessageHandler.java | 2 +- .../org/apache/james/smtpserver/TLDLookup.java | 22 ++-- .../james/smtpserver/fastfail/SPFHandler.java | 4 +- .../smtpserver/fastfail/URIRBLHandler.java | 4 +- .../james/smtpserver/fastfail/URIScanner.java | 104 +++++++-------- .../james/smtpserver/netty/SMTPServer.java | 6 +- .../smtpserver/SpamAssassinHandlerTest.java | 2 +- .../james/smtpserver/ValidRcptHandlerTest.java | 10 +- .../james/smtpserver/ValidRcptMXTest.java | 6 +- .../queue/activemq/FileSystemBlobStrategy.java | 2 +- .../activemq/ActiveMQMailQueueBlobTest.java | 2 +- .../apache/james/queue/file/FileMailQueue.java | 12 +- .../apache/james/queue/jms/JMSMailQueue.java | 2 +- .../queue/library/AbstractMailQueueFactory.java | 2 +- .../queue/jms/AbstractJMSMailQueueTest.java | 2 +- .../java/org/apache/james/utils/MockSpamd.java | 6 +- 177 files changed, 545 insertions(+), 545 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java index 0e23f7a..1bcfe0d 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java @@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableList; public class ClusterBuilder { private static final Logger LOGGER = LoggerFactory.getLogger(ClusterBuilder.class); - private final static String DEFAULT_CLUSTER_IP = "localhost"; + private static final String DEFAULT_CLUSTER_IP = "localhost"; public static final int DEFAULT_CASSANDRA_PORT = 9042; public static ClusterBuilder builder() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterWithKeyspaceCreatedFactory.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterWithKeyspaceCreatedFactory.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterWithKeyspaceCreatedFactory.java index 5266c35..df03815 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterWithKeyspaceCreatedFactory.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterWithKeyspaceCreatedFactory.java @@ -24,7 +24,7 @@ import com.datastax.driver.core.Session; public class ClusterWithKeyspaceCreatedFactory { - private final static int DEFAULT_REPLICATION_FACTOR = 1; + private static final int DEFAULT_REPLICATION_FACTOR = 1; public static Configuration config(Cluster cluster, String keyspace) { return new Configuration(cluster, keyspace); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java index 5fa74f5..96d6fe1 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java @@ -33,7 +33,7 @@ import com.datastax.driver.core.Session; @Singleton public class SessionWithInitializedTablesFactory implements Provider<Session> { - private final static String DEFAULT_KEYSPACE_NAME = "apache_james"; + private static final String DEFAULT_KEYSPACE_NAME = "apache_james"; private final CassandraModule module; private final Session session; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/FunctionRunnerWithRetryTest.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/FunctionRunnerWithRetryTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/FunctionRunnerWithRetryTest.java index a2ae9a4..7fe5813 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/FunctionRunnerWithRetryTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/FunctionRunnerWithRetryTest.java @@ -30,7 +30,7 @@ import org.junit.Test; public class FunctionRunnerWithRetryTest { - private final static int MAX_RETRY = 10; + private static final int MAX_RETRY = 10; @Test(expected = IllegalArgumentException.class) public void functionRunnerWithInvalidMaxRetryShouldFail() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/core/src/main/java/org/apache/james/core/MailAddress.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/james/core/MailAddress.java b/core/src/main/java/org/apache/james/core/MailAddress.java index 54a0f49..c177b26 100644 --- a/core/src/main/java/org/apache/james/core/MailAddress.java +++ b/core/src/main/java/org/apache/james/core/MailAddress.java @@ -70,7 +70,7 @@ public class MailAddress implements java.io.Serializable { */ public static final long serialVersionUID = 2779163542539434916L; - private final static char[] SPECIAL = + private static final char[] SPECIAL = {'<', '>', '(', ')', '[', ']', '\\', '.', ',', ';', ':', '@', '\"'}; private static final MailAddress NULL_SENDER = new MailAddress() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java index d3c25af..2c5463c 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java @@ -991,7 +991,7 @@ public class SearchQuery implements Serializable { /** * Marker superclass for criteria. */ - public static abstract class Criterion implements Serializable { + public abstract static class Criterion implements Serializable { private static final long serialVersionUID = 1L; } http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java index a34c6c1..e6da4fc 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java @@ -31,9 +31,9 @@ import org.junit.Test; */ public abstract class AbstractSubscriptionManagerTest { - private final static String USER1 = "test"; - private final static String MAILBOX1 = "test1"; - private final static String MAILBOX2 = "test2"; + private static final String USER1 = "test"; + private static final String MAILBOX1 = "test1"; + private static final String MAILBOX2 = "test2"; private SubscriptionManager manager; private MailboxSession session; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java index 0e6a5b5..941d7a6 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableSet; public abstract class MailboxManagerStressTest { - private final static int APPEND_OPERATIONS = 200; + private static final int APPEND_OPERATIONS = 200; private MailboxManager mailboxManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java index 69298c7..b9c4726 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java @@ -64,8 +64,8 @@ import com.google.common.collect.ImmutableSet; */ public abstract class MailboxManagerTest { - public final static String USER_1 = "USER_1"; - public final static String USER_2 = "USER_2"; + public static final String USER_1 = "USER_1"; + public static final String USER_2 = "USER_2"; private static final int DEFAULT_MAXIMUM_LIMIT = 256; private static final MailboxAnnotationKey PRIVATE_KEY = new MailboxAnnotationKey("/private/comment"); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java index 89b41dc..ae362cc 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java @@ -31,7 +31,7 @@ import org.apache.james.mailbox.MailboxSession; public class MockMailboxSession implements MailboxSession { private final User user; private final Map<Object, Object> attrs = new HashMap<>(); - private final static Random RANDOM = new Random(); + private static final Random RANDOM = new Random(); private final long sessionId; private final SessionType type; private boolean open; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java index 78e2daf..47b8bf1 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java @@ -67,7 +67,7 @@ import com.datastax.driver.core.Session; * Cassandra implementation of {@link MailboxSessionMapperFactory} */ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFactory implements AttachmentMapperFactory { - protected final static String ATTACHMENTMAPPER = "ATTACHMENTMAPPER"; + protected static final String ATTACHMENTMAPPER = "ATTACHMENTMAPPER"; private final Session session; private final CassandraUidProvider uidProvider; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java index bcf1ba5..fb378ee 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java @@ -56,8 +56,8 @@ import com.google.common.collect.ImmutableList; public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSearchIndex { - private final static Logger LOGGER = LoggerFactory.getLogger(ElasticSearchListeningMessageSearchIndex.class); - private final static String ID_SEPARATOR = ":"; + private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchListeningMessageSearchIndex.class); + private static final String ID_SEPARATOR = ":"; private final ElasticSearchIndexer indexer; private final ElasticSearchSearcher searcher; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactoryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactoryTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactoryTest.java index 01272b1..0733577 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactoryTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactoryTest.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; */ public class HBaseMailboxSessionMapperFactoryTest { - private final static Logger LOG = LoggerFactory.getLogger(HBaseMailboxSessionMapperFactoryTest.class); + private static final Logger LOG = LoggerFactory.getLogger(HBaseMailboxSessionMapperFactoryTest.class); private static final HBaseClusterSingleton CLUSTER = HBaseClusterSingleton.build(); private static Configuration conf; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java index f47665e..8d12404 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java @@ -34,13 +34,13 @@ import org.apache.james.mailbox.store.transaction.TransactionalMapper; * */ public abstract class AbstractJCRScalingMapper extends TransactionalMapper implements JCRImapConstants { - public final static String MAILBOXES_PATH = "mailboxes"; + public static final String MAILBOXES_PATH = "mailboxes"; private final MailboxSessionJCRRepository repository; private final int scaling; private final MailboxSession mSession; - private final static char PAD ='_'; + private static final char PAD ='_'; public AbstractJCRScalingMapper(MailboxSessionJCRRepository repository, MailboxSession mSession, int scaling) { this.scaling = scaling; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java index 41ee0f8..7c56c93 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java @@ -42,7 +42,7 @@ import org.apache.james.mailbox.store.user.SubscriptionMapper; public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory { private final MailboxSessionJCRRepository repository; - private final static int DEFAULT_SCALING = 2; + private static final int DEFAULT_SCALING = 2; private final int scaling; private final int messageScaling; private final UidProvider uidProvider; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/MailboxSessionJCRRepository.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/MailboxSessionJCRRepository.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/MailboxSessionJCRRepository.java index de1127d..2ca1f71 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/MailboxSessionJCRRepository.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/MailboxSessionJCRRepository.java @@ -32,7 +32,7 @@ import org.apache.james.mailbox.MailboxSession.User; * */ public class MailboxSessionJCRRepository { - private final static String JCR_SESSION = "JCR_SESSION"; + private static final String JCR_SESSION = "JCR_SESSION"; private final Repository repository; private final String workspace; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java index 8eac455..f2bb7c8 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java @@ -74,37 +74,37 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo /** * Store the messages directly in the mailbox: .../mailbox/ */ - public final static int MESSAGE_SCALE_NONE = 0; + public static final int MESSAGE_SCALE_NONE = 0; /** * Store the messages under a year directory in the mailbox: * .../mailbox/2010/ */ - public final static int MESSAGE_SCALE_YEAR = 1; + public static final int MESSAGE_SCALE_YEAR = 1; /** * Store the messages under a year/month directory in the mailbox: * .../mailbox/2010/05/ */ - public final static int MESSAGE_SCALE_MONTH = 2; + public static final int MESSAGE_SCALE_MONTH = 2; /** * Store the messages under a year/month/day directory in the mailbox: * .../mailbox/2010/05/01/ */ - public final static int MESSAGE_SCALE_DAY = 3; + public static final int MESSAGE_SCALE_DAY = 3; /** * Store the messages under a year/month/day/hour directory in the mailbox: * .../mailbox/2010/05/02/11 */ - public final static int MESSAGE_SCALE_HOUR = 4; + public static final int MESSAGE_SCALE_HOUR = 4; /** * Store the messages under a year/month/day/hour/min directory in the * mailbox: .../mailbox/2010/05/02/11/59 */ - public final static int MESSAGE_SCALE_MINUTE = 5; + public static final int MESSAGE_SCALE_MINUTE = 5; private final int scaleType; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java index b20c04d..6534de1 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java @@ -46,12 +46,12 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{ private static final String TAB = " "; - public final static String USER_PROPERTY = "jamesMailbox:mailboxUser"; - public final static String NAMESPACE_PROPERTY = "jamesMailbox:mailboxNamespace"; - public final static String NAME_PROPERTY = "jamesMailbox:mailboxName"; - public final static String UIDVALIDITY_PROPERTY = "jamesMailbox:mailboxUidValidity"; - public final static String LASTUID_PROPERTY = "jamesMailbox:mailboxLastUid"; - public final static String HIGHESTMODSEQ_PROPERTY = "jamesMailbox:mailboxHighestModSeq"; + public static final String USER_PROPERTY = "jamesMailbox:mailboxUser"; + public static final String NAMESPACE_PROPERTY = "jamesMailbox:mailboxNamespace"; + public static final String NAME_PROPERTY = "jamesMailbox:mailboxName"; + public static final String UIDVALIDITY_PROPERTY = "jamesMailbox:mailboxUidValidity"; + public static final String LASTUID_PROPERTY = "jamesMailbox:mailboxLastUid"; + public static final String HIGHESTMODSEQ_PROPERTY = "jamesMailbox:mailboxHighestModSeq"; private String name; private long uidValidity; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java index 23673e3..503e415 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java @@ -88,26 +88,26 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers private static final String TOSTRING_SEPARATOR = " "; - public final static String MAILBOX_UUID_PROPERTY = "jamesMailbox:mailboxUUID"; - public final static String UID_PROPERTY = "jamesMailbox:uid"; - public final static String SIZE_PROPERTY = "jamesMailbox:size"; - public final static String ANSWERED_PROPERTY = "jamesMailbox:answered"; - public final static String DELETED_PROPERTY = "jamesMailbox:deleted"; - public final static String DRAFT_PROPERTY = "jamesMailbox:draft"; - public final static String FLAGGED_PROPERTY = "jamesMailbox:flagged"; - public final static String USERFLAGS_PROPERTY = "jamesMailbox:userFlags"; - - public final static String RECENT_PROPERTY = "jamesMailbox:recent"; - public final static String SEEN_PROPERTY = "jamesMailbox:seen"; - public final static String INTERNAL_DATE_PROPERTY = "jamesMailbox:internalDate"; + public static final String MAILBOX_UUID_PROPERTY = "jamesMailbox:mailboxUUID"; + public static final String UID_PROPERTY = "jamesMailbox:uid"; + public static final String SIZE_PROPERTY = "jamesMailbox:size"; + public static final String ANSWERED_PROPERTY = "jamesMailbox:answered"; + public static final String DELETED_PROPERTY = "jamesMailbox:deleted"; + public static final String DRAFT_PROPERTY = "jamesMailbox:draft"; + public static final String FLAGGED_PROPERTY = "jamesMailbox:flagged"; + public static final String USERFLAGS_PROPERTY = "jamesMailbox:userFlags"; + + public static final String RECENT_PROPERTY = "jamesMailbox:recent"; + public static final String SEEN_PROPERTY = "jamesMailbox:seen"; + public static final String INTERNAL_DATE_PROPERTY = "jamesMailbox:internalDate"; - public final static String BODY_START_OCTET_PROPERTY = "jamesMailbox:messageBodyStartOctet"; - public final static String HEADER_NODE_TYPE = "jamesMailbox:messageHeader"; + public static final String BODY_START_OCTET_PROPERTY = "jamesMailbox:messageBodyStartOctet"; + public static final String HEADER_NODE_TYPE = "jamesMailbox:messageHeader"; - public final static String PROPERTY_NODE_TYPE = "jamesMailbox:messageProperty"; - public final static String TEXTUAL_LINE_COUNT_PROPERTY = "jamesMailbox:messageTextualLineCount"; - public final static String SUBTYPE_PROPERTY = "jamesMailbox:messageSubType"; - public final static String MODSEQ_PROPERTY = "jamesMailbox:modSeq"; + public static final String PROPERTY_NODE_TYPE = "jamesMailbox:messageProperty"; + public static final String TEXTUAL_LINE_COUNT_PROPERTY = "jamesMailbox:messageTextualLineCount"; + public static final String SUBTYPE_PROPERTY = "jamesMailbox:messageSubType"; + public static final String MODSEQ_PROPERTY = "jamesMailbox:modSeq"; public JCRMailboxMessage(Node node, Logger logger) { this.node = node; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java index 2233417..6024d2d 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java @@ -41,10 +41,10 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property { private String value; private int order; - public final static String NAMESPACE_PROPERTY = "jamesMailbox:propertyNamespace"; - public final static String LOCALNAME_PROPERTY = "jamesMailbox:propertyLocalName"; - public final static String VALUE_PROPERTY = "jamesMailbox:propertyValue"; - public final static String ORDER_PROPERTY = "jamesMailbox:propertyOrder"; + public static final String NAMESPACE_PROPERTY = "jamesMailbox:propertyNamespace"; + public static final String LOCALNAME_PROPERTY = "jamesMailbox:propertyLocalName"; + public static final String VALUE_PROPERTY = "jamesMailbox:propertyValue"; + public static final String ORDER_PROPERTY = "jamesMailbox:propertyOrder"; public JCRProperty(Node node) { this.node = node; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java index aa97c07..1ca0032 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java @@ -41,8 +41,8 @@ public class JCRSubscription implements Subscription, Persistent, JCRImapConstan private static final String TOSTRING_SEPARATOR = " "; - public final static String USERNAME_PROPERTY = "jamesMailbox:user"; - public final static String MAILBOXES_PROPERTY = "jamesMailbox:subscriptionMailboxes"; + public static final String USERNAME_PROPERTY = "jamesMailbox:user"; + public static final String MAILBOXES_PROPERTY = "jamesMailbox:subscriptionMailboxes"; private Node node; private final String mailbox; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java index 1a46ebb..39807ac 100644 --- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java +++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java @@ -34,7 +34,7 @@ import org.apache.lucene.util.Version; */ public final class LenientImapSearchAnalyzer extends Analyzer{ - public final static int DEFAULT_MAX_TOKEN_LENGTH = 4; + public static final int DEFAULT_MAX_TOKEN_LENGTH = 4; private final int maxTokenLength; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java index 6f7dbda..3949f52 100644 --- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java +++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java @@ -131,8 +131,8 @@ import com.google.common.collect.ImmutableList; */ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex { private static final Logger LOGGER = LoggerFactory.getLogger(LuceneMessageSearchIndex.class); - private final static Date MAX_DATE; - private final static Date MIN_DATE; + private static final Date MAX_DATE; + private static final Date MIN_DATE; static { Calendar cal = Calendar.getInstance(); @@ -146,211 +146,211 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex { /** * Default max query results */ - private final static int DEFAULT_MAX_QUERY_RESULTS = 100000; + private static final int DEFAULT_MAX_QUERY_RESULTS = 100000; /** * {@link Field} which will contain the unique index of the {@link Document} */ - private final static String ID_FIELD ="id"; + private static final String ID_FIELD ="id"; /** * {@link Field} which will contain uid of the {@link MailboxMessage} */ - private final static String UID_FIELD = "uid"; + private static final String UID_FIELD = "uid"; /** * {@link Field} boolean field that say if the message as an attachment or not */ - private final static String HAS_ATTACHMENT_FIELD = "hasAttachment"; + private static final String HAS_ATTACHMENT_FIELD = "hasAttachment"; /** * {@link Field} which will contain the {@link Flags} of the {@link MailboxMessage} */ - private final static String FLAGS_FIELD = "flags"; + private static final String FLAGS_FIELD = "flags"; /** * {@link Field} which will contain the size of the {@link MailboxMessage} */ - private final static String SIZE_FIELD = "size"; + private static final String SIZE_FIELD = "size"; /** * {@link Field} which will contain the body of the {@link MailboxMessage} */ - private final static String BODY_FIELD = "body"; + private static final String BODY_FIELD = "body"; /** * Prefix which will be used for each message header to store it also in a seperate {@link Field} */ - private final static String PREFIX_HEADER_FIELD ="header_"; + private static final String PREFIX_HEADER_FIELD ="header_"; /** * {@link Field} which will contain the whole message header of the {@link MailboxMessage} */ - private final static String HEADERS_FIELD ="headers"; + private static final String HEADERS_FIELD ="headers"; /** * {@link Field} which will contain the mod-sequence of the message */ - private final static String MODSEQ_FIELD = "modSeq"; + private static final String MODSEQ_FIELD = "modSeq"; /** * {@link Field} which will contain the TO-Address of the message */ - private final static String TO_FIELD ="to"; + private static final String TO_FIELD ="to"; - private final static String FIRST_TO_MAILBOX_NAME_FIELD ="firstToMailboxName"; - private final static String FIRST_TO_MAILBOX_DISPLAY_FIELD ="firstToMailboxDisplay"; + private static final String FIRST_TO_MAILBOX_NAME_FIELD ="firstToMailboxName"; + private static final String FIRST_TO_MAILBOX_DISPLAY_FIELD ="firstToMailboxDisplay"; /** * {@link Field} which will contain the CC-Address of the message */ - private final static String CC_FIELD ="cc"; + private static final String CC_FIELD ="cc"; - private final static String FIRST_CC_MAILBOX_NAME_FIELD ="firstCcMailboxName"; + private static final String FIRST_CC_MAILBOX_NAME_FIELD ="firstCcMailboxName"; /** * {@link Field} which will contain the FROM-Address of the message */ - private final static String FROM_FIELD ="from"; + private static final String FROM_FIELD ="from"; - private final static String FIRST_FROM_MAILBOX_NAME_FIELD ="firstFromMailboxName"; - private final static String FIRST_FROM_MAILBOX_DISPLAY_FIELD ="firstFromMailboxDisplay"; + private static final String FIRST_FROM_MAILBOX_NAME_FIELD ="firstFromMailboxName"; + private static final String FIRST_FROM_MAILBOX_DISPLAY_FIELD ="firstFromMailboxDisplay"; /** * {@link Field} which will contain the BCC-Address of the message */ - private final static String BCC_FIELD ="bcc"; + private static final String BCC_FIELD ="bcc"; - private final static String BASE_SUBJECT_FIELD = "baseSubject"; + private static final String BASE_SUBJECT_FIELD = "baseSubject"; /** * {@link Field} which contain the internalDate of the message with YEAR-Resolution */ - private final static String INTERNAL_DATE_FIELD_YEAR_RESOLUTION ="internaldateYearResolution"; + private static final String INTERNAL_DATE_FIELD_YEAR_RESOLUTION ="internaldateYearResolution"; /** * {@link Field} which contain the internalDate of the message with MONTH-Resolution */ - private final static String INTERNAL_DATE_FIELD_MONTH_RESOLUTION ="internaldateMonthResolution"; + private static final String INTERNAL_DATE_FIELD_MONTH_RESOLUTION ="internaldateMonthResolution"; /** * {@link Field} which contain the internalDate of the message with DAY-Resolution */ - private final static String INTERNAL_DATE_FIELD_DAY_RESOLUTION ="internaldateDayResolution"; + private static final String INTERNAL_DATE_FIELD_DAY_RESOLUTION ="internaldateDayResolution"; /** * {@link Field} which contain the internalDate of the message with HOUR-Resolution */ - private final static String INTERNAL_DATE_FIELD_HOUR_RESOLUTION ="internaldateHourResolution"; + private static final String INTERNAL_DATE_FIELD_HOUR_RESOLUTION ="internaldateHourResolution"; /** * {@link Field} which contain the internalDate of the message with MINUTE-Resolution */ - private final static String INTERNAL_DATE_FIELD_MINUTE_RESOLUTION ="internaldateMinuteResolution"; + private static final String INTERNAL_DATE_FIELD_MINUTE_RESOLUTION ="internaldateMinuteResolution"; /** * {@link Field} which contain the internalDate of the message with SECOND-Resolution */ - private final static String INTERNAL_DATE_FIELD_SECOND_RESOLUTION ="internaldateSecondResolution"; + private static final String INTERNAL_DATE_FIELD_SECOND_RESOLUTION ="internaldateSecondResolution"; /** * {@link Field} which contain the internalDate of the message with MILLISECOND-Resolution */ - private final static String INTERNAL_DATE_FIELD_MILLISECOND_RESOLUTION ="internaldateMillisecondResolution"; + private static final String INTERNAL_DATE_FIELD_MILLISECOND_RESOLUTION ="internaldateMillisecondResolution"; /** * {@link Field} which will contain the id of the {@link Mailbox} */ - private final static String MAILBOX_ID_FIELD ="mailboxid"; + private static final String MAILBOX_ID_FIELD ="mailboxid"; /** * {@link Field} which will contain the user of the {@link MailboxSession} */ - private final static String USERS = "userSession"; + private static final String USERS = "userSession"; /** * {@link Field} which will contain the id of the {@link MessageId} */ - private final static String MESSAGE_ID_FIELD ="messageid"; + private static final String MESSAGE_ID_FIELD ="messageid"; /** * {@link Field} which contain the Date header of the message with YEAR-Resolution */ - private final static String SENT_DATE_FIELD_YEAR_RESOLUTION ="sentdateYearResolution"; + private static final String SENT_DATE_FIELD_YEAR_RESOLUTION ="sentdateYearResolution"; /** * {@link Field} which contain the Date header of the message with MONTH-Resolution */ - private final static String SENT_DATE_FIELD_MONTH_RESOLUTION ="sentdateMonthResolution"; + private static final String SENT_DATE_FIELD_MONTH_RESOLUTION ="sentdateMonthResolution"; /** * {@link Field} which contain the Date header of the message with DAY-Resolution */ - private final static String SENT_DATE_FIELD_DAY_RESOLUTION ="sentdateDayResolution"; + private static final String SENT_DATE_FIELD_DAY_RESOLUTION ="sentdateDayResolution"; /** * {@link Field} which contain the Date header of the message with HOUR-Resolution */ - private final static String SENT_DATE_FIELD_HOUR_RESOLUTION ="sentdateHourResolution"; + private static final String SENT_DATE_FIELD_HOUR_RESOLUTION ="sentdateHourResolution"; /** * {@link Field} which contain the Date header of the message with MINUTE-Resolution */ - private final static String SENT_DATE_FIELD_MINUTE_RESOLUTION ="sentdateMinuteResolution"; + private static final String SENT_DATE_FIELD_MINUTE_RESOLUTION ="sentdateMinuteResolution"; /** * {@link Field} which contain the Date header of the message with SECOND-Resolution */ - private final static String SENT_DATE_FIELD_SECOND_RESOLUTION ="sentdateSecondResolution"; + private static final String SENT_DATE_FIELD_SECOND_RESOLUTION ="sentdateSecondResolution"; /** * {@link Field} which contain the Date header of the message with MILLISECOND-Resolution */ - private final static String SENT_DATE_FIELD_MILLISECOND_RESOLUTION ="sentdateMillisecondResolution"; + private static final String SENT_DATE_FIELD_MILLISECOND_RESOLUTION ="sentdateMillisecondResolution"; - private final static String SENT_DATE_SORT_FIELD_MILLISECOND_RESOLUTION ="sentdateSort"; + private static final String SENT_DATE_SORT_FIELD_MILLISECOND_RESOLUTION ="sentdateSort"; - private final static String MEDIA_TYPE_TEXT = "text"; - private final static String MEDIA_TYPE_MESSAGE = "message"; - private final static String DEFAULT_ENCODING = "US-ASCII"; + private static final String MEDIA_TYPE_TEXT = "text"; + private static final String MEDIA_TYPE_MESSAGE = "message"; + private static final String DEFAULT_ENCODING = "US-ASCII"; - private final static SortField UID_SORT = new SortField(UID_FIELD, SortField.LONG); - private final static SortField UID_SORT_REVERSE = new SortField(UID_FIELD, SortField.LONG, true); + private static final SortField UID_SORT = new SortField(UID_FIELD, SortField.LONG); + private static final SortField UID_SORT_REVERSE = new SortField(UID_FIELD, SortField.LONG, true); - private final static SortField SIZE_SORT = new SortField(SIZE_FIELD, SortField.LONG); - private final static SortField SIZE_SORT_REVERSE = new SortField(SIZE_FIELD, SortField.LONG, true); + private static final SortField SIZE_SORT = new SortField(SIZE_FIELD, SortField.LONG); + private static final SortField SIZE_SORT_REVERSE = new SortField(SIZE_FIELD, SortField.LONG, true); - private final static SortField FIRST_CC_MAILBOX_SORT = new SortField(FIRST_CC_MAILBOX_NAME_FIELD, SortField.STRING); - private final static SortField FIRST_CC_MAILBOX_SORT_REVERSE = new SortField(FIRST_CC_MAILBOX_NAME_FIELD, SortField.STRING, true); + private static final SortField FIRST_CC_MAILBOX_SORT = new SortField(FIRST_CC_MAILBOX_NAME_FIELD, SortField.STRING); + private static final SortField FIRST_CC_MAILBOX_SORT_REVERSE = new SortField(FIRST_CC_MAILBOX_NAME_FIELD, SortField.STRING, true); - private final static SortField FIRST_TO_MAILBOX_SORT = new SortField(FIRST_TO_MAILBOX_NAME_FIELD, SortField.STRING); - private final static SortField FIRST_TO_MAILBOX_SORT_REVERSE = new SortField(FIRST_TO_MAILBOX_NAME_FIELD, SortField.STRING, true); + private static final SortField FIRST_TO_MAILBOX_SORT = new SortField(FIRST_TO_MAILBOX_NAME_FIELD, SortField.STRING); + private static final SortField FIRST_TO_MAILBOX_SORT_REVERSE = new SortField(FIRST_TO_MAILBOX_NAME_FIELD, SortField.STRING, true); - private final static SortField FIRST_FROM_MAILBOX_SORT = new SortField(FIRST_FROM_MAILBOX_NAME_FIELD, SortField.STRING); - private final static SortField FIRST_FROM_MAILBOX_SORT_REVERSE = new SortField(FIRST_FROM_MAILBOX_NAME_FIELD, SortField.STRING, true); + private static final SortField FIRST_FROM_MAILBOX_SORT = new SortField(FIRST_FROM_MAILBOX_NAME_FIELD, SortField.STRING); + private static final SortField FIRST_FROM_MAILBOX_SORT_REVERSE = new SortField(FIRST_FROM_MAILBOX_NAME_FIELD, SortField.STRING, true); - private final static SortField ARRIVAL_MAILBOX_SORT = new SortField(INTERNAL_DATE_FIELD_MILLISECOND_RESOLUTION, SortField.LONG); - private final static SortField ARRIVAL_MAILBOX_SORT_REVERSE = new SortField(INTERNAL_DATE_FIELD_MILLISECOND_RESOLUTION, SortField.LONG, true); + private static final SortField ARRIVAL_MAILBOX_SORT = new SortField(INTERNAL_DATE_FIELD_MILLISECOND_RESOLUTION, SortField.LONG); + private static final SortField ARRIVAL_MAILBOX_SORT_REVERSE = new SortField(INTERNAL_DATE_FIELD_MILLISECOND_RESOLUTION, SortField.LONG, true); - private final static SortField BASE_SUBJECT_SORT = new SortField(BASE_SUBJECT_FIELD, SortField.STRING); - private final static SortField BASE_SUBJECT_SORT_REVERSE = new SortField(BASE_SUBJECT_FIELD, SortField.STRING, true); + private static final SortField BASE_SUBJECT_SORT = new SortField(BASE_SUBJECT_FIELD, SortField.STRING); + private static final SortField BASE_SUBJECT_SORT_REVERSE = new SortField(BASE_SUBJECT_FIELD, SortField.STRING, true); - private final static SortField SENT_DATE_SORT = new SortField(SENT_DATE_SORT_FIELD_MILLISECOND_RESOLUTION, SortField.LONG); - private final static SortField SENT_DATE_SORT_REVERSE = new SortField(SENT_DATE_SORT_FIELD_MILLISECOND_RESOLUTION, SortField.LONG, true); + private static final SortField SENT_DATE_SORT = new SortField(SENT_DATE_SORT_FIELD_MILLISECOND_RESOLUTION, SortField.LONG); + private static final SortField SENT_DATE_SORT_REVERSE = new SortField(SENT_DATE_SORT_FIELD_MILLISECOND_RESOLUTION, SortField.LONG, true); - private final static SortField FIRST_TO_MAILBOX_DISPLAY_SORT = new SortField(FIRST_TO_MAILBOX_DISPLAY_FIELD, SortField.STRING); - private final static SortField FIRST_TO_MAILBOX_DISPLAY_SORT_REVERSE = new SortField(FIRST_TO_MAILBOX_DISPLAY_FIELD, SortField.STRING, true); + private static final SortField FIRST_TO_MAILBOX_DISPLAY_SORT = new SortField(FIRST_TO_MAILBOX_DISPLAY_FIELD, SortField.STRING); + private static final SortField FIRST_TO_MAILBOX_DISPLAY_SORT_REVERSE = new SortField(FIRST_TO_MAILBOX_DISPLAY_FIELD, SortField.STRING, true); - private final static SortField FIRST_FROM_MAILBOX_DISPLAY_SORT = new SortField(FIRST_FROM_MAILBOX_DISPLAY_FIELD, SortField.STRING); - private final static SortField FIRST_FROM_MAILBOX_DISPLAY_SORT_REVERSE = new SortField(FIRST_FROM_MAILBOX_DISPLAY_FIELD, SortField.STRING, true); + private static final SortField FIRST_FROM_MAILBOX_DISPLAY_SORT = new SortField(FIRST_FROM_MAILBOX_DISPLAY_FIELD, SortField.STRING); + private static final SortField FIRST_FROM_MAILBOX_DISPLAY_SORT_REVERSE = new SortField(FIRST_FROM_MAILBOX_DISPLAY_FIELD, SortField.STRING, true); private final MailboxId.Factory mailboxIdFactory; private final MessageId.Factory messageIdFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java index eef1d85..0a9223e 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java @@ -405,7 +405,7 @@ public class MaildirMessageName { * This is used for the creation of message names. * @return The number of (attempted) deliveries until now */ - static private long getNextDeliveryNumber() { + private static long getNextDeliveryNumber() { return deliveries.getAndIncrement(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java index 18f4d59..6edbe6c 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java @@ -58,7 +58,7 @@ import org.apache.james.mailbox.store.mail.utils.ApplicableFlagCalculator; public class MaildirMessageMapper extends AbstractMessageMapper { private final MaildirStore maildirStore; - private final static int BUF_SIZE = 2048; + private static final int BUF_SIZE = 2048; public MaildirMessageMapper(MailboxSession session, MaildirStore maildirStore) { super(session, maildirStore, maildirStore); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java index ce521d7..827071e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java @@ -40,11 +40,11 @@ import org.apache.james.mailbox.store.user.SubscriptionMapperFactory; */ public abstract class MailboxSessionMapperFactory implements RequestAware, MailboxMapperFactory, MessageMapperFactory, SubscriptionMapperFactory { - protected final static String MESSAGEMAPPER ="MESSAGEMAPPER"; - protected final static String MESSAGEIDMAPPER ="MESSAGEIDMAPPER"; - protected final static String MAILBOXMAPPER ="MAILBOXMAPPER"; - protected final static String SUBSCRIPTIONMAPPER ="SUBSCRIPTIONMAPPER"; - protected final static String ANNOTATIONMAPPER = "ANNOTATIONMAPPER"; + protected static final String MESSAGEMAPPER ="MESSAGEMAPPER"; + protected static final String MESSAGEIDMAPPER ="MESSAGEIDMAPPER"; + protected static final String MAILBOXMAPPER ="MAILBOXMAPPER"; + protected static final String SUBSCRIPTIONMAPPER ="SUBSCRIPTIONMAPPER"; + protected static final String ANNOTATIONMAPPER = "ANNOTATIONMAPPER"; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java index a940652..a791c9d 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java @@ -44,7 +44,7 @@ import org.apache.james.mime4j.stream.RecursionMode; public class MimeDescriptorImpl implements MimeDescriptor { - private final static Charset US_ASCII = Charset.forName("US-ASCII"); + private static final Charset US_ASCII = Charset.forName("US-ASCII"); private static final MimeConfig MIME_ENTITY_CONFIG = MimeConfig.custom() .setMaxContentLen(-1) .setMaxHeaderCount(-1) http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/RandomMailboxSessionIdGenerator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/RandomMailboxSessionIdGenerator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/RandomMailboxSessionIdGenerator.java index d71f535..8a15457 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/RandomMailboxSessionIdGenerator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/RandomMailboxSessionIdGenerator.java @@ -29,7 +29,7 @@ import org.apache.james.mailbox.MailboxSessionIdGenerator; * generate the next Id to use */ public class RandomMailboxSessionIdGenerator extends AbstractMailboxSessionIdGenerator { - private final static SecureRandom RANDOM = new SecureRandom(); + private static final SecureRandom RANDOM = new SecureRandom(); @Override protected long generateNextId() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java index f289fe9..1ee1a86 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java @@ -35,7 +35,7 @@ public final class ResultHeader implements MessageResult.Header { private final String value; private final long size; - private final static Charset US_ASCII = Charset.forName("US-ASCII"); + private static final Charset US_ASCII = Charset.forName("US-ASCII"); public ResultHeader(String name, String value) { this.name = name; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index e063236..ba9ae93 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -112,7 +112,7 @@ public class StoreMailboxManager implements MailboxManager { private final StoreRightManager storeRightManager; - private final static SecureRandom RANDOM = new SecureRandom(); + private static final SecureRandom RANDOM = new SecureRandom(); private MessageBatcher copyBatcher; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java index 777b28f..3af1c65 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java @@ -121,7 +121,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana * <strong>Be sure this static instance will never get modifed * later!</strong> */ - protected final static Flags MINIMAL_PERMANET_FLAGS; + protected static final Flags MINIMAL_PERMANET_FLAGS; static { MINIMAL_PERMANET_FLAGS = new Flags(); MINIMAL_PERMANET_FLAGS.add(Flags.Flag.ANSWERED); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java index c7c2dcb..c591833 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; public class BroadcastDelegatingMailboxListener implements DistributedDelegatingMailboxListener { - private final static Logger LOGGER = LoggerFactory.getLogger(BroadcastDelegatingMailboxListener.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BroadcastDelegatingMailboxListener.class); private final MailboxListenerRegistry mailboxListenerRegistry; private final Publisher publisher; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java index 6df34f5..7335f90 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java @@ -37,7 +37,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; public class MailboxConverter { - private final static Logger LOGGER = LoggerFactory.getLogger(MailboxConverter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MailboxConverter.class); private final MailboxIdDeserializer mailboxIdDeserializer; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java index 7372a79..11d1a38 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java @@ -25,7 +25,7 @@ import org.apache.james.mailbox.model.Quota; public final class QuotaImpl implements Quota{ - private final static Quota UNLIMITED_QUOTA = new QuotaImpl(UNKNOWN, UNLIMITED); + private static final Quota UNLIMITED_QUOTA = new QuotaImpl(UNKNOWN, UNLIMITED); public static Quota unlimited() { return UNLIMITED_QUOTA; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java index 4722a0d..eebf585 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java @@ -43,18 +43,18 @@ import org.apache.james.mime4j.util.MimeUtil; */ public class SearchUtil { - private final static String FWD_PARENS = "(fwd)"; - private final static String SUBJ_FWD_HDR = "[fwd:"; - private final static String SUBJ_FWD_TRL = "]"; - private final static String RE = "re"; - private final static String FWD = "fwd"; - private final static String FW = "fw"; - private final static char WS = ' '; - private final static char OPEN_SQUARE_BRACKED = '['; - private final static char CLOSE_SQUARE_BRACKED = ']'; - private final static char COLON = ':'; + private static final String FWD_PARENS = "(fwd)"; + private static final String SUBJ_FWD_HDR = "[fwd:"; + private static final String SUBJ_FWD_TRL = "]"; + private static final String RE = "re"; + private static final String FWD = "fwd"; + private static final String FW = "fw"; + private static final char WS = ' '; + private static final char OPEN_SQUARE_BRACKED = '['; + private static final char CLOSE_SQUARE_BRACKED = ']'; + private static final char COLON = ':'; - private final static Charset UTF8 = Charset.forName("UTF8"); + private static final Charset UTF8 = Charset.forName("UTF8"); /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java index 7c76209..767c6a9 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java @@ -34,9 +34,9 @@ public abstract class AbstractHeaderComparator implements Comparator<MailboxMess private static final Logger LOGGER = LoggerFactory.getLogger(AbstractHeaderComparator.class); - public final static String FROM ="from"; - public final static String TO ="to"; - public final static String CC ="cc"; + public static final String FROM ="from"; + public static final String TO ="to"; + public static final String CC ="cc"; protected String getHeaderValue(String headerName, MailboxMessage message) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java index ba38ce3..f001cd2 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java @@ -25,8 +25,8 @@ import org.apache.james.mailbox.store.search.SearchUtil; public class BaseSubjectComparator extends AbstractHeaderComparator{ - public final static Comparator<MailboxMessage> BASESUBJECT = new BaseSubjectComparator(); - private final static String SUBJECT = "subject"; + public static final Comparator<MailboxMessage> BASESUBJECT = new BaseSubjectComparator(); + private static final String SUBJECT = "subject"; @Override public int compare(MailboxMessage o1, MailboxMessage o2) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java index bd1790f..6c96346 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java @@ -24,8 +24,8 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.search.SearchUtil; public class HeaderDisplayComparator extends AbstractHeaderComparator{ - public final static Comparator<MailboxMessage> FROM_COMPARATOR = new HeaderDisplayComparator(FROM); - public final static Comparator<MailboxMessage> TO_COMPARATOR = new HeaderDisplayComparator(TO); + public static final Comparator<MailboxMessage> FROM_COMPARATOR = new HeaderDisplayComparator(FROM); + public static final Comparator<MailboxMessage> TO_COMPARATOR = new HeaderDisplayComparator(TO); private final String headerName; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java index 2c0c85d..dbc4b67 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java @@ -24,9 +24,9 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.search.SearchUtil; public class HeaderMailboxComparator extends AbstractHeaderComparator{ - public final static Comparator<MailboxMessage> FROM_COMPARATOR = new HeaderMailboxComparator(FROM); - public final static Comparator<MailboxMessage> TO_COMPARATOR = new HeaderMailboxComparator(TO); - public final static Comparator<MailboxMessage> CC_COMPARATOR = new HeaderMailboxComparator(CC); + public static final Comparator<MailboxMessage> FROM_COMPARATOR = new HeaderMailboxComparator(FROM); + public static final Comparator<MailboxMessage> TO_COMPARATOR = new HeaderMailboxComparator(TO); + public static final Comparator<MailboxMessage> CC_COMPARATOR = new HeaderMailboxComparator(CC); private final String headerName; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java index 51de2eb..d2329d3 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java @@ -26,7 +26,7 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; * {@link Comparator} which compares {@link MailboxMessage}'s with their {@link MailboxMessage#getInternalDate()} value */ public class InternalDateComparator implements Comparator<MailboxMessage>{ - public final static Comparator<MailboxMessage> INTERNALDATE = new InternalDateComparator(); + public static final Comparator<MailboxMessage> INTERNALDATE = new InternalDateComparator(); @Override public int compare(MailboxMessage o1, MailboxMessage o2) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java index 0dd011f..07eff78 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java @@ -37,7 +37,7 @@ import com.google.common.annotations.VisibleForTesting; */ public class SentDateComparator extends AbstractHeaderComparator { - public final static Comparator<MailboxMessage> SENTDATE = new SentDateComparator(); + public static final Comparator<MailboxMessage> SENTDATE = new SentDateComparator(); private static final Logger LOGGER = LoggerFactory.getLogger(SentDateComparator.class); // Some sent e-mail have this form : Wed, 3 Jun 2015 09:05:46 +0000 (UTC) // Java 8 Time library RFC_1123_DATE_TIME corresponds to Wed, 3 Jun 2015 09:05:46 +0000 only http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java index 2717226..156f24c 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java @@ -26,7 +26,7 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; * {@link Comparator} which compares {@link MailboxMessage}'s with their {@link MailboxMessage#getFullContentOctets()} value */ public class SizeComparator implements Comparator<MailboxMessage>{ - public final static Comparator<MailboxMessage> SIZE = new SizeComparator(); + public static final Comparator<MailboxMessage> SIZE = new SizeComparator(); @Override public int compare(MailboxMessage o1, MailboxMessage o2) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java index 2fa187f..1884dd2 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java @@ -26,7 +26,7 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; * {@link Comparator} which compares {@link MailboxMessage}'s with their {@link MailboxMessage#getUid()} value */ public class UidComparator implements Comparator<MailboxMessage>{ - public final static Comparator<MailboxMessage> UID = new UidComparator(); + public static final Comparator<MailboxMessage> UID = new UidComparator(); @Override public int compare(MailboxMessage o1, MailboxMessage o2) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java index d7c291f..82a1e26 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java @@ -30,7 +30,7 @@ import java.io.InputStream; * * */ -final public class CountingInputStream extends InputStream { +public final class CountingInputStream extends InputStream { private final InputStream in; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java index 552ab44..d088a7c 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java @@ -26,8 +26,8 @@ import org.junit.Test; public class MailboxAssertTests { - private final static long UID_VALIDITY = 42; - private final static TestId MAILBOX_ID = TestId.of(24); + private static final long UID_VALIDITY = 42; + private static final TestId MAILBOX_ID = TestId.of(24); @Test public void isEqualToShouldNotFailWithEqualMailbox() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java index abf3e12..e445b14 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java @@ -38,7 +38,7 @@ import org.junit.rules.ExpectedException; import com.google.common.collect.ImmutableMap; public abstract class MailboxMapperACLTest { - private final static long UID_VALIDITY = 42; + private static final long UID_VALIDITY = 42; public static final boolean POSITIVE = true; public static final boolean NEGATIVE = !POSITIVE; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java index d3f835b..fe20be4 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java @@ -42,9 +42,9 @@ import org.junit.Test; */ public abstract class MailboxMapperTest { - private final static char DELIMITER = '.'; - private final static char WILDCARD = '%'; - private final static long UID_VALIDITY = 42; + private static final char DELIMITER = '.'; + private static final char WILDCARD = '%'; + private static final long UID_VALIDITY = 42; private MailboxPath benwaInboxPath; private Mailbox benwaInboxMailbox; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index 312ab2d..559415c 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -59,9 +59,9 @@ public abstract class MessageIdMapperTest { @Rule public ExpectedException expectedException = ExpectedException.none(); - private final static char DELIMITER = '.'; + private static final char DELIMITER = '.'; private static final int BODY_START = 16; - private final static long UID_VALIDITY = 42; + private static final long UID_VALIDITY = 42; private MessageMapper messageMapper; private MailboxMapper mailboxMapper; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java index 203bc78..3185ef7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java @@ -62,7 +62,7 @@ import com.google.common.collect.Lists; public abstract class MessageMapperTest { - private final static char DELIMITER = '.'; + private static final char DELIMITER = '.'; private static final int LIMIT = 10; private static final int BODY_START = 16; public static final int UID_VALIDITY = 42; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java index 91e4e7a..8978a56 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java @@ -44,7 +44,7 @@ import org.junit.rules.ExpectedException; public abstract class MessageMoveTest { - private final static char DELIMITER = '.'; + private static final char DELIMITER = '.'; private static final int LIMIT = 10; private static final int BODY_START = 16; public static final int UID_VALIDITY = 42; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java index 104fbe8..b52dcd9 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; public class MailboxCopierImpl implements MailboxCopier { private static final Logger LOGGER = LoggerFactory.getLogger(MailboxCopierImpl.class.getName()); - private final static FetchGroup GROUP = new FetchGroup() { + private static final FetchGroup GROUP = new FetchGroup() { @Override public int content() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
