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:42 UTC
[42/53] [abbrv] james-project git commit: JAMES-2277 fix missing
vertical spacing
JAMES-2277 fix missing vertical spacing
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0c39fda1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0c39fda1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0c39fda1
Branch: refs/heads/master
Commit: 0c39fda1cd46b3df614d0c3b0a4b77561f090087
Parents: a61d975
Author: Matthieu Baechler <ma...@apache.org>
Authored: Tue Dec 26 17:18:02 2017 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Jan 10 10:45:40 2018 +0100
----------------------------------------------------------------------
.../mailbox/exception/OverQuotaException.java | 1 +
.../james/mailbox/model/UpdatedFlags.java | 1 +
.../james/mailbox/MailboxExceptionTest.java | 1 +
.../apache/james/mailbox/acl/ACLDiffTest.java | 1 +
.../acl/UnionMailboxACLResolverTest.java | 1 +
.../mailbox/model/MailboxAnnotationTest.java | 1 +
.../mailbox/model/search/MailboxQueryTest.java | 1 +
.../guava/GuavaMailboxMetadataCache.java | 5 +++
.../cassandra/mail/CassandraMessageDAO.java | 1 +
.../elasticsearch/json/IndexableMessage.java | 3 ++
.../mailbox/hbase/mail/HBaseModSeqProvider.java | 1 +
.../mailbox/hbase/mail/HBaseUidProvider.java | 1 +
.../hbase/user/HBaseSubscriptionMapper.java | 1 +
.../mailbox/jcr/mail/model/JCRMailbox.java | 5 +--
.../mailbox/jcr/mail/model/JCRProperty.java | 8 +---
.../mailbox/jpa/mail/model/JPAMailbox.java | 4 +-
.../jpa/mail/TransactionalMessageMapper.java | 1 +
.../lucene/search/LuceneMessageSearchIndex.java | 1 +
.../lucene/search/StrictImapSearchAnalyzer.java | 1 +
.../mailbox/maildir/MaildirMessageName.java | 2 +
.../james/mailbox/maildir/MaildirStore.java | 1 +
.../maildir/MailderMailboxMessageNameTest.java | 1 +
.../apache/james/mailbox/store/ResultUtils.java | 1 +
.../mailbox/store/StoreMessageManager.java | 9 +----
.../store/event/MailboxAnnotationListener.java | 1 +
.../james/mailbox/store/mail/model/Mailbox.java | 1 +
.../mailbox/store/search/MessageSearches.java | 1 +
.../AbstractMailboxManagerAttachmentTest.java | 3 ++
.../AbstractMessageIdManagerQuotaTest.java | 2 +
.../james/mailbox/store/SearchUtilsTest.java | 3 +-
.../mailbox/store/mail/MessageUtilsTest.java | 1 +
.../quota/ListeningCurrentQuotaUpdaterTest.java | 1 +
.../quota/StoreCurrentQuotaManagerTest.java | 2 +
.../search/AbstractMessageSearchIndexTest.java | 1 +
.../transport/mailets/SMIMECheckSignature.java | 6 +--
.../action/mode/DispositionActionModeTest.java | 1 +
.../mode/DispositionSendingModeTest.java | 1 +
.../main/java/org/apache/james/mpt/Runner.java | 2 +
.../java/org/apache/james/mpt/api/Monitor.java | 2 +
.../james/mpt/host/ExternalHostSystem.java | 1 +
.../GenericSimpleScriptedTestProtocol.java | 1 +
.../mpt/imapmailbox/suite/ACLCommands.java | 1 +
.../mpt/imapmailbox/suite/ACLIntegration.java | 2 +
.../imapmailbox/hbase/host/HBaseHostSystem.java | 1 +
.../managesieve/file/host/FileHostSystem.java | 2 +
.../api/future/FutureResponseImpl.java | 5 +--
.../api/handler/CommandDispatcher.java | 1 +
.../api/AbstractProtocolTransportTest.java | 2 +
.../james/imap/api/message/MessageFlags.java | 1 +
.../imap/api/message/request/SearchKey.java | 2 +
.../api/message/request/SearchOperation.java | 1 +
.../api/message/response/StatusResponse.java | 1 +
.../imap/decode/ImapRequestLineReader.java | 3 ++
.../parser/AbstractSelectionCommandParser.java | 1 +
.../imap/decode/parser/SearchCommandParser.java | 11 +++---
.../message/response/QuotaRootResponse.java | 4 +-
.../processor/AbstractMailboxProcessor.java | 1 +
.../james/imap/processor/AppendProcessor.java | 3 +-
.../james/imap/processor/LoginProcessor.java | 1 +
.../james/imap/processor/SearchProcessor.java | 1 +
.../processor/fetch/FetchResponseBuilder.java | 1 +
.../imap/processor/SearchProcessorTest.java | 1 +
.../processor/SetAnnotationProcessorTest.java | 1 +
.../lmtp/core/ReceivedDataLineFilter.java | 1 +
.../netty/AbstractChannelPipelineFactory.java | 1 +
.../protocols/netty/ChannelGroupHandler.java | 1 +
.../ConnectionPerIpLimitUpstreamHandler.java | 1 +
.../protocols/pop3/AbstractPOP3ServerTest.java | 2 +
.../smtp/SMTPProtocolHandlerChain.java | 1 +
.../james/protocols/smtp/SMTPResponse.java | 1 +
.../protocols/smtp/core/MailCmdHandler.java | 4 +-
.../protocols/smtp/core/QuitCmdHandler.java | 1 +
.../protocols/smtp/core/RsetCmdHandler.java | 5 +--
.../fastfail/ValidSenderDomainHandlerTest.java | 5 +--
.../james/server/core/MailHeadersTest.java | 3 +-
.../server/core/MimeMessageWrapperTest.java | 1 +
.../james/utils/GuiceProbeProviderTest.java | 1 +
...AbstractOSGIAnnotationBeanPostProcessor.java | 1 +
.../util/docker/SwarmGenericContainer.java | 1 +
.../naming/NamingExceptionRetryHandlerTest.java | 5 ++-
.../file/SieveFileRepositoryTest.java | 2 +
.../repository/file/AbstractFileRepository.java | 1 +
.../dnsservice/api/AbstractDNSServiceTest.java | 6 ++-
.../inetnetwork/InetNetworkBuilderTest.java | 3 +-
.../inetnetwork/model/InetNetworkTest.java | 3 +-
.../library/netmatcher/NetMatcherTest.java | 3 +-
.../lib/AbstractStateMailetProcessorTest.java | 1 +
.../mailets/jsieve/SieveMailAdapter.java | 41 ++++----------------
.../mailets/redirect/RedirectNotify.java | 1 +
.../jmap/UserProvisionningConcurrencyTest.java | 1 +
.../integration/SetMessagesMethodTest.java | 2 +
.../integration/cucumber/MainStepdefs.java | 1 +
.../apache/james/jmap/methods/Validator.java | 1 +
.../methods/JmapResponseWriterImplTest.java | 2 +
.../james/jmap/utils/MailboxUtilsTest.java | 1 +
.../AbstractCommandHandlerResultJMXMonitor.java | 2 +-
.../lib/mock/MockProtocolHandlerLoader.java | 1 +
.../smtpserver/POP3BeforeSMTPHandlerTest.java | 3 +-
.../smtpserver/SetMimeHeaderHandlerTest.java | 3 +-
.../james/smtpserver/ValidRcptHandlerTest.java | 1 +
.../james/webadmin/WebAdminConfiguration.java | 1 +
101 files changed, 150 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java
index 7568300..fa4dcd6 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java
@@ -39,6 +39,7 @@ public class OverQuotaException extends MailboxException {
this.used = used;
this.max = max;
}
+
public OverQuotaException(long max, long used) {
this(null, max, used);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java
index 7d30c0b..4be5e6a 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java
@@ -130,6 +130,7 @@ public class UpdatedFlags {
}
}
}
+
private static boolean isChanged(Flags original, Flags updated, Flags.Flag flag) {
return original != null && updated != null && (original.contains(flag) ^ updated.contains(flag));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
index 2cfea61..e90a057 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
@@ -22,6 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.exception.MailboxException;
import org.junit.Test;
+
/**
* Ensure that {@link MailboxException} construction is correct.
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/api/src/test/java/org/apache/james/mailbox/acl/ACLDiffTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/ACLDiffTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/ACLDiffTest.java
index 8a4ec8d..a983d9f 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/ACLDiffTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/ACLDiffTest.java
@@ -94,6 +94,7 @@ public class ACLDiffTest {
assertThat(acldiff.changedEntries()).isEmpty();
}
+
@Test
public void addedEntriesShouldReturnNewEntryWhenAddedEntry() throws Exception {
ACLDiff aclDiff = ACLDiff.computeDiff(
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
index 585dfac..7cea75f 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
@@ -895,6 +895,7 @@ public class UnionMailboxACLResolverTest {
.isFalse();
}
+
@Test
public void testResolveRightsUserMemberOfOwnerGroup() throws UnsupportedRightException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationTest.java
index 439d434..583f960 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationTest.java
@@ -40,6 +40,7 @@ public class MailboxAnnotationTest {
assertThat(mailboxAnnotation.size()).isEqualTo(0);
}
+
@Test(expected = NullPointerException.class)
public void newInstanceShouldThrowsExceptionWithNullKey() throws Exception {
MailboxAnnotation.newInstance(null, null);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java
index 7ae9041..82b121e 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java
@@ -192,6 +192,7 @@ public class MailboxQueryTest {
assertThat(mailboxQuery.belongsToRequestedNamespaceAndUser(new MailboxPath("namespace", CURRENT_USER + "2", "name")))
.isFalse();
}
+
@Test
public void belongsToNamespaceAndUserShouldReturnFalseWithOneOfTheUserNull() {
MailboxQuery mailboxQuery = MailboxQuery.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
----------------------------------------------------------------------
diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
index a877ed2..412f540 100644
--- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
+++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
@@ -87,6 +87,7 @@ public class GuavaMailboxMetadataCache extends AbstractGuavaCache implements Mai
public CountMessagesInMailboxWrapper(Cache<MailboxId, Long> cache) {
super(cache);
}
+
@Override
public Long load(Mailbox mailbox, MessageMapper underlying)
throws MailboxException {
@@ -100,6 +101,7 @@ public class GuavaMailboxMetadataCache extends AbstractGuavaCache implements Mai
public CountUnseenMessagesInMailboxWrapper(Cache<MailboxId, Long> cache) {
super(cache);
}
+
@Override
public Long load(Mailbox mailbox, MessageMapper underlying)
throws MailboxException {
@@ -113,6 +115,7 @@ public class GuavaMailboxMetadataCache extends AbstractGuavaCache implements Mai
public FindFirstUnseenMessageUidWrapper(Cache<MailboxId, MessageUid> cache) {
super(cache);
}
+
@Override
public MessageUid load(Mailbox mailbox, MessageMapper underlying)
throws MailboxException {
@@ -125,6 +128,7 @@ public class GuavaMailboxMetadataCache extends AbstractGuavaCache implements Mai
public LastUidCacheWrapper(Cache<MailboxId, Optional<MessageUid>> cache) {
super(cache);
}
+
@Override
public Optional<MessageUid> load(Mailbox mailbox, MessageMapper underlying) throws MailboxException {
return underlying.getLastUid(mailbox);
@@ -135,6 +139,7 @@ public class GuavaMailboxMetadataCache extends AbstractGuavaCache implements Mai
public HighestModseqCacheWrapper(Cache<MailboxId, Long> cache) {
super(cache);
}
+
@Override
public Long load(Mailbox mailbox, MessageMapper underlying) throws MailboxException {
return underlying.getHighestModSeq(mailbox);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
index 9c18e73..83477fb 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
@@ -442,6 +442,7 @@ public class CassandraMessageDAO {
public boolean hasAttachment() {
return ! attachmentIds.isEmpty();
}
+
@Override
public final boolean equals(Object o) {
if (o instanceof MessageIdAttachmentIds) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
index e5ad24e..bd40558 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
@@ -58,6 +58,7 @@ public class IndexableMessage {
Instant.ofEpochMilli(message.getInternalDate().getTime()),
zoneId);
}
+
private IndexAttachments indexAttachments;
private MailboxMessage message;
private TextExtractor textExtractor;
@@ -313,10 +314,12 @@ public class IndexableMessage {
public List<MimePart> getAttachments() {
return attachments;
}
+
@JsonProperty(JsonMessageConstants.BCC)
public EMailers getBcc() {
return bcc;
}
+
@JsonProperty(JsonMessageConstants.HTML_BODY)
public Optional<String> getBodyHtml() {
return bodyHtml;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseModSeqProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseModSeqProvider.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseModSeqProvider.java
index d96c27e..9828483 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseModSeqProvider.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseModSeqProvider.java
@@ -36,6 +36,7 @@ import org.apache.james.mailbox.hbase.HBaseId;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.model.Mailbox;
+
/**
* ModSeqProvider implementation for HBase.
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
index d0f2ca4..67da3b0 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
+
/**
* Message UidProvider for HBase.
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
index d7f0fdb..3d11085 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
@@ -39,6 +39,7 @@ import org.apache.james.mailbox.hbase.HBaseNonTransactionalMapper;
import org.apache.james.mailbox.store.user.SubscriptionMapper;
import org.apache.james.mailbox.store.user.model.Subscription;
import org.apache.james.mailbox.store.user.model.impl.SimpleSubscription;
+
/**
* HBase implementation of a {@link SubscriptionMapper}.
* I don't know if this class is thread-safe!
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 0829bd0..00a0b79 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
@@ -221,10 +221,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
public void setMailboxId(MailboxId mailboxId) {
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Mailbox#getNamespace()
- */
+
public String getNamespace() {
if (isPersistent()) {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 d3a00eb..db44898 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
@@ -59,13 +59,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
public JCRProperty(Property property) {
this(property.getNamespace(), property.getLocalName(), property.getValue());
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.james.mailbox.store.mail.model.AbstractComparableProperty#getOrder
- * ()
- */
+
public int getOrder() {
if (isPersistent()) {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
index 991252b..34992d2 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -133,9 +133,7 @@ public class JPAMailbox implements Mailbox {
public void setMailboxId(MailboxId mailboxId) {
this.mailboxId = ((JPAId)mailboxId).getRawId();
}
- /**
- * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
- */
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
index 8aec65a..a49a598 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
@@ -45,6 +45,7 @@ public class TransactionalMessageMapper implements MessageMapper {
public TransactionalMessageMapper(JPAMessageMapper messageMapper) {
this.messageMapper = messageMapper;
}
+
@Override
public void endRequest() {
throw new NotImplementedException();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 3832eed..64ded42 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
@@ -849,6 +849,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
return new PrefixQuery(new Term(fieldName, value));
}
}
+
/**
* Return a {@link Query} which is build based on the given {@link SearchQuery.HeaderCriterion}
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
index ac69f91..885d059 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
@@ -44,6 +44,7 @@ public final class StrictImapSearchAnalyzer extends Analyzer {
public StrictImapSearchAnalyzer() {
this(3, 40);
}
+
public StrictImapSearchAnalyzer(int minTokenLength, int maxTokenLength) {
this.minTokenLength = minTokenLength;
this.maxTokenLength = maxTokenLength;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 0b21851..72a75c2 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
@@ -72,6 +72,7 @@ public class MaildirMessageName {
* The process id of the server process
*/
private static String processName = ManagementFactory.getRuntimeMXBean().getName();
+
static {
String[] parts = processName.split("@");
if (parts.length > 1) {
@@ -83,6 +84,7 @@ public class MaildirMessageName {
* The host name of the machine the server is running on
*/
private static String currentHostname;
+
static {
try {
currentHostname = InetAddress.getLocalHost().getHostName();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
index 81d4aa5..ed1e66e 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
@@ -77,6 +77,7 @@ public class MaildirStore implements UidProvider, ModSeqProvider {
public String getMaildirLocation() {
return maildirLocation;
}
+
/**
* Create a {@link MaildirFolder} for a mailbox
* @param mailbox
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
index 482b892..69e7cd5 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
@@ -94,6 +94,7 @@ public class MailderMailboxMessageNameTest {
return args;
}
+
private static Object[] toObjectArray(Parts validName) {
return new Object[] { validName };
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
index 43ae025..1bfa6da 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
@@ -62,6 +62,7 @@ public class ResultUtils {
public void endHeader() {
parser.stop();
}
+
@Override
public void field(Field field) throws MimeException {
String fieldValue;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 e70a4d7..38491a1 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
@@ -122,6 +122,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
* later!</strong>
*/
protected static final Flags MINIMAL_PERMANET_FLAGS;
+
static {
MINIMAL_PERMANET_FLAGS = new Flags();
MINIMAL_PERMANET_FLAGS.add(Flags.Flag.ANSWERED);
@@ -778,13 +779,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
}
return copiedMessages;
}
- /**
- * Return the count of unseen messages
- *
- * @param session
- * @return count of unseen messages
- * @throws MailboxException
- */
+
protected long countUnseenMessagesInMailbox(MailboxSession session) throws MailboxException {
MessageMapper messageMapper = mapperFactory.getMessageMapper(session);
return messageMapper.countUnseenMessagesInMailbox(getMailboxEntity());
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
index ab82fe0..a7af41f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
@@ -36,6 +36,7 @@ public class MailboxAnnotationListener implements MailboxListener {
public MailboxAnnotationListener(MailboxSessionMapperFactory mailboxSessionMapperFactory) {
this.mailboxSessionMapperFactory = mailboxSessionMapperFactory;
}
+
@Override
public ListenerType getType() {
return ListenerType.EACH_NODE;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
index b840534..ab4521c 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
@@ -28,6 +28,7 @@ import org.apache.james.mailbox.model.MailboxPath;
*/
public interface Mailbox {
void setMailboxId(MailboxId id);
+
/**
* Gets the unique mailbox ID.
* @return mailbox id
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
index 0b2e742..4ba541b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
@@ -301,6 +301,7 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search
headerImpl.addField(Fields.to(Lists.newArrayList(addressList.iterator())));
}
}
+
private boolean matches(SearchQuery.ConjunctionCriterion criterion, MailboxMessage message,
final Collection<MessageUid> recentMessageUids) throws MailboxException {
final List<SearchQuery.Criterion> criteria = criterion.getCriteria();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
index 834ac2e..920b32b 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
@@ -61,8 +61,11 @@ public abstract class AbstractMailboxManagerAttachmentTest {
private AttachmentMapper attachmentMapper;
protected abstract MailboxManager getMailboxManager();
+
protected abstract MailboxManager getParseFailingMailboxManager();
+
protected abstract MailboxSessionMapperFactory getMailboxSessionMapperFactory();
+
protected abstract AttachmentMapperFactory getAttachmentMapperFactory();
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
index 14eb69d..d6e0e1a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
@@ -60,7 +60,9 @@ public abstract class AbstractMessageIdManagerQuotaTest {
protected abstract MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, CurrentQuotaManager currentQuotaManager) throws Exception;
protected abstract MaxQuotaManager createMaxQuotaManager();
+
protected abstract CurrentQuotaManager createCurrentQuotaManager();
+
protected abstract QuotaManager createQuotaManager(MaxQuotaManager maxQuotaManager, CurrentQuotaManager currentQuotaManager);
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
index 2249dae..8458679 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
@@ -72,9 +72,10 @@ public class SearchUtilsTest {
private Date getDate(int day, int month, int year) {
Calendar cal = getGMT();
- cal.set(year, month -1, day);
+ cal.set(year, month - 1, day);
return cal.getTime();
}
+
@Before
public void setUp() throws Exception {
recent = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
index 12eebc6..4a438d5 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
@@ -69,6 +69,7 @@ public class MessageUtilsTest {
messageUtils = new MessageUtils(mailboxSession, uidProvider, modSeqProvider);
message = new SimpleMailboxMessage(MESSAGE_ID, new Date(), CONTENT.length(), BODY_START, new SharedByteArrayInputStream(CONTENT.getBytes()), new Flags(), new PropertyBuilder(), mailbox.getMailboxId());
}
+
@Test
public void newInstanceShouldFailWhenNullUidProvider() {
expectedException.expect(NullPointerException.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
index 78179d3..2e56542 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
@@ -80,6 +80,7 @@ public class ListeningCurrentQuotaUpdaterTest {
testee.event(expunged);
verify(mockedCurrentQuotaManager).decrease(QUOTA_ROOT, 2, 2 * SIZE);
}
+
@Test
public void emptyExpungedEventShouldNotTriggerDecrease() throws Exception {
MailboxListener.Expunged expunged = mock(MailboxListener.Expunged.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
index f77dda9..c5aa4d3 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
@@ -27,7 +27,9 @@ import org.junit.Test;
public abstract class StoreCurrentQuotaManagerTest {
public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("benwa");
+
protected abstract StoreCurrentQuotaManager provideTestee();
+
private StoreCurrentQuotaManager testee;
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
index 2bbecde..97de20c 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
@@ -224,6 +224,7 @@ public abstract class AbstractMessageSearchIndexTest {
}
protected abstract void await();
+
protected abstract void initializeMailboxManager() throws Exception;
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
index fbde9fe..1697239 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
@@ -151,9 +151,7 @@ public class SMIMECheckSignature extends GenericMailet {
}
}
- /**
- * @see org.apache.mailet.Matcher#match(org.apache.mailet.Mail)
- */
+
public void service(Mail mail) throws MessagingException {
// I extract the MimeMessage from the mail object and I check if the
// mime type of the mail is one of the mime types that can contain a
@@ -161,7 +159,7 @@ public class SMIMECheckSignature extends GenericMailet {
MimeMessage message = mail.getMessage();
// strippedMessage will contain the signed content of the message
- MimeBodyPart strippedMessage =null;
+ MimeBodyPart strippedMessage = null;
List<SMIMESignerInfo> signers = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mdn/src/test/java/org/apache/james/mdn/action/mode/DispositionActionModeTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/action/mode/DispositionActionModeTest.java b/mdn/src/test/java/org/apache/james/mdn/action/mode/DispositionActionModeTest.java
index 219dff2..7913cec 100644
--- a/mdn/src/test/java/org/apache/james/mdn/action/mode/DispositionActionModeTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/action/mode/DispositionActionModeTest.java
@@ -41,6 +41,7 @@ public class DispositionActionModeTest {
assertThat(DispositionActionMode.fromString(DispositionActionMode.Manual.getValue()))
.contains(DispositionActionMode.Manual);
}
+
@Test
public void fromStringShouldNotBeCaseSensitive() {
assertThat(DispositionActionMode.fromString("autoMatic-action"))
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mdn/src/test/java/org/apache/james/mdn/sending/mode/DispositionSendingModeTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/sending/mode/DispositionSendingModeTest.java b/mdn/src/test/java/org/apache/james/mdn/sending/mode/DispositionSendingModeTest.java
index 8b0f185..9be6779 100644
--- a/mdn/src/test/java/org/apache/james/mdn/sending/mode/DispositionSendingModeTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/sending/mode/DispositionSendingModeTest.java
@@ -41,6 +41,7 @@ public class DispositionSendingModeTest {
assertThat(DispositionSendingMode.fromString(DispositionSendingMode.Manual.getValue()))
.contains(DispositionSendingMode.Manual);
}
+
@Test
public void fromStringShouldNotBeCaseSensitive() {
assertThat(DispositionSendingMode.fromString("mdn-sent-automatically"))
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/Runner.java b/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
index 0f94882..74b8f72 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
@@ -61,6 +61,7 @@ public class Runner {
public ProtocolInteractor getPreElements() {
return preElements;
}
+
/**
* Gets protocol session run on test.
* @return not null
@@ -92,6 +93,7 @@ public class Runner {
}
}
+
SessionContinuation continuation = new SessionContinuation();
Session[] sessions = new Session[testElements
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/core/src/main/java/org/apache/james/mpt/api/Monitor.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/Monitor.java b/mpt/core/src/main/java/org/apache/james/mpt/api/Monitor.java
index dd7a3a3..edc0fc9 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/api/Monitor.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/api/Monitor.java
@@ -25,6 +25,8 @@ package org.apache.james.mpt.api;
*/
public interface Monitor {
void note(String message);
+
void debug(char character);
+
void debug(String message);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
index acb37f0..43c4fc2 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
@@ -77,6 +77,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo
this.features = features;
this.userAdder = userAdder;
}
+
public boolean addUser(String user, String password) throws Exception {
if (userAdder == null) {
monitor.note("Please ensure user '" + user + "' with password '" + password + "' exists.");
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
index feed478..159113e 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
@@ -158,6 +158,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SELF extend
}
}
+
SessionContinuation continuation = new SessionContinuation();
Session[] sessions = new Session[testElements.getSessionCount()];
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java
index f29677a..a597742 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java
@@ -37,6 +37,7 @@ public abstract class ACLCommands implements ImapTestConstants {
public static final MailboxPath OTHER_USER_MAILBOX = MailboxPath.forUser(OTHER_USER_NAME, "");
protected abstract ImapHostSystem createImapHostSystem();
+
protected abstract GrantRightsOnHost createGrantRightsOnHost();
private ImapHostSystem system;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java
index e1d1fbf..c108a82 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java
@@ -37,7 +37,9 @@ public abstract class ACLIntegration implements ImapTestConstants {
public static final MailboxPath MY_INBOX = MailboxPath.forUser(USER, "");
protected abstract ImapHostSystem createImapHostSystem();
+
protected abstract GrantRightsOnHost createGrantRightsOnHost();
+
protected abstract MailboxMessageAppender createMailboxMessageAppender();
private ImapHostSystem system;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
index 939a5f0..95d86c3 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
@@ -133,6 +133,7 @@ public class HBaseHostSystem extends JamesImapHostSystem {
new DefaultImapEncoderFactory().buildImapEncoder(),
defaultImapProcessorFactory);
}
+
@Override
public void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
index 92e218f..7847e99 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
@@ -43,9 +43,11 @@ public class FileHostSystem extends JamesManageSieveHostSystem {
public File getBasedir() throws FileNotFoundException {
return new File(System.getProperty("java.io.tmpdir"));
}
+
public InputStream getResource(String url) throws IOException {
return new FileInputStream(getFile(url));
}
+
public File getFile(String fileURL) throws FileNotFoundException {
return new File(getBasedir(), fileURL.substring(FileSystem.FILE_PROTOCOL.length()));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
index 2539ec3..577cd4c 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
@@ -60,10 +60,7 @@ public class FutureResponseImpl implements FutureResponse {
}
}
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.protocols.api.FutureResponse#addListener(org.apache.james.protocols.api.FutureResponse.ResponseListener)
- */
+
public synchronized void addListener(ResponseListener listener) {
if (isReady()) {
listener.onResponse(this);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
index 24bcc9a..225b11d 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
@@ -223,6 +223,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
}
return responseFuture;
}
+
/**
* Parse the line into a {@link Request}
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 29c5bf9..1f6bf2e 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
@@ -126,6 +126,7 @@ public class AbstractProtocolTransportTest {
}).start();
}
+
private void checkWrittenResponses(List<Response> messages) throws InterruptedException, UnsupportedEncodingException {
final List<byte[]> writtenMessages = new ArrayList<>();
@@ -199,6 +200,7 @@ public class AbstractProtocolTransportTest {
checkBytesEquals(response.getLines().get(0).toString().getBytes(US_ASCII), writtenMessages.get(i));
}
}
+
private void checkBytesEquals(byte[] expected, byte[] received) throws UnsupportedEncodingException {
assertEquals("'" + new String(expected, US_ASCII) + "'=>'" + new String(received, US_ASCII) + "'", expected.length, received.length - 2);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
index 0c28c6c..a2a22e5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
@@ -50,6 +50,7 @@ public class MessageFlags {
public static final Flags ALL_FLAGS = new Flags();
+
static {
ALL_FLAGS.add(Flags.Flag.ANSWERED);
ALL_FLAGS.add(Flags.Flag.DELETED);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
index a476a5d..2f7a5e6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
@@ -254,6 +254,7 @@ public final class SearchKey {
public static SearchKey buildUnkeyword(String value) {
return new SearchKey(TYPE_UNKEYWORD, null, null, 0, null, value, null, null, -1, -1);
}
+
// ONE DATE
public static SearchKey buildYounger(long seconds) {
return new SearchKey(TYPE_YOUNGER, null, null, 0, null, null, null, null, seconds, -1);
@@ -332,6 +333,7 @@ public final class SearchKey {
public static SearchKey buildModSeq(long modSeq) {
return new SearchKey(TYPE_MODSEQ, null, null, 0, null, null, null, null, -1, modSeq);
}
+
private final int type;
private final DayMonthYear date;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchOperation.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchOperation.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchOperation.java
index 6da3f8a..44558b2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchOperation.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchOperation.java
@@ -36,6 +36,7 @@ public final class SearchOperation {
public SearchKey getSearchKey() {
return key;
}
+
public List<SearchResultOption> getResultOptions() {
return options;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 1e0e4dd..72fca0c 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
@@ -318,6 +318,7 @@ public interface StatusResponse extends ImapResponseMessage {
public static ResponseCode longestMetadataEntry(long entryLong) {
return new ResponseCode("METADATA LONGENTRIES", entryLong);
}
+
/**
* Create a RFC4551 <code>NOMODSEQ</code> response code
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
index 49330ff..0457a3f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
@@ -277,6 +277,7 @@ public abstract class ImapRequestLineReader {
return mailbox;
}
}
+
/**
* Reads one <code>date</code> argument from the request.
*
@@ -356,6 +357,7 @@ public abstract class ImapRequestLineReader {
}
return atom.toString();
}
+
private static boolean isWhitespace(char next) {
return (next == ' ' || next == '\n' || next == '\r' || next == '\t');
}
@@ -731,6 +733,7 @@ public abstract class ImapRequestLineReader {
}
return next;
}
+
/**
* Parse a range which use a ":" as delimiter
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 474e937..494d8b5 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
@@ -227,6 +227,7 @@ public abstract class AbstractSelectionCommandParser extends AbstractImapCommand
}
}
}
+
/**
* Create a new {@link AbstractMailboxSelectionRequest} for the given arguments
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
index b0dfbf2..31475f6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
@@ -522,6 +522,7 @@ public class SearchCommandParser extends AbstractUidCommandParser {
result = SearchKey.buildUnanswered();
return result;
}
+
private SearchKey younger(ImapRequestLineReader request) throws DecodingException {
final SearchKey result;
nextIsO(request);
@@ -534,6 +535,7 @@ public class SearchCommandParser extends AbstractUidCommandParser {
result = SearchKey.buildYounger(request.nzNumber());
return result;
}
+
private SearchKey older(ImapRequestLineReader request) throws DecodingException {
final SearchKey result;
nextIsR(request);
@@ -819,9 +821,11 @@ public class SearchCommandParser extends AbstractUidCommandParser {
private void nextIsX(ImapRequestLineReader request) throws DecodingException {
nextIs(request, 'X', 'x');
}
+
private void nextIsU(ImapRequestLineReader request) throws DecodingException {
nextIs(request, 'U', 'u');
}
+
private void nextIsO(ImapRequestLineReader request) throws DecodingException {
nextIs(request, 'O', 'o');
}
@@ -967,12 +971,7 @@ public class SearchCommandParser extends AbstractUidCommandParser {
}
return options;
}
- /**
- * @see
- * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand,
- * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
- * boolean, org.apache.james.imap.api.process.ImapSession)
- */
+
protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
try {
SearchKey recent = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java
index 086aa10..b4dedb5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaRootResponse.java
@@ -21,9 +21,7 @@ package org.apache.james.imap.message.response;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
-/**
- * Quota Root Response
- */
+
public class QuotaRootResponse implements ImapResponseMessage {
private final String quotaRoot;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 9eefdd4..08bef66 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
@@ -494,6 +494,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
}
return uid.get();
}
+
/**
* Format MessageRange to RANGE format applying selected folder min & max
* UIDs constraints
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
index b5705ed..ff079e4 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
@@ -27,7 +27,6 @@ import java.util.Date;
import javax.mail.Flags;
import org.apache.commons.io.IOUtils;
-import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapSessionUtils;
import org.apache.james.imap.api.display.HumanReadableText;
@@ -53,6 +52,8 @@ import org.apache.james.util.MDCBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
+
public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> {
private static final Logger LOGGER = LoggerFactory.getLogger(AppendProcessor.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 59a8bd1..ede2f0a 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
@@ -41,6 +41,7 @@ import com.google.common.collect.ImmutableList;
public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implements CapabilityImplementingProcessor {
private static final List<String> LOGINDISABLED_CAPS = ImmutableList.of("LOGINDISABLED");
+
public LoginProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
super(LoginRequest.class, next, mailboxManager, factory, metricFactory);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 b6586ac..e0c592e 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
@@ -369,6 +369,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp
return SearchQuery.all();
}
}
+
private Date createWithinDate(SearchKey key) {
long seconds = key.getSeconds();
long res = System.currentTimeMillis() - seconds * 1000;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
index a826515..99c8807 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
@@ -334,6 +334,7 @@ public final class FetchResponseBuilder {
}
return result;
}
+
private FetchResponse.BodyElement headers(MessageResult messageResult, String name, int[] path, boolean isBase) throws MailboxException {
if (isBase) {
// if its base we can just return the raw headers without parsing
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
index 77b7f74..4e468a8 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
@@ -384,6 +384,7 @@ public class SearchProcessorTest {
check(SearchKey.buildSentOn(DAY_MONTH_YEAR), SearchQuery.headerDateOn(
ImapConstants.RFC822_DATE, getDate(DAY, MONTH, YEAR), DateResolution.Day));
}
+
@Test
public void testSENTSINCE() throws Exception {
expectsGetSelectedMailbox();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
index c79e58e..7a57b26 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
@@ -107,6 +107,7 @@ public class SetAnnotationProcessorTest {
initAndMockData();
processor = new SetAnnotationProcessor(mockNextProcessor, mockMailboxManager, mockStatusResponseFactory, new NoopMetricFactory());
}
+
@After
public void tearDown() {
processor = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/ReceivedDataLineFilter.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/ReceivedDataLineFilter.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/ReceivedDataLineFilter.java
index f70b14f..bbaefbf 100644
--- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/ReceivedDataLineFilter.java
+++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/ReceivedDataLineFilter.java
@@ -28,6 +28,7 @@ import org.apache.james.protocols.smtp.SMTPSession;
public class ReceivedDataLineFilter extends org.apache.james.protocols.smtp.core.ReceivedDataLineFilter {
private static final String SERVICE_TYPE = "LMTP";
+
/**
* Always returns <code>LMTP</code>
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/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 b4167a7..f4452c3 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
@@ -44,6 +44,7 @@ public abstract class AbstractChannelPipelineFactory implements ChannelPipelineF
private final int timeout;
private final ExecutionHandler eHandler;
private final ChannelHandlerFactory frameHandlerFactory;
+
public AbstractChannelPipelineFactory(int timeout, int maxConnections, int maxConnectsPerIp, ChannelGroup channels) {
this(timeout, maxConnections, maxConnectsPerIp, channels, null, new LineDelimiterBasedChannelHandlerFactory(MAX_LINE_LENGTH));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java
index d6d38d9..7c79c55 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java
@@ -32,6 +32,7 @@ import org.jboss.netty.channel.group.ChannelGroup;
*/
public final class ChannelGroupHandler extends SimpleChannelUpstreamHandler {
private final ChannelGroup channels;
+
public ChannelGroupHandler(ChannelGroup channels) {
this.channels = channels;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
index a9f95c8..eab1314 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
@@ -86,6 +86,7 @@ public class ConnectionPerIpLimitUpstreamHandler extends SimpleChannelUpstreamHa
super.channelOpen(ctx, e);
}
+
@Override
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
if (maxConnectionsPerIp > 0) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
index ef3d0af..e253464 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
@@ -395,6 +395,7 @@ public abstract class AbstractPOP3ServerTest {
}
}
+
@Test
public void testDifferentStates() throws Exception {
ProtocolServer server = null;
@@ -475,6 +476,7 @@ public abstract class AbstractPOP3ServerTest {
}
}
+
private void checkMessage(Message message, Reader reader) throws IOException {
int read = 0;
int i = -1;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
index 86718d7..2571665 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
@@ -131,6 +131,7 @@ public class SMTPProtocolHandlerChain extends ProtocolHandlerChainImpl {
}
return true;
}
+
public boolean add(ProtocolHandler handler) {
checkForAuth(handler);
return super.add(handler);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
index b09bd7a..50928d5 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
@@ -32,6 +32,7 @@ public class SMTPResponse extends AbstractResponse {
protected SMTPResponse() {
}
+
/**
* Construct a new SMTPResponse. The given code and description can not be null, if null an IllegalArgumentException
* get thrown
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
index faa945b..f3d03de 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
@@ -259,9 +259,7 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
}
return null;
}
- /**
- * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface()
- */
+
protected Class<MailHook> getHookInterface() {
return MailHook.class;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
index e8a76f1..d2248cd 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
@@ -47,6 +47,7 @@ public class QuitCmdHandler extends AbstractHookableCmdHandler<QuitHook> {
private static final Collection<String> COMMANDS = ImmutableSet.of("QUIT");
private static final Response SYNTAX_ERROR;
+
static {
SMTPResponse response = new SMTPResponse(
SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
index 5bfd614..9932524 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
@@ -45,10 +45,7 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> {
private static final Collection<String> COMMANDS = ImmutableSet.of("RSET");
private static final Response OK = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS) + " OK").immutable();
private static final Response SYNTAX_ERROR = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG) + " Unexpected argument provided with RSET command").immutable();
- /**
- * handles RSET command
- *
- **/
+
public Response onCommand(SMTPSession session, Request request) {
return doRSET(session, request.getArgument());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
index 794cc5b..6f642e6 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
@@ -72,10 +72,7 @@ public class ValidSenderDomainHandlerTest {
public boolean isRelayingAllowed() {
return false;
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.protocols.api.ProtocolSession#setAttachment(java.lang.String, java.lang.Object, org.apache.james.protocols.api.ProtocolSession.State)
- */
+
public Object setAttachment(String key, Object value, State state) {
if (state == State.Connection) {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java
index cf75a12..74b2431 100644
--- a/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java
+++ b/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java
@@ -22,9 +22,10 @@ import java.io.ByteArrayInputStream;
import java.util.Enumeration;
import javax.mail.MessagingException;
import org.apache.mailet.base.RFC2822Headers;
-import static org.junit.Assert.assertEquals;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class MailHeadersTest {
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java
index ebd92d3..3a1ac42 100644
--- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java
+++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageWrapperTest.java
@@ -83,6 +83,7 @@ public class MimeMessageWrapperTest extends MimeMessageFromStreamTest {
}
}
}
+
TestableMimeMessageWrapper mw = null;
final String content = "Subject: foo\r\nContent-Transfer-Encoding2: plain";
final String sep = "\r\n\r\n";
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java
index 6a54a53..294a525 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java
@@ -45,6 +45,7 @@ public class GuiceProbeProviderTest {
guiceProbeProvider.getProbe(null);
}
+
@Test
public void getProbeShouldThrowRuntimeExceptionWhenEmpty() {
expectedException.expect(RuntimeException.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
index cba1469..c4344af 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
@@ -77,6 +77,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
public void setTimeout(long timeout) {
this.timeout = timeout;
}
+
public void setLookupBeanFactory(boolean lookupBeanFactory) {
this.lookupBeanFactory = lookupBeanFactory;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org