JAMES-2277 put block start curly brace on the flow instruction line
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6de88236 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6de88236 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6de88236 Branch: refs/heads/master Commit: 6de88236e331cb3f2fdba0d967e371dd0fa64856 Parents: 2239fbb Author: Matthieu Baechler <[email protected]> Authored: Tue Dec 26 18:05:03 2017 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Jan 10 10:45:40 2018 +0100 ---------------------------------------------------------------------- .../caching/guava/GuavaCacheWrapper.java | 3 +- .../james/mailbox/maildir/MaildirStore.java | 5 +- .../mailbox/store/StoreMailboxManager.java | 4 +- .../store/mail/model/impl/PropertyBuilder.java | 3 +- .../store/mail/model/impl/SimpleProperty.java | 3 +- .../store/MailboxMessageResultImplTest.java | 33 ++---- .../matchers/HasHabeasWarrantMark.java | 9 +- .../main/java/org/apache/james/mpt/Runner.java | 3 +- .../james/mpt/user/ScriptedUserAdder.java | 6 +- .../org/apache/james/mpt/DiscardProtocol.java | 28 ++--- .../protocols/lmtp/AbstractLMTPSServerTest.java | 6 +- .../protocols/lmtp/AbstractLMTPServerTest.java | 6 +- .../managesieve/api/ManageSieveException.java | 3 +- .../james/util/retry/DoublingRetrySchedule.java | 3 +- .../james/util/retry/ExceptionRetryHandler.java | 12 +-- .../naming/NamingExceptionRetryHandler.java | 3 +- .../api/exception/QuotaExceededException.java | 3 +- .../user/ldap/ReadOnlyUsersLDAPRepository.java | 9 +- .../transport/mailets/jsieve/ActionUtils.java | 9 +- .../transport/mailets/jsieve/KeepAction.java | 3 +- .../mailets/jsieve/RedirectAction.java | 3 +- .../transport/mailets/jsieve/RejectAction.java | 20 ++-- .../mailets/jsieve/SieveMailAdapter.java | 107 ++++++------------- 23 files changed, 92 insertions(+), 192 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/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 5160540..4390b2e 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 @@ -30,8 +30,7 @@ public abstract class GuavaCacheWrapper<Key, Value, Underlying, KeyRepresentatio } public void invalidate(Key key) { - if (key != null) //needed? - { + if (key != null) { //needed? cache.invalidate(getKeyRepresentation(key)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/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 ed1e66e..f7a2d8d 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 @@ -198,9 +198,8 @@ public class MaildirStore implements UidProvider, ModSeqProvider { String mName; if (folderName.equals("")) { mName = MailboxConstants.INBOX; - } else - // remove leading dot - { + } else { + // remove leading dot mName = folderName.substring(1); } // they are equal, anyways, this might change someday... http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index b321e13..a48e18f 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -498,9 +498,7 @@ public class StoreMailboxManager implements MailboxManager { // If any creation fails then the mailbox will not be created // TODO: transaction List<MailboxId> mailboxIds = new ArrayList<>(); - for (MailboxPath mailbox : sanitizedMailboxPath.getHierarchyLevels(getDelimiter())) - - { + for (MailboxPath mailbox : sanitizedMailboxPath.getHierarchyLevels(getDelimiter())) { locker.executeWithLock(mailboxSession, mailbox, (LockAwareExecution<Void>) () -> { if (!mailboxExists(mailbox, mailboxSession)) { Mailbox m = doCreateMailbox(mailbox, mailboxSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java index 78670b4..f25ebec 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java @@ -474,8 +474,7 @@ public class PropertyBuilder { * @return a <code>String</code> representation * of this object. */ - public String toString() - { + public String toString() { return "PropertyBuilder ( " + " textualLineCount = " + this.textualLineCount + " properties = " + this.properties http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java index a137951..f5252f8 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java @@ -91,8 +91,7 @@ public final class SimpleProperty implements Property { * @return a <code>String</code> representation * of this object. */ - public String toString() - { + public String toString() { return "SimpleProperty(" + "namespace='" + this.namespace + "' localName='" + this.localName http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java index 28563c2..3510206 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java @@ -40,8 +40,7 @@ public class MailboxMessageResultImplTest { * Initialize name instances */ @Before - public void initNames() throws Exception - { + public void initNames() throws Exception { Date dateAB = new Date(); MailboxMessage msgA = buildMessage(MessageUid.of(100), dateAB); MailboxMessage msgB = buildMessage(MessageUid.of(100), dateAB); @@ -63,52 +62,45 @@ public class MailboxMessageResultImplTest { @Test - public void testEqualsNull() throws Exception - { + public void testEqualsNull() throws Exception { assertFalse(msgResultA.equals(null)); } @Test - public void testEqualsReflexive() throws Exception - { + public void testEqualsReflexive() throws Exception { assertEquals(msgResultA, msgResultA); } @Test - public void testCompareToReflexive() throws Exception - { + public void testCompareToReflexive() throws Exception { assertEquals(0, msgResultA.compareTo(msgResultA)); } @Test - public void testHashCodeReflexive() throws Exception - { + public void testHashCodeReflexive() throws Exception { assertEquals(msgResultA.hashCode(), msgResultA.hashCode()); } @Test - public void testEqualsSymmetric() throws Exception - { + public void testEqualsSymmetric() throws Exception { assertEquals(msgResultA, msgResultACopy); assertEquals(msgResultACopy, msgResultA); } @Test - public void testHashCodeSymmetric() throws Exception - { + public void testHashCodeSymmetric() throws Exception { assertEquals(msgResultA.hashCode(), msgResultACopy.hashCode()); assertEquals(msgResultACopy.hashCode(), msgResultA.hashCode()); } @Test - public void testEqualsTransitive() throws Exception - { + public void testEqualsTransitive() throws Exception { assertEquals(msgResultA, msgResultACopy); assertEquals(msgResultACopy, msgResultB); assertEquals(msgResultA, msgResultB); @@ -116,8 +108,7 @@ public class MailboxMessageResultImplTest { @Test - public void testCompareToTransitive() throws Exception - { + public void testCompareToTransitive() throws Exception { assertEquals(0, msgResultA.compareTo(msgResultACopy)); assertEquals(0, msgResultACopy.compareTo(msgResultB)); assertEquals(0, msgResultA.compareTo(msgResultB)); @@ -125,8 +116,7 @@ public class MailboxMessageResultImplTest { @Test - public void testHashCodeTransitive() throws Exception - { + public void testHashCodeTransitive() throws Exception { assertEquals(msgResultA.hashCode(), msgResultACopy.hashCode()); assertEquals(msgResultACopy.hashCode(), msgResultB.hashCode()); assertEquals(msgResultA.hashCode(), msgResultB.hashCode()); @@ -134,8 +124,7 @@ public class MailboxMessageResultImplTest { @Test - public void testNotEqualDiffValue() throws Exception - { + public void testNotEqualDiffValue() throws Exception { assertFalse(msgResultA.equals(msgResultC)); assertFalse(msgResultC.equals(msgResultA)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java index 3588e74..8ee224e 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java @@ -71,8 +71,7 @@ import org.slf4j.LoggerFactory; * </pre> */ @Experimental -public class HasHabeasWarrantMark extends GenericMatcher -{ +public class HasHabeasWarrantMark extends GenericMatcher { private static final Logger LOGGER = LoggerFactory.getLogger(HasHabeasWarrantMark.class); public static final String[][] warrantMark = @@ -88,8 +87,7 @@ public class HasHabeasWarrantMark extends GenericMatcher { "X-Habeas-SWE-9", "mark in spam to <http://www.habeas.com/report/>." }, }; - public Collection<MailAddress> match(Mail mail) throws MessagingException - { + public Collection<MailAddress> match(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); //Loop through all the patterns @@ -127,8 +125,7 @@ public class HasHabeasWarrantMark extends GenericMatcher * @return a String containing matcher information */ - public String getMatcherInfo() - { + public String getMatcherInfo() { return "Habeas Warrant Mark Matcher (see http://www.habeas.com for details)."; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/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 74b8f72..3af348e 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 @@ -124,8 +124,7 @@ public class Runner { * @return a <code>String</code> representation * of this object. */ - public String toString() - { + public String toString() { final String TAB = " "; return "Runner ( " http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java index 6732cc8..1630160 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java @@ -51,8 +51,7 @@ public class ScriptedUserAdder implements UserAdder { * @param host connect to this host * @param port connect to this port */ - public ScriptedUserAdder(String host, int port) - { + public ScriptedUserAdder(String host, int port) { this(host, port, (String) null); } @@ -114,8 +113,7 @@ public class ScriptedUserAdder implements UserAdder { * @return a <code>String</code> representation * of this object. */ - public String toString() - { + public String toString() { final String TAB = " "; return "ScriptedUserAdder ( " http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java index a731b01..1d4b3f4 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java @@ -76,8 +76,7 @@ public class DiscardProtocol { * @throws IllegalStateException when already started */ public void start() throws IOException { - synchronized (queue) - { + synchronized (queue) { if (socket == null) { socket = ServerSocketChannel.open(); socket.socket().bind(new InetSocketAddress(0)); @@ -99,8 +98,7 @@ public class DiscardProtocol { } public Record recordNext() { - synchronized (queue) - { + synchronized (queue) { Server server = new Server(); queue.add(server); return server; @@ -108,8 +106,7 @@ public class DiscardProtocol { } private void abort() { - synchronized (queue) - { + synchronized (queue) { stop(); for (Server server: queue) { server.abort(); @@ -119,8 +116,7 @@ public class DiscardProtocol { } public void stop() { - synchronized (queue) - { + synchronized (queue) { try { if (socket != null) { if (socket.isOpen()) { @@ -139,8 +135,7 @@ public class DiscardProtocol { private final class SocketMonitor implements Runnable { public void run() { - try - { + try { long lastConnection = System.currentTimeMillis(); while (socket != null) { final SocketChannel socketChannel = socket.accept(); @@ -215,14 +210,10 @@ public class DiscardProtocol { } public void run() { - try - { - if (socketChannel == null) - { + try { + if (socketChannel == null) { LOG.fatal("Socket channel must be set before instance is run."); - } - else - { + } else { try { while (!socketChannel.finishConnect()) { Thread.sleep(SOCKET_CONNECTION_WAIT_MILLIS); @@ -250,8 +241,7 @@ public class DiscardProtocol { } } } finally { - synchronized (this) - { + synchronized (this) { // Ensure completion is flagged complete = true; // Signal to any waiting threads http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java index 6d23734..a0192dd 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java @@ -78,8 +78,7 @@ public abstract class AbstractLMTPSServerTest extends AbstractLMTPServerTest { return sendCommand("LHLO", hostname); } - public int[] getReplies() throws IOException - { + public int[] getReplies() throws IOException { int[] codes = new int[replies.size()]; for (int i = 0; i < codes.length; i++) { codes[i] = replies.remove(0); @@ -88,8 +87,7 @@ public abstract class AbstractLMTPSServerTest extends AbstractLMTPServerTest { } @Override - public boolean completePendingCommand() throws IOException - { + public boolean completePendingCommand() throws IOException { for (int i = 0; i < rcptCount; i++) { replies.add(getReply()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java index 10d58c7..19a82b2 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java @@ -285,8 +285,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { return sendCommand("LHLO", hostname); } - public int[] getReplies() throws IOException - { + public int[] getReplies() throws IOException { int[] codes = new int[replies.size()]; for (int i = 0; i < codes.length; i++) { codes[i] = replies.remove(0); @@ -295,8 +294,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest { } @Override - public boolean completePendingCommand() throws IOException - { + public boolean completePendingCommand() throws IOException { for (int i = 0; i < rcptCount; i++) { replies.add(getReply()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/ManageSieveException.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/ManageSieveException.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/ManageSieveException.java index a583d59..296b1a4 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/ManageSieveException.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/ManageSieveException.java @@ -20,8 +20,7 @@ package org.apache.james.managesieve.api; -public class ManageSieveException extends Exception -{ +public class ManageSieveException extends Exception { /** * Creates a new instance of ManageSieveException. * http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java b/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java index 329df5b..d1500ef 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java @@ -80,8 +80,7 @@ public class DoublingRetrySchedule implements RetrySchedule { */ @Override public long getInterval(int index) { - if (_startInterval > 0) - { + if (_startInterval > 0) { return getInterval(index, _startInterval); } return index == 0 ? 0 : getInterval(index - 1, 1); http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java index eeb237a..e93e68d 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java @@ -83,8 +83,7 @@ public abstract class ExceptionRetryHandler implements RetryHandler { result = operation(); success = true; - } - catch (Exception ex) { + } catch (Exception ex) { if (retryCount >= _maxRetries || !isRetryable(ex)) { throw ex; } @@ -107,11 +106,9 @@ public abstract class ExceptionRetryHandler implements RetryHandler { * * @return true if the array of exception classes contains <strong>ex</strong> */ - private boolean isRetryable(Throwable ex) - { + private boolean isRetryable(Throwable ex) { boolean isRetryable = false; - for (int i = 0; !isRetryable && i < _exceptionClasses.length; i++) - { + for (int i = 0; !isRetryable && i < _exceptionClasses.length; i++) { isRetryable = _exceptionClasses[i].isInstance(ex); } return isRetryable; @@ -119,8 +116,7 @@ public abstract class ExceptionRetryHandler implements RetryHandler { /** */ - public void postFailure(Exception ex, int retryCount) - { + public void postFailure(Exception ex, int retryCount) { // no-op } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java index a6e14aa..f269fa7 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java @@ -70,8 +70,7 @@ public abstract class NamingExceptionRetryHandler extends ExceptionRetryHandler postFailure(((NamingException) ex), retryCount); } - public void postFailure(NamingException ex, int retryCount) - { + public void postFailure(NamingException ex, int retryCount) { // no-op } } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/exception/QuotaExceededException.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/exception/QuotaExceededException.java b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/exception/QuotaExceededException.java index bc061c5..02508d7 100644 --- a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/exception/QuotaExceededException.java +++ b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/exception/QuotaExceededException.java @@ -20,8 +20,7 @@ package org.apache.james.sieverepository.api.exception; -public class QuotaExceededException extends SieveRepositoryException -{ +public class QuotaExceededException extends SieveRepositoryException { /** * Creates a new instance of QuotaExceededException. * http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java index 489f35e..5548ec6 100644 --- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java +++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java @@ -456,8 +456,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl }; } - protected Properties getContextEnvironment() - { + protected Properties getContextEnvironment() { final Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, INITIAL_CONTEXT_FACTORY); props.put(Context.PROVIDER_URL, null == ldapHost ? "" : ldapHost); @@ -470,12 +469,10 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl } // The following properties are specific to com.sun.jndi.ldap.LdapCtxFactory props.put(PROPERTY_NAME_CONNECTION_POOL, Boolean.toString(useConnectionPool)); - if (connectionTimeout > -1) - { + if (connectionTimeout > -1) { props.put(PROPERTY_NAME_CONNECT_TIMEOUT, Integer.toString(connectionTimeout)); } - if (readTimeout > -1) - { + if (readTimeout > -1) { props.put(PROPERTY_NAME_READ_TIMEOUT, Integer.toString(readTimeout)); } return props; http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java index 53b0dcb..25a4002 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java @@ -41,8 +41,7 @@ public class ActionUtils { * @return String * @throws MessagingException */ - public static MailAddress getSoleRecipient(Mail aMail) throws MessagingException - { + public static MailAddress getSoleRecipient(Mail aMail) throws MessagingException { if (aMail.getRecipients() == null) { throw new MessagingException("Invalid number of recipients - 0" + ". Exactly 1 recipient is expected."); @@ -64,13 +63,11 @@ public class ActionUtils { * @throws MessagingException */ public static void detectAndHandleLocalLooping(Mail aMail, ActionContext context, String anAttributeSuffix) - throws MessagingException - { + throws MessagingException { MailAddress thisRecipient = getSoleRecipient(aMail); MailAddress lastRecipient = (MailAddress) aMail .getAttribute(ATTRIBUTE_PREFIX + anAttributeSuffix); - if (null != lastRecipient && lastRecipient.equals(thisRecipient)) - { + if (null != lastRecipient && lastRecipient.equals(thisRecipient)) { MessagingException ex = new MessagingException( "This message is looping! Message ID: " + aMail.getMessage().getMessageID()); http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java index 03bdfd0..cdba9ca 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java @@ -57,8 +57,7 @@ public class KeepAction extends FileIntoAction implements MailAction { * @param context not null * @throws MessagingException */ - public void execute(ActionKeep anAction, Mail aMail, ActionContext context) throws MessagingException - { + public void execute(ActionKeep anAction, Mail aMail, ActionContext context) throws MessagingException { final ActionFileInto action = new ActionFileInto(INBOX); execute(action, aMail, context); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java index 9193bdb..f22af50 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java @@ -56,8 +56,7 @@ public class RedirectAction implements MailAction { * @param context not null * @throws MessagingException */ - public void execute(ActionRedirect anAction, Mail aMail, ActionContext context) throws MessagingException - { + public void execute(ActionRedirect anAction, Mail aMail, ActionContext context) throws MessagingException { ActionUtils.detectAndHandleLocalLooping(aMail, context, "redirect"); Collection<MailAddress> recipients = new ArrayList<>(1); recipients.add(new MailAddress(new InternetAddress(anAction.getAddress()))); http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java index 370f424..9087d3e 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java @@ -74,8 +74,7 @@ public class RejectAction implements MailAction { * @param context not null * @throws MessagingException */ - public void execute(ActionReject anAction, Mail aMail, ActionContext context) throws MessagingException - { + public void execute(ActionReject anAction, Mail aMail, ActionContext context) throws MessagingException { ActionUtils.detectAndHandleLocalLooping(aMail, context, "reject"); // Create the MDN part @@ -88,13 +87,10 @@ public class RejectAction implements MailAction { humanText.append(anAction.getMessage()); String reporting_UA_name = null; - try - { + try { reporting_UA_name = InetAddress.getLocalHost() .getCanonicalHostName(); - } - catch (UnknownHostException ex) - { + } catch (UnknownHostException ex) { reporting_UA_name = "localhost"; } @@ -103,8 +99,7 @@ public class RejectAction implements MailAction { String[] originalRecipients = aMail.getMessage().getHeader( "Original-Recipient"); String original_recipient = null; - if (null != originalRecipients && originalRecipients.length > 0) - { + if (null != originalRecipients && originalRecipients.length > 0) { original_recipient = originalRecipients[0]; } @@ -136,17 +131,14 @@ public class RejectAction implements MailAction { reply.setContent(multipart); reply.saveChanges(); Address[] recipientAddresses = reply.getAllRecipients(); - if (null != recipientAddresses) - { + if (null != recipientAddresses) { Collection<MailAddress> recipients = new ArrayList<>(recipientAddresses.length); for (Address recipientAddress : recipientAddresses) { recipients.add(new MailAddress( (InternetAddress) recipientAddress)); } context.post(null, recipients, reply); - } - else - { + } else { LOGGER.info("Unable to send reject MDN. Could not determine the recipient."); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/6de88236/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java index b87b705..178ad49 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java @@ -93,8 +93,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * @param aMailetContext */ public SieveMailAdapter(final Mail aMail, final MailetContext aMailetContext, final ActionDispatcher dispatcher, final Poster poster, - DateTime scriptActivationDate, DateTime scriptInterpretationDate, MailAddress recipient) - { + DateTime scriptActivationDate, DateTime scriptInterpretationDate, MailAddress recipient) { this.poster = poster; this.dispatcher = dispatcher; this.scriptInterpretationDate = scriptInterpretationDate; @@ -121,78 +120,62 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @return MimeMessage */ - protected MimeMessage getMessage() throws MessagingException - { + protected MimeMessage getMessage() throws MessagingException { return getMail().getMessage(); } - public List<Action> getActions() - { + public List<Action> getActions() { List<Action> actions = null; - if (null == (actions = getActionsBasic())) - { + if (null == (actions = getActionsBasic())) { updateActions(); return getActions(); } return actions; } - protected List<Action> computeActions() - { + protected List<Action> computeActions() { return new ArrayList<>(); } - private List<Action> getActionsBasic() - { + private List<Action> getActionsBasic() { return fieldActions; } - public void addAction(Action action) - { + public void addAction(Action action) { getActions().add(action); } - public void executeActions() throws SieveException - { + public void executeActions() throws SieveException { final List<Action> actions = getActions(); for (final Action action: actions) { LOGGER.info("Executing action: {}", action); - try - { + try { dispatcher.execute(action, getMail(), this); - } - catch (MessagingException e) - { + } catch (MessagingException e) { throw new SieveException(e); } } } - protected void setActions(List<Action> actions) - { + protected void setActions(List<Action> actions) { fieldActions = actions; } /** * Updates the actions. */ - protected void updateActions() - { + protected void updateActions() { setActions(computeActions()); } /** * @see org.apache.jsieve.mail.MailAdapter#getHeader(String) */ - public List<String> getHeader(String name) throws SieveMailException - { - try - { + public List<String> getHeader(String name) throws SieveMailException { + try { String[] headers = getMessage().getHeader(name); return (headers == null ? new ArrayList<>(0) : Arrays.asList(headers)); - } - catch (MessagingException ex) - { + } catch (MessagingException ex) { throw new SieveMailException(ex); } } @@ -200,19 +183,15 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC /** * @see org.apache.jsieve.mail.MailAdapter#getHeaderNames() */ - public List<String> getHeaderNames() throws SieveMailException - { + public List<String> getHeaderNames() throws SieveMailException { Set<String> headerNames = new HashSet<>(); - try - { + try { Enumeration<?> allHeaders = getMessage().getAllHeaders(); while (allHeaders.hasMoreElements()) { headerNames.add(((Header) allHeaders.nextElement()).getName()); } return new ArrayList<>(headerNames); - } - catch (MessagingException ex) - { + } catch (MessagingException ex) { throw new SieveMailException(ex); } } @@ -220,22 +199,17 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC /** * @see org.apache.jsieve.mail.MailAdapter#getMatchingHeader(String) */ - public List<String> getMatchingHeader(String name) throws SieveMailException - { + public List<String> getMatchingHeader(String name) throws SieveMailException { return MailUtils.getMatchingHeader(this, name); } /** * @see org.apache.jsieve.mail.MailAdapter#getSize() */ - public int getSize() throws SieveMailException - { - try - { + public int getSize() throws SieveMailException { + try { return (int) getMail().getMessageSize(); - } - catch (MessagingException ex) - { + } catch (MessagingException ex) { throw new SieveMailException(ex); } } @@ -245,8 +219,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @return Map */ - protected Map<String, String> getEnvelopes() - { + protected Map<String, String> getEnvelopes() { Map<String, String> envelopes = new HashMap<>(2); if (null != getEnvelopeFrom()) { envelopes.put("From", getEnvelopeFrom()); @@ -269,16 +242,14 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC /** * @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelopeNames() */ - public List<String> getEnvelopeNames() throws SieveMailException - { + public List<String> getEnvelopeNames() throws SieveMailException { return new ArrayList<>(getEnvelopes().keySet()); } /** * @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getMatchingEnvelope(String) */ - public List<String> getMatchingEnvelope(String name) throws SieveMailException - { + public List<String> getMatchingEnvelope(String name) throws SieveMailException { final List<String> matchedEnvelopeValues = new ArrayList<>(32); for (String envelopeName: getEnvelopeNames()) { if (envelopeName.trim().equalsIgnoreCase(name)) { @@ -293,8 +264,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @return String */ - public String getEnvelopeFrom() - { + public String getEnvelopeFrom() { MailAddress sender = getMail().getSender(); return (null == sender ? "" : sender.toString()); } @@ -304,8 +274,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @return String */ - public String getEnvelopeTo() - { + public String getEnvelopeTo() { return getMail().getRecipients() .stream() .map(mailAddress -> mailAddress.toInternetAddress().getAddress()) @@ -319,8 +288,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @return Mail */ - public Mail getMail() - { + public Mail getMail() { return fieldMail; } @@ -329,8 +297,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @param mail The mail to set */ - protected void setMail(Mail mail) - { + protected void setMail(Mail mail) { fieldMail = mail; } @@ -339,8 +306,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @return MailetContext */ - public MailetContext getMailetContext() - { + public MailetContext getMailetContext() { return fieldMailetContext; } @@ -349,23 +315,18 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC * * @param mailetContext The mailetContext to set */ - protected void setMailetContext(MailetContext mailetContext) - { + protected void setMailetContext(MailetContext mailetContext) { fieldMailetContext = mailetContext; } /** * @see java.lang.Object#toString() */ - public String toString() - { + public String toString() { String messageID = null; - try - { + try { messageID = getMail().getMessage().getMessageID(); - } - catch (MessagingException e) - { + } catch (MessagingException e) { messageID = "<" + e.getMessage() + ">"; } return getClass().getName() + " Envelope From: " --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
