JAMES-2277 control flow should use blocks
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4c18f12f Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4c18f12f Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4c18f12f Branch: refs/heads/master Commit: 4c18f12f5f6074483af6ea86a87c297971a409ae Parents: fed9601 Author: Matthieu Baechler <[email protected]> Authored: Fri Dec 22 16:54:51 2017 +0100 Committer: Matthieu Baechler <[email protected]> Committed: Tue Jan 9 15:16:03 2018 +0100 ---------------------------------------------------------------------- .../model/PartContentDescriptorImpl.java | 25 ++-- .../apache/james/mailbox/model/SearchQuery.java | 15 ++- .../mailbox/caching/CachingMessageMapper.java | 3 +- .../caching/guava/GuavaCacheWrapper.java | 15 ++- .../org/apache/james/mailbox/hbase/HBaseId.java | 15 ++- .../mailbox/jcr/AbstractJCRScalingMapper.java | 3 +- .../org/apache/james/mailbox/jcr/JCRId.java | 15 ++- .../jcr/MailboxSessionJCRRepository.java | 7 +- .../mailbox/jcr/mail/JCRMessageMapper.java | 9 +- .../mailbox/jcr/mail/model/JCRMailbox.java | 19 +-- .../jcr/mail/model/JCRMailboxMessage.java | 39 +++--- .../mailbox/jcr/mail/model/JCRProperty.java | 39 +++--- .../mailbox/jcr/user/model/JCRSubscription.java | 29 +++-- .../org/apache/james/mailbox/jpa/JPAId.java | 12 +- .../mailbox/jpa/JPATransactionalMapper.java | 6 +- .../mailbox/jpa/mail/JPAMailboxMapper.java | 6 +- .../mailbox/jpa/mail/JPAMessageMapper.java | 9 +- .../mailbox/jpa/mail/model/JPAMailbox.java | 12 +- .../mailbox/jpa/mail/model/JPAProperty.java | 12 +- .../mailbox/jpa/mail/model/JPAUserFlag.java | 12 +- .../openjpa/AbstractJPAMailboxMessage.java | 15 ++- .../mailbox/jpa/user/model/JPASubscription.java | 12 +- .../mailbox/kafka/KafkaMessageConsumer.java | 8 +- .../mailbox/lucene/search/UpperCaseFilter.java | 6 +- .../james/mailbox/maildir/MaildirFolder.java | 102 ++++++++++------ .../apache/james/mailbox/maildir/MaildirId.java | 12 +- .../mailbox/maildir/MaildirMessageName.java | 64 ++++++---- .../james/mailbox/maildir/MaildirStore.java | 19 ++- .../maildir/mail/MaildirMailboxMapper.java | 44 ++++--- .../maildir/mail/MaildirMessageMapper.java | 27 +++-- .../mail/model/MaildirMailboxMessage.java | 18 ++- .../maildir/mail/model/MaildirMessage.java | 3 +- .../maildir/user/MaildirSubscriptionMapper.java | 18 ++- .../james/mailbox/inmemory/InMemoryId.java | 12 +- .../store/MailboxSessionMapperFactory.java | 15 ++- .../apache/james/mailbox/store/ResultUtils.java | 4 +- .../mailbox/store/SimpleMailboxMetaData.java | 15 ++- .../mailbox/store/StoreMailboxManager.java | 5 +- .../store/StoreMessageResultIterator.java | 5 +- .../store/mail/model/impl/SimpleProperty.java | 16 ++- .../james/mailbox/store/publisher/Topic.java | 4 +- .../store/streaming/CountingInputStream.java | 4 +- .../james/mailbox/store/MessageBuilder.java | 24 +++- .../indexer/events/FlagsMessageEvent.java | 4 +- .../indexer/events/MessageDeletedEvent.java | 4 +- .../mailbox/store/mail/ZooUidProviderTest.java | 30 +++-- .../apache/mailet/base/FlowedMessageUtils.java | 105 +++++++++++----- .../org/apache/mailet/base/StringUtils.java | 24 ++-- .../base/mail/AbstractDataContentHandler.java | 3 +- .../mail/message_disposition_notification.java | 11 +- .../mailet/base/mail/multipart_report.java | 5 +- .../apache/james/transport/KeyStoreHolder.java | 8 +- .../transport/mailets/SMIMECheckSignature.java | 34 ++++-- .../james/transport/mailets/SMIMEDecrypt.java | 8 +- .../transport/matcher/IsSMIMEEncrypted.java | 12 +- .../james/transport/matcher/IsSMIMESigned.java | 12 +- .../matcher/IsX509CertificateSubject.java | 5 +- .../james/transport/mailets/OnlyText.java | 52 +++++--- .../james/transport/mailets/UnwrapText.java | 46 ++++--- .../matchers/AbstractQuotaMatcher.java | 4 +- .../transport/matchers/FileRegexMatcher.java | 4 +- .../transport/matchers/GenericRegexMatcher.java | 26 ++-- .../matchers/HasHabeasWarrantMark.java | 7 +- .../matchers/HasMailAttributeWithValue.java | 9 +- .../apache/james/mpt/helper/ScriptBuilder.java | 6 +- .../protocol/FileProtocolSessionBuilder.java | 12 +- .../james/mpt/session/ExternalSession.java | 3 +- .../mpt/imapmailbox/jcr/host/JCRHostSystem.java | 4 +- .../james/protocols/api/AbstractResponse.java | 4 +- .../imap/api/display/HumanReadableText.java | 24 ++-- .../imap/api/message/BodyFetchElement.java | 39 ++++-- .../james/imap/api/message/FetchData.java | 42 ++++--- .../apache/james/imap/api/message/IdRange.java | 29 +++-- .../imap/api/message/request/DayMonthYear.java | 18 ++- .../api/message/response/StatusResponse.java | 27 +++-- .../imap/decode/ImapRequestLineReader.java | 11 +- .../imap/encode/StatusResponseEncoder.java | 10 +- .../request/AbstractMessageRangeRequest.java | 4 +- .../message/response/CapabilityResponse.java | 15 ++- .../imap/message/response/FlagsResponse.java | 15 ++- .../message/response/NamespaceResponse.java | 45 ++++--- .../imap/message/response/SearchResponse.java | 15 ++- .../processor/AbstractMailboxProcessor.java | 11 +- .../processor/fetch/FetchResponseBuilder.java | 8 +- .../imap/processor/fetch/MimePathImpl.java | 12 +- .../protocols/netty/AbstractAsyncServer.java | 28 +++-- .../james/protocols/netty/NettyServer.java | 12 +- .../james/protocols/smtp/MailEnvelopeImpl.java | 3 +- .../smtp/core/AbstractHookableCmdHandler.java | 24 ++-- .../smtp/core/esmtp/AuthCmdHandler.java | 18 ++- .../core/fastfail/AbstractGreylistHandler.java | 8 +- .../james/protocols/smtp/hook/HookResult.java | 16 ++- .../fastfail/ResolvableEhloHeloHandlerTest.java | 3 +- .../james/server/core/MimeMessageWrapper.java | 9 +- .../mailbox/MailboxCopierManagement.java | 3 +- .../MailRepositoryStoreBeanFactory.java | 3 +- ...erConfigurationBeanFactoryPostProcessor.java | 3 +- ...oxConfigurationBeanFactoryPostProcessor.java | 3 +- .../spring/lifecycle/LogProviderImpl.java | 3 +- ...AbstractOSGIAnnotationBeanPostProcessor.java | 20 +-- .../mailrepository/file/FileMailRepository.java | 13 +- .../mailrepository/file/MBoxMailRepository.java | 9 +- .../file/MimeMessageStreamRepositorySource.java | 3 +- .../james/user/file/UsersFileRepository.java | 3 +- .../jdbc/MimeMessageJDBCSource.java | 3 +- .../rrt/jdbc/JDBCRecipientRewriteTable.java | 3 +- .../user/jdbc/AbstractJdbcUsersRepository.java | 3 +- .../james/jmap/api/vacation/Vacation.java | 8 +- .../james/rrt/jpa/JPARecipientRewriteTable.java | 3 +- .../apache/james/user/jpa/model/JPAUser.java | 19 ++- .../user/ldap/ReadOnlyLDAPGroupRestriction.java | 3 +- .../user/ldap/ReadOnlyUsersLDAPRepository.java | 9 +- .../apache/james/mailrepository/lib/Lock.java | 4 +- .../repository/file/AbstractFileRepository.java | 3 +- .../file/FilePersistentObjectRepository.java | 6 +- .../rrt/lib/AbstractRecipientRewriteTable.java | 15 ++- .../rrt/lib/RecipientRewriteTableUtil.java | 3 +- .../user/lib/UsersRepositoryManagement.java | 9 +- .../dnsservice/dnsjava/DNSJavaService.java | 6 +- .../library/inetnetwork/InetNetworkBuilder.java | 3 +- .../lib/AbstractStateMailetProcessor.java | 12 +- .../impl/camel/CamelMailetProcessorTest.java | 3 +- .../mailets/AbstractRecipientRewriteTable.java | 3 +- .../james/transport/mailets/FromRepository.java | 3 +- .../james/transport/mailets/RemoteDelivery.java | 3 +- .../transport/mailets/jsieve/ActionUtils.java | 7 +- .../mailets/jsieve/SieveMailAdapter.java | 12 +- .../mailets/redirect/ProcessRedirectNotify.java | 4 +- .../mailets/remoteDelivery/MailDelivrer.java | 3 +- .../mailets/remoteDelivery/MessageComposer.java | 12 +- .../RemoteDeliverySocketFactory.java | 5 +- .../transport/matchers/InSpammerBlacklist.java | 3 +- .../org/apache/james/fetchmail/Account.java | 9 +- .../org/apache/james/fetchmail/FetchMail.java | 15 ++- .../apache/james/fetchmail/FolderProcessor.java | 14 ++- .../james/fetchmail/MessageProcessor.java | 121 ++++++++++++------- .../apache/james/fetchmail/StoreProcessor.java | 11 +- .../AbstractNettyImapRequestLineReader.java | 3 +- .../netty/ImapChannelUpstreamHandler.java | 6 +- .../imapserver/netty/NettyImapSession.java | 6 +- .../protocols/lib/ProtocolHandlerChainImpl.java | 6 +- .../netty/AbstractConfigurableAsyncServer.java | 3 +- .../apache/james/protocols/lib/PortUtil.java | 6 +- .../james/smtpserver/MailPriorityHandler.java | 6 +- .../fastfail/ValidSenderDomainHandler.java | 6 +- .../james/smtpserver/netty/SMTPServer.java | 13 +- .../james/smtpserver/SMTPTestConfiguration.java | 9 +- .../apache/james/queue/file/FileMailQueue.java | 8 +- 148 files changed, 1409 insertions(+), 708 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java index b93b728..013a897 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java @@ -19,6 +19,8 @@ package org.apache.james.mailbox.model; +import java.util.Objects; + import org.apache.james.mailbox.model.MessageResult.FetchGroup.PartContentDescriptor; import org.apache.james.mailbox.model.MessageResult.MimePath; @@ -53,26 +55,15 @@ public class PartContentDescriptorImpl implements PartContentDescriptor { } public int hashCode() { - final int PRIME = 31; - int result = 1; - result = PRIME * result + ((path == null) ? 0 : path.hashCode()); - return result; + return Objects.hash(path); } public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final PartContentDescriptor other = (PartContentDescriptor) obj; - if (path == null) { - if (other.path() != null) - return false; - } else if (!path.equals(other.path())) - return false; - return true; + if (obj instanceof PartContentDescriptorImpl) { + PartContentDescriptorImpl that = (PartContentDescriptorImpl) obj; + return Objects.equals(this.path, that.path); + } + return false; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 2c5463c..6c11b3a 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 @@ -791,8 +791,9 @@ public class SearchQuery implements Serializable { * @param sorts */ public void setSorts(List<Sort> sorts) { - if (sorts == null || sorts.isEmpty()) + if (sorts == null || sorts.isEmpty()) { throw new IllegalArgumentException("There must be at least one Sort"); + } this.sorts = sorts; } @@ -1931,15 +1932,19 @@ public class SearchQuery implements Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final InOperator other = (InOperator) obj; - if (!Arrays.equals(range, other.range)) + if (!Arrays.equals(range, other.range)) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java index 3224a50..b49db05 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java @@ -114,8 +114,9 @@ public class CachingMessageMapper implements MessageMapper { public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator calculator, MessageRange set) throws MailboxException { //check if there are in fact any updates - if (set.iterator().hasNext()) + if (set.iterator().hasNext()) { invalidateMetadata(mailbox); + } return underlying.updateFlags(mailbox, calculator, set); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java index 21aa550..d3da17e 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java @@ -17,12 +17,13 @@ public abstract class GuavaCacheWrapper<Key, Value, Underlying, KeyRepresentatio public Value get(Key key, Underlying underlying) throws Except { Value value = cache.getIfPresent(getKeyRepresentation(key)); - if (value != null) - return value; - else { + if (value != null) { + return value; + } else { value = load(key, underlying); - if (value != null) - cache.put(getKeyRepresentation(key), value); + if (value != null) { + cache.put(getKeyRepresentation(key), value); + } return value; } @@ -30,7 +31,9 @@ public abstract class GuavaCacheWrapper<Key, Value, Underlying, KeyRepresentatio public void invalidate(Key key) { if (key != null) //needed? - cache.invalidate(getKeyRepresentation(key)); + { + cache.invalidate(getKeyRepresentation(key)); + } } public abstract KeyRepresentation getKeyRepresentation(Key key); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java index 62ba95f..8442522 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java @@ -63,18 +63,23 @@ public class HBaseId implements MailboxId, Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } HBaseId other = (HBaseId) obj; if (id == null) { - if (other.id != null) + if (other.id != null) { return false; - } else if (!id.equals(other.id)) + } + } else if (!id.equals(other.id)) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 8d12404..9638b33 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 @@ -160,8 +160,9 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple "nt:unstructured"); // thats the last user node so add the right mixin type - if (a + 1 == userPathParts.length) + if (a + 1 == userPathParts.length) { parent.addMixin("jamesMailbox:user"); + } } return parent; http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java index 092edd6..bfb0a92 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java @@ -54,18 +54,23 @@ public class JCRId implements MailboxId, Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } JCRId other = (JCRId) obj; if (value == null) { - if (other.value != null) + if (other.value != null) { return false; - } else if (!value.equals(other.value)) + } + } else if (!value.equals(other.value)) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 2ca1f71..05dcfc3 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 @@ -79,13 +79,16 @@ public class MailboxSessionJCRRepository { * @param mSession */ public void logout(MailboxSession mSession) { - if (mSession == null) return; + if (mSession == null) { + return; + } Session session = (Session) mSession.getAttributes().remove(JCR_SESSION); if (session != null) { - if (session.isLive()) + if (session.isLive()) { session.logout(); + } session = null; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 f2bb7c8..f617723 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 @@ -563,8 +563,9 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo QueryManager manager = getSession().getWorkspace().getQueryManager(); Query query = manager.createQuery(queryString, XPATH_LANGUAGE); - if (batchSize > 0) + if (batchSize > 0) { query.setLimit(batchSize); + } QueryResult result = query.execute(); NodeIterator iterator = result.getNodes(); @@ -600,8 +601,9 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo QueryManager manager = getSession().getWorkspace().getQueryManager(); Query query = manager.createQuery(queryString, XPATH_LANGUAGE); - if (batchSize > 0) + if (batchSize > 0) { query.setLimit(batchSize); + } QueryResult result = query.execute(); NodeIterator iterator = result.getNodes(); @@ -619,8 +621,9 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo + JCRMailboxMessage.UID_PROPERTY; QueryManager manager = getSession().getWorkspace().getQueryManager(); Query query = manager.createQuery(queryString, XPATH_LANGUAGE); - if (batchSize > 0) + if (batchSize > 0) { query.setLimit(batchSize); + } QueryResult result = query.execute(); NodeIterator iterator = result.getNodes(); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 6534de1..efdb607 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 @@ -183,19 +183,24 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{ @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JCRMailbox other = (JCRMailbox) obj; if (getMailboxId() != null) { - if (!getMailboxId().equals(other.getMailboxId())) - return false; + if (!getMailboxId().equals(other.getMailboxId())) { + return false; + } } else { - if (other.getMailboxId() != null) - return false; + if (other.getMailboxId() != null) { + return false; + } } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 503e415..5db9a03 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 @@ -353,35 +353,44 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JCRMailboxMessage other = (JCRMailboxMessage) obj; if (getUUID() != null) { - if (!getUUID().equals(other.getUUID())) - return false; + if (!getUUID().equals(other.getUUID())) { + return false; + } } else { - if (other.getUUID() != null) - return false; + if (other.getUUID() != null) { + return false; + } } if (getMailboxId() != null) { - if (!getMailboxId().equals(other.getMailboxId())) - return false; + if (!getMailboxId().equals(other.getMailboxId())) { + return false; + } } else { - if (other.getMailboxId() != null) - return false; + if (other.getMailboxId() != null) { + return false; + } } if (getId() != null) { - if (!getId().equals(other.getId())) - return false; + if (!getId().equals(other.getId())) { + return false; + } } else { - if (other.getId() != null) - return false; + if (other.getId() != null) { + return false; + } } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 6024d2d..d3a00eb 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 @@ -180,34 +180,43 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JCRProperty other = (JCRProperty) obj; if (getLocalName() != null) { - if (!getLocalName().equals(other.getLocalName())) - return false; + if (!getLocalName().equals(other.getLocalName())) { + return false; + } } else { - if (other.getLocalName() != null) - return false; + if (other.getLocalName() != null) { + return false; + } } if (getNamespace() != null) { - if (!getNamespace().equals(other.getNamespace())) - return false; + if (!getNamespace().equals(other.getNamespace())) { + return false; + } } else { - if (other.getNamespace() != null) - return false; + if (other.getNamespace() != null) { + return false; + } } if (getValue() != null) { - if (!getValue().equals(other.getValue())) - return false; + if (!getValue().equals(other.getValue())) { + return false; + } } else { - if (other.getValue() != null) - return false; + if (other.getValue() != null) { + return false; + } } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 1ca0032..6dbf244 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 @@ -140,26 +140,33 @@ public class JCRSubscription implements Subscription, Persistent, JCRImapConstan @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JCRSubscription other = (JCRSubscription) obj; if (getUser() != null) { - if (!getUser().equals(other.getUser())) - return false; + if (!getUser().equals(other.getUser())) { + return false; + } } else { - if (other.getUser() != null) - return false; + if (other.getUser() != null) { + return false; + } } if (getMailbox() != null) { - if (!getMailbox().equals(other.getMailbox())) - return false; + if (!getMailbox().equals(other.getMailbox())) { + return false; + } } else { - if (other.getMailbox() != null) - return false; + if (other.getMailbox() != null) { + return false; + } } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java index 9047cd6..e0028b0 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java @@ -65,15 +65,19 @@ public class JPAId implements MailboxId, Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } JPAId other = (JPAId) obj; - if (value != other.value) + if (value != other.value) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java index 5f6b02a..2ec1fe7 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java @@ -45,8 +45,9 @@ public abstract class JPATransactionalMapper extends TransactionalMapper { * @return entitymanger */ public EntityManager getEntityManager() { - if (entityManager != null) + if (entityManager != null) { return entityManager; + } entityManager = entityManagerFactory.createEntityManager(); return entityManager; } @@ -89,8 +90,9 @@ public abstract class JPATransactionalMapper extends TransactionalMapper { */ public void endRequest() { if (entityManager != null) { - if (entityManager.isOpen()) + if (entityManager.isOpen()) { entityManager.close(); + } entityManager = null; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java index d3ba362..644dd3e 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java @@ -65,12 +65,14 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM try { getEntityManager().getTransaction().commit(); } catch (PersistenceException e) { - if (e instanceof EntityExistsException) + if (e instanceof EntityExistsException) { throw new MailboxExistsException(lastMailboxName); + } if (e instanceof RollbackException) { Throwable t = e.getCause(); - if (t != null && t instanceof EntityExistsException) + if (t != null && t instanceof EntityExistsException) { throw new MailboxExistsException(lastMailboxName); + } } throw new MailboxException("Commit of transaction failed", e); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java index 32d33e4..ea8b542 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java @@ -350,8 +350,9 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM Query query = getEntityManager().createNamedQuery("findMessagesInMailboxAfterUID") .setParameter("idParam", mailboxId.getRawId()).setParameter("uidParam", from.asLong()); - if (batchSize > 0) + if (batchSize > 0) { query.setMaxResults(batchSize); + } return query.getResultList(); } @@ -370,8 +371,9 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM .setParameter("idParam", mailboxId.getRawId()).setParameter("fromParam", from.asLong()) .setParameter("toParam", to.asLong()); - if (batchSize > 0) + if (batchSize > 0) { query.setMaxResults(batchSize); + } return query.getResultList(); } @@ -380,8 +382,9 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM private List<MailboxMessage> findMessagesInMailbox(JPAId mailboxId, int batchSize) { Query query = getEntityManager().createNamedQuery("findMessagesInMailbox").setParameter("idParam", mailboxId.getRawId()); - if (batchSize > 0) + if (batchSize > 0) { query.setMaxResults(batchSize); + } return query.getResultList(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 0ff88f2..3f216e4 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 @@ -178,15 +178,19 @@ public class JPAMailbox implements Mailbox { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JPAMailbox other = (JPAMailbox) obj; - if (mailboxId != other.mailboxId) + if (mailboxId != other.mailboxId) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java index 348a96e..f9d1c33 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java @@ -152,15 +152,19 @@ public class JPAProperty implements Property { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JPAProperty other = (JPAProperty) obj; - if (id != other.id) + if (id != other.id) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAUserFlag.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAUserFlag.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAUserFlag.java index b8a9279..0fa7872 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAUserFlag.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAUserFlag.java @@ -85,15 +85,19 @@ public class JPAUserFlag { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JPAUserFlag other = (JPAUserFlag) obj; - if (id != other.id) + if (id != other.id) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java index 164a11e..1ab9117 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java @@ -126,17 +126,22 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final MailboxIdUidKey other = (MailboxIdUidKey) obj; - if (mailbox != other.mailbox) + if (mailbox != other.mailbox) { return false; - if (uid != other.uid) + } + if (uid != other.uid) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java index eab9807..3ae2683 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java @@ -109,15 +109,19 @@ public class JPASubscription implements Subscription { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JPASubscription other = (JPASubscription) obj; - if (id != other.id) + if (id != other.id) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java ---------------------------------------------------------------------- diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java index 7f193dc..80a737b 100644 --- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java +++ b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java @@ -86,8 +86,12 @@ public class KafkaMessageConsumer implements MessageConsumer { @PreDestroy public void destroy() { - if (consumer != null) consumer.shutdown(); - if (executor != null) executor.shutdown(); + if (consumer != null) { + consumer.shutdown(); + } + if (executor != null) { + executor.shutdown(); + } this.isInitialized = false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/UpperCaseFilter.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/UpperCaseFilter.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/UpperCaseFilter.java index 8a8bf76..672bc52 100644 --- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/UpperCaseFilter.java +++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/UpperCaseFilter.java @@ -42,11 +42,13 @@ public final class UpperCaseFilter extends TokenFilter { final char[] buffer = termAtt.buffer(); final int length = termAtt.length(); - for (int i = 0; i < length; i++) + for (int i = 0; i < length; i++) { buffer[i] = Character.toUpperCase(buffer[i]); + } return true; - } else + } else { return false; + } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java index df71df6..4e421c1 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java @@ -224,13 +224,15 @@ public class MaildirFolder { FileReader fileReader = null; BufferedReader reader = null; try { - if (!uidList.exists()) + if (!uidList.exists()) { createUidFile(); + } fileReader = new FileReader(uidList); reader = new BufferedReader(fileReader); String line = reader.readLine(); - if (line != null) + if (line != null) { readUidListHeader(line); + } return null; } catch (IOException e) { throw new MailboxException("Unable to read last uid", e); @@ -249,8 +251,9 @@ public class MaildirFolder { * @throws IOException */ public long getUidValidity() throws IOException { - if (uidValidity == -1) + if (uidValidity == -1) { uidValidity = readUidValidity(); + } return uidValidity; } @@ -297,8 +300,9 @@ public class MaildirFolder { */ private void saveUidValidity(long uidValidity) throws IOException { File validityFile = new File(rootFolder, VALIDITY_FILE); - if (!validityFile.createNewFile()) + if (!validityFile.createNewFile()) { throw new IOException("Could not create file " + validityFile); + } FileOutputStream fos = new FileOutputStream(validityFile); try { fos.write(String.valueOf(uidValidity).getBytes()); @@ -410,8 +414,9 @@ public class MaildirFolder { SortedMap<MessageUid, MaildirMessageName> allUids = getUidMap(session, from, to); SortedMap<MessageUid, MaildirMessageName> filteredUids = new TreeMap<>(); for (Entry<MessageUid, MaildirMessageName> entry : allUids.entrySet()) { - if (filter.accept(null, entry.getValue().getFullName())) + if (filter.accept(null, entry.getValue().getFullName())) { filteredUids.put(entry.getKey(), entry.getValue()); + } } return filteredUids; } @@ -433,12 +438,14 @@ public class MaildirFolder { SortedMap<MessageUid, MaildirMessageName> allUids = getUidMap(session, MessageUid.MIN_VALUE, to); SortedMap<MessageUid, MaildirMessageName> filteredUids = new TreeMap<>(); int theLimit = limit; - if (limit < 1) + if (limit < 1) { theLimit = allUids.size(); + } int counter = 0; for (Entry<MessageUid, MaildirMessageName> entry : allUids.entrySet()) { - if (counter >= theLimit) + if (counter >= theLimit) { break; + } if (filter.accept(null, entry.getValue().getFullName())) { filteredUids.put(entry.getKey(), entry.getValue()); counter++; @@ -465,19 +472,22 @@ public class MaildirFolder { try { if (!uidList.isFile()) { - if (!uidList.createNewFile()) + if (!uidList.createNewFile()) { throw new IOException("Could not create file " + uidList); + } String[] curFiles = curFolder.list(); String[] newFiles = newFolder.list(); messageCount = curFiles.length + newFiles.length; String[] allFiles = ArrayUtils.addAll(curFiles, newFiles); - for (String file : allFiles) + for (String file : allFiles) { lines.add(String.valueOf(getNextUid().asLong()) + " " + file); + } PrintWriter pw = new PrintWriter(uidList); try { pw.println(createUidListHeader()); - for (String line : lines) - pw.println(line); + for (String line : lines) { + pw.println(line); + } } finally { IOUtils.closeQuietly(pw); } @@ -490,8 +500,9 @@ public class MaildirFolder { reader = new BufferedReader(fileReader); String line = reader.readLine(); // the first line in the file contains the next uid and message count - while ((line = reader.readLine()) != null) + while ((line = reader.readLine()) != null) { lines.add(line); + } } finally { IOUtils.closeQuietly(reader); IOUtils.closeQuietly(fileReader); @@ -543,19 +554,22 @@ public class MaildirFolder { File uidList = uidFile; PrintWriter pw = null; try { - if (!uidList.createNewFile()) + if (!uidList.createNewFile()) { throw new IOException("Could not create file " + uidList); + } lastUid = Optional.empty(); String[] curFiles = curFolder.list(); String[] newFiles = newFolder.list(); messageCount = curFiles.length + newFiles.length; String[] allFiles = (String[]) ArrayUtils.addAll(curFiles, newFiles); - for (String file : allFiles) + for (String file : allFiles) { uidMap.put(getNextUid(), newMaildirMessageName(MaildirFolder.this, file)); + } pw = new PrintWriter(uidList); pw.println(createUidListHeader()); - for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) + for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) { pw.println(String.valueOf(entry.getKey().asLong()) + " " + entry.getValue().getFullName()); + } } catch (IOException e) { throw new MailboxException("Unable to create uid file", e); } finally { @@ -580,8 +594,9 @@ public class MaildirFolder { reader = new BufferedReader(fileReader); String line = reader.readLine(); // the first line in the file contains the next uid and message count - if (line != null) + if (line != null) { readUidListHeader(line); + } int lineNumber = 1; // already read the first line while ((line = reader.readLine()) != null) { lineNumber++; @@ -600,14 +615,16 @@ public class MaildirFolder { for (String file : allFiles) { MaildirMessageName messageName = newMaildirMessageName(MaildirFolder.this, file); MessageUid uid = reverseUidMap.get(messageName.getBaseName()); - if (uid == null) + if (uid == null) { uid = getNextUid(); + } uidMap.put(uid, messageName); } pw = new PrintWriter(uidList); pw.println(createUidListHeader()); - for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) + for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) { pw.println(String.valueOf(entry.getKey().asLong()) + " " + entry.getValue().getFullName()); + } } catch (IOException e) { throw new MailboxException("Unable to update uid file", e); } finally { @@ -630,8 +647,9 @@ public class MaildirFolder { String line = reader.readLine(); // the first line in the file contains the next uid and message // count - if (line != null) + if (line != null) { readUidListHeader(line); + } int lineNumber = 1; // already read the first line while ((line = reader.readLine()) != null) { lineNumber++; @@ -674,10 +692,14 @@ public class MaildirFolder { */ private SortedMap<MessageUid, MaildirMessageName> truncateMap(Map<MessageUid, MaildirMessageName> map, MessageUid from, MessageUid to) { TreeMap<MessageUid, MaildirMessageName> sortedMap; - if (map instanceof TreeMap<?, ?>) sortedMap = (TreeMap<MessageUid, MaildirMessageName>) map; - else sortedMap = new TreeMap<>(map); - if (to != null) + if (map instanceof TreeMap<?, ?>) { + sortedMap = (TreeMap<MessageUid, MaildirMessageName>) map; + } else { + sortedMap = new TreeMap<>(map); + } + if (to != null) { return sortedMap.subMap(from, to.next()); + } return sortedMap.tailMap(from); } @@ -688,8 +710,9 @@ public class MaildirFolder { * @throws IOException */ private void readUidListHeader(String line) throws IOException { - if (line == null) + if (line == null) { throw new IOException("Header entry in uid-file is null"); + } int gap1 = line.indexOf(" "); if (gap1 == -1) { // there must be some issues in the file if no gap can be found @@ -697,8 +720,9 @@ public class MaildirFolder { } int version = Integer.valueOf(line.substring(0, gap1)); - if (version != 1) + if (version != 1) { throw new IOException("Cannot read uidlists with versions other than 1."); + } int gap2 = line.indexOf(" ", gap1 + 1); lastUid = Optional.of(MessageUid.of(Long.valueOf(line.substring(gap1 + 1, gap2)))); messageCount = Integer.valueOf(line.substring(gap2 + 1, line.length())); @@ -720,10 +744,12 @@ public class MaildirFolder { */ public static String stripMetaFromName(String fileName) { int end = fileName.indexOf(",S="); // the size - if (end == -1) + if (end == -1) { end = fileName.indexOf(":2,"); // the flags - if (end == -1) + } + if (end == -1) { return fileName; // there is no meta data to strip + } return fileName.substring(0, end); } @@ -746,23 +772,27 @@ public class MaildirFolder { reader = new BufferedReader(fileReader); String line = reader.readLine(); // the first line in the file contains the next uid and message count - if (line != null) + if (line != null) { readUidListHeader(line); + } ArrayList<String> lines = new ArrayList<>(); - while ((line = reader.readLine()) != null) + while ((line = reader.readLine()) != null) { lines.add(line); + } uid = getNextUid(); lines.add(String.valueOf(uid.asLong()) + " " + name); messageCount++; pw = new PrintWriter(uidList); pw.println(createUidListHeader()); - for (String entry : lines) + for (String entry : lines) { pw.println(entry); + } } else { // create the file - if (!uidList.createNewFile()) + if (!uidList.createNewFile()) { throw new IOException("Could not create file " + uidList); + } String[] curFiles = curFolder.list(); String[] newFiles = newFolder.list(); messageCount = curFiles.length + newFiles.length; @@ -772,13 +802,15 @@ public class MaildirFolder { MessageUid theUid = getNextUid(); lines.add(String.valueOf(theUid.asLong()) + " " + file); // the listed names already include the message to append - if (file.equals(name)) + if (file.equals(name)) { uid = theUid; + } } pw = new PrintWriter(uidList); pw.println(createUidListHeader()); - for (String line : lines) + for (String line : lines) { pw.println(line); + } } } catch (IOException e) { throw new MailboxException("Unable to append msg", e); @@ -823,8 +855,9 @@ public class MaildirFolder { } writer = new PrintWriter(uidList); writer.println(createUidListHeader()); - for (String entry : lines) + for (String entry : lines) { writer.println(entry); + } } catch (IOException e) { throw new MailboxException("Unable to update msg with uid " + uid, e); } finally { @@ -881,8 +914,9 @@ public class MaildirFolder { FileUtils.forceDelete(deletedMessage.getFile()); writer = new PrintWriter(uidList); writer.println(createUidListHeader()); - for (String entry : lines) + for (String entry : lines) { writer.println(entry); + } } return deletedMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java index 9a5d63d..69de83f 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java @@ -65,15 +65,19 @@ public class MaildirId implements MailboxId, Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } MaildirId other = (MaildirId) obj; - if (id != other.id) + if (id != other.id) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 0a9223e..8b2cc80 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 @@ -74,8 +74,9 @@ public class MaildirMessageName { private static String processName = ManagementFactory.getRuntimeMXBean().getName(); static { String[] parts = processName.split("@"); - if (parts.length > 1) + if (parts.length > 1) { processName = parts[0]; + } } /** @@ -125,8 +126,9 @@ public class MaildirMessageName { * @return true if the file or directory belonging to this {@link MaildirFolder} exists ; false otherwise */ public boolean exists() { - if (file != null && file.isFile()) + if (file != null && file.isFile()) { return true; + } File assumedFile1 = new File(parentFolder.getCurFolder(), fullName); if (assumedFile1.isFile()) { file = assumedFile1; @@ -183,10 +185,12 @@ public class MaildirMessageName { fullBuffer.append(uniqueString); fullBuffer.append("."); fullBuffer.append(hostname); - if (sizeString != null) + if (sizeString != null) { fullBuffer.append(sizeString); - if (flagsString != null) + } + if (flagsString != null) { fullBuffer.append(flagsString); + } fullName = fullBuffer.toString(); } return fullName; @@ -199,11 +203,12 @@ public class MaildirMessageName { * @throws FileNotFoundException If there is no file for the given name */ public File getFile() throws FileNotFoundException { - if (exists()) + if (exists()) { return file; - else + } else { throw new FileNotFoundException("There is no file for message name " + fullName - + " in mailbox " + parentFolder.getRootFile().getAbsolutePath()); + + " in mailbox " + parentFolder.getRootFile().getAbsolutePath()); + } } /** @@ -304,10 +309,12 @@ public class MaildirMessageName { public Flags getFlags() { if (flags == null) { split(); - if (flagsString == null) + if (flagsString == null) { return null; - if (flagsString.length() >= 3) + } + if (flagsString.length() >= 3) { flags = decodeFlags(flagsString.substring(3)); // skip the ":2," part + } } return flags; } @@ -319,10 +326,12 @@ public class MaildirMessageName { public Long getSize() { if (size == null) { split(); - if (sizeString == null) + if (sizeString == null) { return null; - if (!sizeString.startsWith(",S=")) + } + if (!sizeString.startsWith(",S=")) { return null; + } size = Long.valueOf(sizeString.substring(3)); // skip the ",S=" part } return size; @@ -335,8 +344,9 @@ public class MaildirMessageName { public Date getInternalDate() { if (internalDate == null) { split(); - if (timestamp == null) + if (timestamp == null) { return null; + } internalDate = new Date(Long.valueOf(timestamp) * 1000); } return internalDate; @@ -365,16 +375,21 @@ public class MaildirMessageName { */ public String encodeFlags(Flags flags) { StringBuilder localFlagsString = new StringBuilder(":2,"); - if (flags.contains(Flags.Flag.DRAFT)) + if (flags.contains(Flags.Flag.DRAFT)) { localFlagsString.append(FLAG_DRAFT); - if (flags.contains(Flags.Flag.FLAGGED)) + } + if (flags.contains(Flags.Flag.FLAGGED)) { localFlagsString.append(FLAG_FLAGGED); - if (flags.contains(Flags.Flag.ANSWERED)) + } + if (flags.contains(Flags.Flag.ANSWERED)) { localFlagsString.append(FLAG_ANSWERD); - if (flags.contains(Flags.Flag.SEEN)) + } + if (flags.contains(Flags.Flag.SEEN)) { localFlagsString.append(FLAG_SEEN); - if (flags.contains(Flags.Flag.DELETED)) + } + if (flags.contains(Flags.Flag.DELETED)) { localFlagsString.append(FLAG_DELETED); + } return localFlagsString.toString(); } @@ -386,16 +401,21 @@ public class MaildirMessageName { */ public Flags decodeFlags(String flagsString) { Flags localFlags = new Flags(); - if (flagsString.contains(FLAG_DRAFT)) + if (flagsString.contains(FLAG_DRAFT)) { localFlags.add(Flags.Flag.DRAFT); - if (flagsString.contains(FLAG_FLAGGED)) + } + if (flagsString.contains(FLAG_FLAGGED)) { localFlags.add(Flags.Flag.FLAGGED); - if (flagsString.contains(FLAG_ANSWERD)) + } + if (flagsString.contains(FLAG_ANSWERD)) { localFlags.add(Flags.Flag.ANSWERED); - if (flagsString.contains(FLAG_SEEN)) + } + if (flagsString.contains(FLAG_SEEN)) { localFlags.add(Flags.Flag.SEEN); - if (flagsString.contains(FLAG_DELETED)) + } + if (flagsString.contains(FLAG_DELETED)) { localFlags.add(Flags.Flag.DELETED); + } return localFlags; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 2cb9402..81d4aa5 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 @@ -113,8 +113,9 @@ public class MaildirStore implements UidProvider, ModSeqProvider { throws MailboxNotFoundException, MailboxException { MaildirFolder folder = new MaildirFolder(getFolderName(mailboxPath), mailboxPath, locker); folder.setMessageNameStrictParse(isMessageNameStrictParse()); - if (!folder.exists()) + if (!folder.exists()) { throw new MailboxNotFoundException(mailboxPath); + } return loadMailbox(session, folder.getRootFile(), mailboxPath); } @@ -165,8 +166,9 @@ public class MaildirStore implements UidProvider, ModSeqProvider { public File getMailboxRootForUser(String user) throws MailboxException { String path = userRoot(user); File root = new File(path); - if (!root.isDirectory()) + if (!root.isDirectory()) { throw new MailboxException("Unable to load Mailbox for user " + user); + } return root; } @@ -193,10 +195,13 @@ public class MaildirStore implements UidProvider, ModSeqProvider { */ public String getMailboxNameFromFolderName(String folderName) { String mName; - if (folderName.equals("")) mName = MailboxConstants.INBOX; - else + if (folderName.equals("")) { + mName = MailboxConstants.INBOX; + } else // remove leading dot + { mName = folderName.substring(1); + } // they are equal, anyways, this might change someday... //if (maildirDelimiter != MailboxConstants.DEFAULT_DELIMITER_STRING) // mName = mName.replace(maildirDelimiter, MailboxConstants.DEFAULT_DELIMITER_STRING); @@ -213,11 +218,13 @@ public class MaildirStore implements UidProvider, ModSeqProvider { public String getFolderName(String namespace, String user, String name) { String root = userRoot(user); // if INBOX => location == maildirLocation - if (name.equals(MailboxConstants.INBOX)) + if (name.equals(MailboxConstants.INBOX)) { return root; + } StringBuilder folder = new StringBuilder(root); - if (!root.endsWith(File.pathSeparator)) + if (!root.endsWith(File.pathSeparator)) { folder.append(File.separator); + } folder.append("."); folder.append(name); return folder.toString(); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java index 93983c0..84ce750 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java @@ -92,8 +92,9 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail delete(folder); } } - else + else { throw new MailboxNotFoundException(mailbox.generateAssociatedPath()); + } } private void delete(File...files) { @@ -138,11 +139,12 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail File root = maildirStore.getMailboxRootForUser(mailboxPath.getUser()); File[] folders = root.listFiles(filter); ArrayList<Mailbox> mailboxList = new ArrayList<>(); - for (File folder : folders) + for (File folder : folders) { if (folder.isDirectory()) { Mailbox mailbox = maildirStore.loadMailbox(session, root, mailboxPath.getNamespace(), mailboxPath.getUser(), folder.getName()); mailboxList.add(cacheMailbox(mailbox)); } + } // INBOX is in the root of the folder if (Pattern.matches(mailboxPath.getName().replace(MaildirStore.WILDCARD, ".*"), MailboxConstants.INBOX)) { Mailbox mailbox = maildirStore.loadMailbox(session, root, mailboxPath.getNamespace(), mailboxPath.getUser(), ""); @@ -172,8 +174,9 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail MaildirFolder folder = maildirStore.createMaildirFolder(mailbox); // equals with null check if (originalMailbox.getName() == null ? mailbox.getName() != null : !originalMailbox.getName().equals(mailbox.getName())) { - if (folder.exists()) + if (folder.exists()) { throw new MailboxExistsException(mailbox.getName()); + } MaildirFolder originalFolder = maildirStore.createMaildirFolder(originalMailbox); // renaming the INBOX means to move its contents to the new folder @@ -182,20 +185,25 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail File inboxFolder = originalFolder.getRootFile(); File newFolder = folder.getRootFile(); FileUtils.forceMkdir(newFolder); - if (!originalFolder.getCurFolder().renameTo(folder.getCurFolder())) + if (!originalFolder.getCurFolder().renameTo(folder.getCurFolder())) { throw new IOException("Could not rename folder " + originalFolder.getCurFolder() + " to " + folder.getCurFolder()); - if (!originalFolder.getNewFolder().renameTo(folder.getNewFolder())) + } + if (!originalFolder.getNewFolder().renameTo(folder.getNewFolder())) { throw new IOException("Could not rename folder " + originalFolder.getNewFolder() + " to " + folder.getNewFolder()); - if (!originalFolder.getTmpFolder().renameTo(folder.getTmpFolder())) + } + if (!originalFolder.getTmpFolder().renameTo(folder.getTmpFolder())) { throw new IOException("Could not rename folder " + originalFolder.getTmpFolder() + " to " + folder.getTmpFolder()); + } File oldUidListFile = new File(inboxFolder, MaildirFolder.UIDLIST_FILE); File newUidListFile = new File(newFolder, MaildirFolder.UIDLIST_FILE); - if (!oldUidListFile.renameTo(newUidListFile)) + if (!oldUidListFile.renameTo(newUidListFile)) { throw new IOException("Could not rename file " + oldUidListFile + " to " + newUidListFile); + } File oldValidityFile = new File(inboxFolder, MaildirFolder.VALIDITY_FILE); File newValidityFile = new File(newFolder, MaildirFolder.VALIDITY_FILE); - if (!oldValidityFile.renameTo(newValidityFile)) + if (!oldValidityFile.renameTo(newValidityFile)) { throw new IOException("Could not rename file " + oldValidityFile + " to " + newValidityFile); + } // recreate the INBOX folders, uidvalidity and uidlist will // automatically be recreated later FileUtils.forceMkdir(originalFolder.getCurFolder()); @@ -206,9 +214,10 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail } } else { - if (!originalFolder.getRootFile().renameTo(folder.getRootFile())) - throw new MailboxException("Failed to save Mailbox " + mailbox, - new IOException("Could not rename folder " + originalFolder)); + if (!originalFolder.getRootFile().renameTo(folder.getRootFile())) { + throw new MailboxException("Failed to save Mailbox " + mailbox, + new IOException("Could not rename folder " + originalFolder)); + } } } folder.setACL(session, mailbox.getACL()); @@ -217,14 +226,18 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail MaildirFolder folder = maildirStore.createMaildirFolder(mailbox); if (!folder.exists()) { boolean success = folder.getRootFile().exists(); - if (!success) success = folder.getRootFile().mkdirs(); - if (!success) + if (!success) { + success = folder.getRootFile().mkdirs(); + } + if (!success) { throw new MailboxException("Failed to save Mailbox " + mailbox); + } success = folder.getCurFolder().mkdir(); success = success && folder.getNewFolder().mkdir(); success = success && folder.getTmpFolder().mkdir(); - if (!success) + if (!success) { throw new MailboxException("Failed to save Mailbox " + mailbox, new IOException("Needed folder structure can not be created")); + } } try { @@ -291,8 +304,9 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail * @throws MailboxNotFoundException If the mailboxId is not in the cache */ private Mailbox getCachedMailbox(MaildirId mailboxId) throws MailboxNotFoundException { - if (mailboxId == null) + if (mailboxId == null) { throw new MailboxNotFoundException("null"); + } try { return mailboxCache.get(mailboxId.getRawId()); } catch (IndexOutOfBoundsException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 6edbe6c..bc502aa 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 @@ -72,9 +72,10 @@ public class MaildirMessageMapper extends AbstractMessageMapper { File curFolder = folder.getCurFolder(); File[] newFiles = newFolder.listFiles(); File[] curFiles = curFolder.listFiles(); - if (newFiles == null || curFiles == null) + if (newFiles == null || curFiles == null) { throw new MailboxException("Unable to count messages in Mailbox " + mailbox, new IOException( - "Not a valid Maildir folder: " + maildirStore.getFolderName(mailbox))); + "Not a valid Maildir folder: " + maildirStore.getFolderName(mailbox))); + } return newFiles.length + curFiles.length; } @@ -85,9 +86,10 @@ public class MaildirMessageMapper extends AbstractMessageMapper { File curFolder = folder.getCurFolder(); String[] unseenMessages = curFolder.list(MaildirMessageName.FILTER_UNSEEN_MESSAGES); String[] newUnseenMessages = newFolder.list(MaildirMessageName.FILTER_UNSEEN_MESSAGES); - if (newUnseenMessages == null || unseenMessages == null) + if (newUnseenMessages == null || unseenMessages == null) { throw new MailboxException("Unable to count unseen messages in Mailbox " + mailbox, new IOException( - "Not a valid Maildir folder: " + maildirStore.getFolderName(mailbox))); + "Not a valid Maildir folder: " + maildirStore.getFolderName(mailbox))); + } return newUnseenMessages.length + unseenMessages.length; } @@ -293,14 +295,16 @@ public class MaildirMessageMapper extends AbstractMessageMapper { FileOutputStream fos = null; InputStream input = null; try { - if (!messageFile.createNewFile()) + if (!messageFile.createNewFile()) { throw new IOException("Could not create file " + messageFile); + } fos = new FileOutputStream(messageFile); input = message.getFullContent(); byte[] b = new byte[BUF_SIZE]; int len = 0; - while ((len = input.read(b)) != -1) + while ((len = input.read(b)) != -1) { fos.write(b, 0, len); + } } catch (IOException ioe) { throw new MailboxException("Failure while save MailboxMessage " + message + " in Mailbox " + mailbox, ioe); } finally { @@ -375,18 +379,20 @@ public class MaildirMessageMapper extends AbstractMessageMapper { int cur = 0; SortedMap<MessageUid, MaildirMessageName> uidMap = null; try { - if (filter != null) + if (filter != null) { uidMap = folder.getUidMap(mailboxSession, filter, from, to); - else + } else { uidMap = folder.getUidMap(mailboxSession, from, to); + } ArrayList<MailboxMessage> messages = new ArrayList<>(); for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) { messages.add(new MaildirMailboxMessage(mailbox, entry.getKey(), entry.getValue())); if (max != -1) { cur++; - if (cur >= max) + if (cur >= max) { break; + } } } return messages; @@ -403,8 +409,9 @@ public class MaildirMessageMapper extends AbstractMessageMapper { SortedMap<MessageUid, MaildirMessageName> uidMap = folder.getUidMap(mailboxSession, filter, limit); ArrayList<MailboxMessage> filtered = new ArrayList<>(uidMap.size()); - for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) + for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) { filtered.add(new MaildirMailboxMessage(mailbox, entry.getKey(), entry.getValue())); + } return filtered; } catch (IOException e) { throw new MailboxException("Failure while search for Messages in Mailbox " + mailbox, e); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailboxMessage.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailboxMessage.java index 4bb9227..dffa385 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailboxMessage.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailboxMessage.java @@ -62,8 +62,9 @@ public class MaildirMailboxMessage extends DelegatingMailboxMessage { } else { // if the message resist in the new folder its RECENT if (file.getParentFile().getName().equals(MaildirFolder.NEW)) { - if (flags == null) + if (flags == null) { flags = new Flags(); + } flags.add(Flags.Flag.RECENT); } } @@ -163,16 +164,21 @@ public class MaildirMailboxMessage extends DelegatingMailboxMessage { theString.append(getUid()); theString.append(" {"); Flags flags = createFlags(); - if (flags.contains(Flags.Flag.DRAFT)) + if (flags.contains(Flags.Flag.DRAFT)) { theString.append(MaildirMessageName.FLAG_DRAFT); - if (flags.contains(Flags.Flag.FLAGGED)) + } + if (flags.contains(Flags.Flag.FLAGGED)) { theString.append(MaildirMessageName.FLAG_FLAGGED); - if (flags.contains(Flags.Flag.ANSWERED)) + } + if (flags.contains(Flags.Flag.ANSWERED)) { theString.append(MaildirMessageName.FLAG_ANSWERD); - if (flags.contains(Flags.Flag.SEEN)) + } + if (flags.contains(Flags.Flag.SEEN)) { theString.append(MaildirMessageName.FLAG_SEEN); - if (flags.contains(Flags.Flag.DELETED)) + } + if (flags.contains(Flags.Flag.DELETED)) { theString.append(MaildirMessageName.FLAG_DELETED); + } theString.append("} "); theString.append(getInternalDate()); return theString.toString(); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java index 3ca4267..a84f3cb 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java @@ -62,8 +62,9 @@ public class MaildirMessage implements Message { * Parse message if needed */ private synchronized void parseMessage() { - if (parsed) + if (parsed) { return; + } SharedFileInputStream tmpMsgIn = null; try { tmpMsgIn = new SharedFileInputStream(messageName.getFile()); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java index 03854b6..607f8c8 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java @@ -90,8 +90,9 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements } catch (IOException e) { throw new SubscriptionException(e); } - if (subscriptionNames.contains(mailbox)) + if (subscriptionNames.contains(mailbox)) { return new SimpleSubscription(user, mailbox); + } return null; } @@ -170,19 +171,24 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements private void writeSubscriptions(File mailboxFolder, Set<String> subscriptions) throws IOException { List<String> sortedSubscriptions = new ArrayList<>(subscriptions); Collections.sort(sortedSubscriptions); - if (!mailboxFolder.exists()) - if (!mailboxFolder.mkdirs()) + if (!mailboxFolder.exists()) { + if (!mailboxFolder.mkdirs()) { throw new IOException("Could not create folder " + mailboxFolder); + } + } File subscriptionFile = new File(mailboxFolder, FILE_SUBSCRIPTION); - if (!subscriptionFile.exists()) - if (!subscriptionFile.createNewFile()) + if (!subscriptionFile.exists()) { + if (!subscriptionFile.createNewFile()) { throw new IOException("Could not create file " + subscriptionFile); + } + } FileWriter fileWriter = new FileWriter(subscriptionFile); PrintWriter writer = new PrintWriter(fileWriter); - for (String subscription : sortedSubscriptions) + for (String subscription : sortedSubscriptions) { writer.println(subscription); + } writer.close(); fileWriter.close(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
