JAMES-2277 fix comments indentation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/355bbc31 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/355bbc31 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/355bbc31 Branch: refs/heads/master Commit: 355bbc31606d0c0f1e5920aceef2c2dddfc961e0 Parents: a7d948e Author: Matthieu Baechler <[email protected]> Authored: Wed Dec 27 11:46:25 2017 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Jan 10 10:45:41 2018 +0100 ---------------------------------------------------------------------- .../mailbox/caching/MailboxMetadataCache.java | 2 -- .../caching/guava/GuavaCacheWrapper.java | 2 -- .../caching/guava/GuavaMailboxByPathCache.java | 23 ------------- .../mailbox/hbase/mail/model/HBaseMailbox.java | 2 -- .../mailbox/hbase/HBaseClusterSingleton.java | 2 -- .../james/mailbox/hbase/HBaseUtilsTest.java | 2 +- .../hbase/mail/HBaseMailboxMapperTest.java | 2 +- .../james/mailbox/maildir/MaildirFolder.java | 2 +- .../maildir/user/MaildirSubscriptionMapper.java | 2 +- .../store/search/SimpleMessageSearchIndex.java | 2 +- .../james/ai/classic/BayesianAnalyzer.java | 3 +- .../org/apache/james/ai/classic/Tokenizer.java | 4 +-- .../apache/mailet/base/FlowedMessageUtils.java | 6 ++-- .../apache/james/transport/SMIMEKeyHolder.java | 8 ++--- .../james/transport/mailets/SMIMESign.java | 2 +- .../apache/james/transport/mailets/Sign.java | 2 +- .../james/transport/mailets/ClassifyBounce.java | 9 ----- .../james/transport/matchers/NESSpamCheck.java | 36 ++++++++++---------- .../james/mpt/maven/MailProtocolTest.java | 4 --- .../protocols/api/handler/CommandHandler.java | 2 +- .../imap/decode/parser/CreateCommandParser.java | 4 +-- .../protocols/imap/utils/DecoderUtils.java | 4 +-- .../protocols/smtp/core/RcptCmdHandler.java | 3 +- .../smtp/core/ReceivedDataLineFilter.java | 2 +- .../core/fastfail/AbstractValidRcptHandler.java | 2 +- .../util/bayesian/JDBCBayesianAnalyzer.java | 2 +- .../mailrepository/file/MBoxMailRepository.java | 27 ++++++--------- .../user/jdbc/AbstractJdbcUsersRepository.java | 3 +- .../lib/AbstractRecipientRewriteTableTest.java | 11 ------ .../user/lib/AbstractUsersRepositoryTest.java | 4 +-- .../impl/camel/CamelMailetProcessor.java | 4 +-- .../james/transport/matchers/IsInWhiteList.java | 2 +- .../james/transport/util/SizeUtilsTest.java | 2 +- .../netty/ChannelImapResponseWriter.java | 2 +- .../netty/ImapRequestFrameDecoder.java | 12 +++---- .../apache/james/protocols/lib/PortUtil.java | 14 ++++---- .../fastfail/ValidSenderDomainHandler.java | 2 +- 37 files changed, 72 insertions(+), 145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java index ab25b16..4fcbb1b 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/MailboxMetadataCache.java @@ -31,6 +31,4 @@ public interface MailboxMetadataCache { void invalidate(Mailbox mailbox); -// public abstract void invalidate(MailboxPath mailboxPath); - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/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 1eeaab8..7ac8689 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 @@ -8,11 +8,9 @@ public abstract class GuavaCacheWrapper<KeyT, ValueT, UnderlyingT, KeyRepresenta implements CacheLoaderFromUnderlying<KeyT, ValueT, UnderlyingT, ExceptT> { private final Cache<KeyRepresentationT, ValueT> cache; -// private final CacheLoaderFromUnderlying<Key, Value, Underlying, Except> loader; public GuavaCacheWrapper(Cache<KeyRepresentationT, ValueT> cache/*, CacheLoaderFromUnderlying<Key, Value, Underlying, Except> loader*/) { this.cache = cache; -// this.loader = loader; } public ValueT get(KeyT key, UnderlyingT underlying) throws ExceptT { http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxByPathCache.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxByPathCache.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxByPathCache.java index d717ac8..cce13d4 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxByPathCache.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxByPathCache.java @@ -32,20 +32,6 @@ public class GuavaMailboxByPathCache extends AbstractGuavaCache implements Mailb return wrapper.get(mailboxName, underlying); } -// alternative plain implementation - review and choose the better -// public Mailbox findMailboxByPath(MailboxPath mailboxName, MailboxMapper underlying) throws MailboxNotFoundException, MailboxException { -// Mailbox mailbox = findMailboxByPathCache.getIfPresent(mailboxName.toString()); -// if (mailbox != null) -// return mailbox; -// else { -// mailbox = new MailboxByPathCacheLoaderFromUnderlying().load(mailboxName, underlying); -// findMailboxByPathCache.put(mailboxName.toString(), mailbox); -// return mailbox; -// } -// } - - - @Override public void invalidate(Mailbox mailbox) { invalidate(mailbox.generateAssociatedPath()); @@ -56,15 +42,6 @@ public class GuavaMailboxByPathCache extends AbstractGuavaCache implements Mailb wrapper.invalidate(mailboxPath); } - - //Does it make sense to define such loaders as separate classes for reuse? -// class MailboxByPathCacheLoaderFromUnderlying implements CacheLoaderFromUnderlying<MailboxPath, Mailbox, MailboxMapper, MailboxException> { -// @Override -// public Mailbox load(MailboxPath mailboxName, MailboxMapper underlying) throws MailboxException { -// return underlying.findMailboxByPath(mailboxName); -// } -// } - class MailboxByPathCacheWrapper extends GuavaCacheWrapper<MailboxPath, Mailbox, MailboxMapper, String, MailboxException> { public MailboxByPathCacheWrapper( http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java index c5214e2..fc4a814 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java @@ -140,9 +140,7 @@ public class HBaseMailbox implements Mailbox { public String toString() { return "Mailbox ( " + "mailboxId = " + this.mailboxId + TAB -// + "namespace = " + this.namespace + TAB + "name = " + this.name + TAB -// + "user = " + this.user + TAB + "uidValidity = " + this.uidValidity + TAB + " )"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java index a7986a5..246b97b 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java @@ -90,13 +90,11 @@ public final class HBaseClusterSingleton { htu.getConfiguration().setBoolean("dfs.support.append", true); htu.getConfiguration().setInt("zookeeper.session.timeout", 20000); -// htu.getConfiguration().setInt("hbase.client.retries.number", 2); try { hbaseCluster = htu.startMiniCluster(); LOG.info("After cluster start-up."); hbaseCluster.waitForActiveAndReadyMaster(); LOG.info("After active and ready."); -// ensureTables(); conf = hbaseCluster.getConfiguration(); } catch (Exception ex) { throw new RuntimeException("Minicluster not starting."); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java index cab2d61..c1376c9 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java @@ -111,7 +111,7 @@ public class HBaseUtilsTest { /** * Test of metadataToPut method for message. */ -// @Test + //@Test public void testMessageToPut() { System.out.println("messageToPut"); // left to implement http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java index 596bd45..aca1d7f 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java @@ -117,7 +117,7 @@ public class HBaseMailboxMapperTest { testSave(); testDelete(); testHasChildren(); -// testDeleteAllMemberships(); // Ignore this test + //testDeleteAllMemberships(); // Ignore this test testDeleteAllMailboxes(); testChunkStream(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/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 9279949..06a382f 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 @@ -127,7 +127,7 @@ public class MaildirFolder { this.messageNameStrictParse = messageNameStrictParse; } - /** + /** * Returns the {@link File} of this Maildir folder. * @return the root folder */ http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/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 607f8c8..fc1a2c1 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 @@ -54,7 +54,7 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements */ @Override public void delete(Subscription subscription) throws SubscriptionException { - // TODO: we need some kind of file locking here + // TODO: we need some kind of file locking here Set<String> subscriptionNames = readSubscriptionsForUser(subscription.getUser()); Set<String> newSubscriptions = Sets.difference(subscriptionNames, ImmutableSet.of(subscription.getMailbox())); boolean changed = subscriptionNames.size() != newSubscriptions.size(); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java index 0c63a9e..2b15b6f 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java @@ -94,7 +94,7 @@ public class SimpleMessageSearchIndex implements MessageSearchIndex { * first UidCriterion found * null - if not found */ - private static UidCriterion findConjugatedUidCriterion(List<Criterion> crits) { + private static UidCriterion findConjugatedUidCriterion(List<Criterion> crits) { for (Criterion crit : crits) { if (crit instanceof UidCriterion) { return (UidCriterion) crit; http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java index 3d2aadc..e09ea07 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java @@ -502,8 +502,7 @@ public class BayesianAnalyzer { // System.out.println(tps); - double theDoubleValue = DEFAULT_TOKEN_PROBABILITY; // initialize it - // to the default + double theDoubleValue = DEFAULT_TOKEN_PROBABILITY; // initialize it to the default Double theDoubleObject = workCorpus.get(tps.token); // if either the original token or a degeneration was found use the // double value, otherwise use the default http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/ai/src/main/java/org/apache/james/ai/classic/Tokenizer.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/Tokenizer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/Tokenizer.java index e1f0f98..dda1d67 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/Tokenizer.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/Tokenizer.java @@ -98,9 +98,7 @@ public abstract class Tokenizer { } } - if (Character.isLetter(ch) || ch == '-' || ch == '$' || ch == '\u20AC' // the - // EURO - // symbol + if (Character.isLetter(ch) || ch == '-' || ch == '$' || ch == 'â¬' || ch == '!' || ch == '\'') { tokenCharFound = true; previousWasDigit = false; http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java index f4f068f..85327c1 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java @@ -111,9 +111,9 @@ public final class FlowedMessageUtils { resultLineFlowed = false; } - // Add the PREVIOUS line. - // This often will find the flow looking for a space as the last char of the line. - // With quote changes or signatures it could be the followinf line to void the flow. + // Add the PREVIOUS line. + // This often will find the flow looking for a space as the last char of the line. + // With quote changes or signatures it could be the following line to void the flow. if (!resultLineFlowed && i > 0) { if (resultLineQuoteDepth > 0) { resultLine.insert(0, RFC2646_SPACE); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java index b5230ac..a4438c8 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java @@ -275,7 +275,7 @@ public class SMIMEKeyHolder implements KeyHolder { return extractAttribute(certificate.getSubjectDN().toString(), "CN="); } - + /** * Extracts the signer <I>email address</I> (EMAILADDRESS=) from an <CODE>X509Certificate</CODE> <I>distinguished name</I>. * @param certificate The certificate to extract the information from. @@ -296,7 +296,7 @@ public class SMIMEKeyHolder implements KeyHolder { public String getSignerDistinguishedName() { return getSignerDistinguishedName(getCertificate()); } - + /** * Getter for property signerCN. * @return Value of property signerCN. @@ -305,8 +305,8 @@ public class SMIMEKeyHolder implements KeyHolder { public String getSignerCN() { return getSignerCN(getCertificate()); } - - /** + + /** * Getter for property signerAddress. * @return Value of property signerMailAddress. * @see #getSignerAddress(X509Certificate) http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java index 3f76915..5024baa 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java @@ -84,7 +84,7 @@ public class SMIMESign extends Sign { }; } - /* ******************************************************************** */ + /* ******************************************************************** */ /* ****************** Begin of setters and getters ******************** */ /* ******************************************************************** */ http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java index c3e4fa7..6ab17b1 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java @@ -91,7 +91,7 @@ public class Sign extends AbstractSign { }; } - /* ******************************************************************** */ + /* ******************************************************************** */ /* ****************** Begin of setters and getters ******************** */ /* ******************************************************************** */ http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java index 28cfaf7..bd1d2ab 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java @@ -206,15 +206,6 @@ public class ClassifyBounce extends GenericMailet { s = (String) o; } -// else { -// if (m.isMimeType("text/html")) { -// s = m.getContent().toString(); -// } -// if (m.isMimeType("text/plain")) { -// s = m.getContent().toString(); -// } -// } - return s; } http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java index 7277f8f..7290bce 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java @@ -48,45 +48,45 @@ public class NESSpamCheck extends GenericRegexMatcher { {RFC2822Headers.MESSAGE_ID_VARIATION, "<>"}, {RFC2822Headers.MESSAGE_ID_VARIATION, "<(419\\.43|989\\.28)"}, {"X-MimeOLE", "MimeOLE V[^0-9]"}, - //Added 20-Jun-1999. Appears to be broken spamware. + //Added 20-Jun-1999. Appears to be broken spamware. {"MIME-Version", "1.0From"}, - //Added 28-July-1999. Check X-Mailer for spamware. + //Added 28-July-1999. Check X-Mailer for spamware. {"X-Mailer", "DiffondiCool"}, {"X-Mailer", "Emailer Platinum"}, {"X-Mailer", "eMerge"}, {"X-Mailer", "Crescent Internet Tool"}, - //Added 4-Apr-2000. Check X-Mailer for Cybercreek Avalanche + //Added 4-Apr-2000. Check X-Mailer for Cybercreek Avalanche {"X-Mailer", "Avalanche"}, - //Added 21-Oct-1999. Subject contains 20 or more consecutive spaces + //Added 21-Oct-1999. Subject contains 20 or more consecutive spaces {"Subject", " "}, - //Added 31-Mar-2000. Invalid headers from MyGuestBook.exe CGI spamware + //Added 31-Mar-2000. Invalid headers from MyGuestBook.exe CGI spamware {"MessageID", "<.+>"}, {"X-References", "0[A-Z0-9]+, 0[A-Z0-9]+$"}, {"X-Other-References", "0[A-Z0-9]+$"}, {"X-See-Also", "0[A-Z0-9]+$"}, - //Updated 28-Apr-1999. Check for "Sender", "Resent-From", or "Resent-By" - // before "X-UIDL". If found, then exit. + //Updated 28-Apr-1999. Check for "Sender", "Resent-From", or "Resent-By" + // before "X-UIDL". If found, then exit. {RFC2822Headers.SENDER, ".+"}, {RFC2822Headers.RESENT_FROM, ".+"}, {"Resent-By", ".+"}, - //Updated 19-May-1999. Check for "X-Mozilla-Status" before "X-UIDL". + //Updated 19-May-1999. Check for "X-Mozilla-Status" before "X-UIDL". {"X-Mozilla-Status", ".+"}, - //Updated 20-Jul-1999. Check for "X-Mailer: Internet Mail Service" - // before "X-UIDL". + //Updated 20-Jul-1999. Check for "X-Mailer: Internet Mail Service" + // before "X-UIDL". {"X-Mailer", "Internet Mail Service"}, - //Updated 25-Oct-1999. Check for "X-ID" before "X-UIDL". + //Updated 25-Oct-1999. Check for "X-ID" before "X-UIDL". {"X-ID", ".+"}, - //X-UIDL is a POP3 header that should normally not be seen + //X-UIDL is a POP3 header that should normally not be seen {"X-UIDL", ".*"}, - //Some headers are valid only for the Pegasus Mail client. So first check - //for Pegasus header and exit if found. If not found, check for - //invalid headers: "Comments: Authenticated sender", "X-PMFLAGS" and "X-pmrqc". + //Some headers are valid only for the Pegasus Mail client. So first check + //for Pegasus header and exit if found. If not found, check for + //invalid headers: "Comments: Authenticated sender", "X-PMFLAGS" and "X-pmrqc". {"X-mailer", "Pegasus"}, - //Added 27-Aug-1999. Pegasus now uses X-Mailer instead of X-mailer. + //Added 27-Aug-1999. Pegasus now uses X-Mailer instead of X-mailer. {"X-Mailer", "Pegasus"}, - //Added 25-Oct-1999. Check for X-Confirm-Reading-To. + //Added 25-Oct-1999. Check for X-Confirm-Reading-To. {"X-Confirm-Reading-To", ".+"}, - //Check for invalid Pegasus headers + //Check for invalid Pegasus headers {RFC2822Headers.COMMENTS, "Authenticated sender"}, {"X-PMFLAGS", ".*"}, {"X-Pmflags", ".*"}, http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java ---------------------------------------------------------------------- diff --git a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java index f189ea9..1190a5d 100644 --- a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java +++ b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java @@ -91,10 +91,6 @@ public class MailProtocolTest implements Monitor { } - /* - * (non-Javadoc) - * @see org.apache.maven.plugin.AbstractMojo#execute() - */ public void execute() throws MojoExecutionException, MojoFailureException { validate(); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java index 5627a8f..3a33974 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java @@ -34,7 +34,7 @@ import org.apache.james.protocols.api.Response; * therefore the command handlers must store all the state information * in the Session object */ - public interface CommandHandler<SessionT extends ProtocolSession> extends ProtocolHandler { +public interface CommandHandler<SessionT extends ProtocolSession> extends ProtocolHandler { /** * Handle the command **/ http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java index b4cd72e..9ec9d51 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java @@ -60,9 +60,7 @@ public class CreateCommandParser extends AbstractImapCommandParser { // [email protected] // When mailbox name is suffixed with hierarchy separator // name created must remove tailing delimiter - if (mailboxName.endsWith(Character.toString(mailboxSession.getPathDelimiter()))) { // NOPMD - // keep - // comment + if (mailboxName.endsWith(Character.toString(mailboxSession.getPathDelimiter()))) { mailboxName = mailboxName.substring(0, mailboxName.length() - 1); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java index 18d1397..00dbc21 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java @@ -76,9 +76,7 @@ public final class DecoderUtils { } else if (flagString.equalsIgnoreCase(MessageFlags.SEEN_ALL_CAPS)) { flags.add(Flags.Flag.SEEN); } else { - if (flagString.equalsIgnoreCase(MessageFlags.RECENT_ALL_CAPS)) { // NOPMD - // keep - // comment + if (flagString.equalsIgnoreCase(MessageFlags.RECENT_ALL_CAPS)) { // RFC3501 specifically excludes \Recent // The \Recent flag should be set automatically by the server so throw Exception // http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java index d9820e4..5544d77 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java @@ -50,8 +50,7 @@ import com.google.common.collect.ImmutableSet; public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> implements CommandHandler<SMTPSession> { private static final Logger LOGGER = LoggerFactory.getLogger(RcptCmdHandler.class); - public static final String CURRENT_RECIPIENT = "CURRENT_RECIPIENT"; // Current - // recipient + public static final String CURRENT_RECIPIENT = "CURRENT_RECIPIENT"; private static final Collection<String> COMMANDS = ImmutableSet.of("RCPT"); private static final Response MAIL_NEEDED = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_OTHER) + " Need MAIL before RCPT").immutable(); private static final Response SYNTAX_ERROR_ARGS = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_SYNTAX) + " Usage: RCPT TO:<recipient>").immutable(); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java index c81160a..d2f8870 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java @@ -64,7 +64,7 @@ public class ReceivedDataLineFilter extends AbstractAddHeadersFilter { * @return type */ protected String getServiceType(SMTPSession session, String heloMode) { - // Check if EHLO was used + // Check if EHLO was used if (EHLO.equals(heloMode)) { // Not successful auth if (session.getUser() == null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java index 622b4ef..4200220 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java @@ -61,7 +61,7 @@ public abstract class AbstractValidRcptHandler implements RcptHook { } if (reject) { - //user not exist + //user not exist LOGGER.info("Rejected message. Unknown user: {}", rcpt); return new HookResult(HookReturnCode.DENY,SMTPRetCode.MAILBOX_PERM_UNAVAILABLE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_MAILBOX) + " Unknown user: " + rcpt.toString()); } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java index 907cd6a..60dbd9d 100644 --- a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java +++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java @@ -278,7 +278,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer { private void updateTokens(Connection conn, Map<String, Integer> tokens, String insertSqlStatement, String updateSqlStatement) throws java.sql.SQLException { try ( - // Used to insert new token entries. + // Used to insert new token entries. PreparedStatement insert = conn.prepareStatement(insertSqlStatement); // Used to update existing token entries. PreparedStatement update = conn.prepareStatement(updateSqlStatement)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java index a22e515..e378f28 100755 --- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java @@ -120,16 +120,13 @@ public class MBoxMailRepository implements MailRepository, Configurable { static final SimpleDateFormat dy = new SimpleDateFormat("EE MMM dd HH:mm:ss yyyy", Locale.US); static final String LOCKEXT = ".lock"; static final String WORKEXT = ".work"; - static final int LOCKSLEEPDELAY = 2000; // 2 second back off in the event of - // a problem with the lock file + static final int LOCKSLEEPDELAY = 2000; // 2 second back off in the event of a problem with the lock file static final int MAXSLEEPTIMES = 100; // - static final long MLISTPRESIZEFACTOR = 10 * 1024; // The hash table will be - // loaded with a initial - // capacity of - // filelength/MLISTPRESIZEFACTOR - static final long DEFAULTMLISTCAPACITY = 20; // Set up a hashtable to have a - // meaningful default - + // The hash table will be loaded with a initial capacity of filelength/MLISTPRESIZEFACTOR + static final long MLISTPRESIZEFACTOR = 10 * 1024; + // Set up a hashtable to have a meaningful default + static final long DEFAULTMLISTCAPACITY = 20; + /** * Whether line buffering is turned used. */ @@ -151,8 +148,7 @@ public class MBoxMailRepository implements MailRepository, Configurable { * A callback used when a message is read from the mbox file */ public interface MessageAction { - boolean isComplete(); // *** Not valid until AFTER each call to - // messageAction(...)! + boolean isComplete(); // *** Not valid until AFTER each call to messageAction(...)! MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart); } @@ -511,9 +507,8 @@ public class MBoxMailRepository implements MailRepository, Configurable { LOGGER.debug("{} keys to be iterated over.", keys.size()); if (fifo) { - Collections.sort(keys); // Keys is a HashSet; impose FIFO for apps + Collections.sort(keys); // Keys is a HashSet; impose FIFO for apps that need it } - // that need it return keys.iterator(); } @@ -600,10 +595,8 @@ public class MBoxMailRepository implements MailRepository, Configurable { // by reading through the // once we've done that then seek to the file try { - RandomAccessFile ins = new RandomAccessFile(mboxFile, "r"); // The - // source - final RandomAccessFile outputFile = new RandomAccessFile(mboxFile + WORKEXT, "rw"); // The - // destination + RandomAccessFile ins = new RandomAccessFile(mboxFile, "r"); // The source + final RandomAccessFile outputFile = new RandomAccessFile(mboxFile + WORKEXT, "rw"); // The destination parseMboxFile(ins, new MessageAction() { public boolean isComplete() { return false; http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java index c6c02eb..2917e39 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java @@ -439,8 +439,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo * @throws UsersRepositoryException */ private Collection<User> getAllUsers() throws UsersRepositoryException { - List<User> userList = new ArrayList<>(); // Build the users into - // this list. + List<User> userList = new ArrayList<>(); // Build the users into this list. Connection conn = null; PreparedStatement getUsersStatement = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java index add0b01..b891627 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java @@ -132,17 +132,6 @@ public abstract class AbstractRecipientRewriteTableTest { removeMapping(user, domain, address, ADDRESS_TYPE); - /* - * TEMPORARILY REMOVE JDBC specific test String invalidAddress= - * ".*@localhost2:"; boolean catched = false; if (virtualUserTable - * instanceof JDBCRecipientRewriteTable) { try { - * assertTrue("Added virtual mapping", addMapping(user, domain, - * invalidAddress, ADDRESS_TYPE)); } catch (InvalidMappingException - * e) { catched = true; } - * assertTrue("Invalid Mapping throw exception" , catched); } - */ - - removeMapping(user, domain, address2, ADDRESS_TYPE); assertThat(virtualUserTable.getMappings(user, domain)).describedAs("No mapping").isNull(); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java index 1d34baf..f64ccba 100644 --- a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java @@ -156,7 +156,7 @@ public abstract class AbstractUsersRepositoryTest { public void addUserShouldThrowWhenUserAlreadyPresentInRepository() throws UsersRepositoryException { //Given usersRepository.addUser(user1, "password"); - //When + //When usersRepository.addUser(user1, "password2"); } @@ -268,7 +268,7 @@ public abstract class AbstractUsersRepositoryTest { @Test public void updateUserShouldAllowToAuthenticateWithNewPassword() throws UsersRepositoryException { - //Given + //Given usersRepository.addUser(user1, "password"); User user = usersRepository.getUserByName(user1); user.setPassword("newpass"); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java index 42dbaed..4f10b80 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java @@ -152,7 +152,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement String state = getState(); RouteDefinition processorDef = from(getEndpoint()).routeId(state).setExchangePattern(ExchangePattern.InOnly) - // store the logger in properties + // store the logger in properties .setProperty(MatcherSplitter.LOGGER_PROPERTY, constant(LOGGER)) .setProperty(MatcherSplitter.METRIC_FACTORY, constant(metricFactory)); @@ -180,7 +180,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement Processor terminatingMailetProcessor = new CamelProcessor(metricFactory, new TerminatingMailet(), CamelMailetProcessor.this); processorDef - // start choice + // start choice .choice() // when the mail state did not change till yet ( the end of http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java index e9d4b66..dca0547 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java @@ -153,7 +153,7 @@ public class IsInWhiteList extends AbstractSQLWhitelistMatcher { } try { - // check for wildcard domain entries on both + // check for wildcard domain entries on both selectStmt = conn.prepareStatement(selectByPK); selectStmt.setString(1, "*"); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java index 91a007c..3ca8700 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java @@ -1,4 +1,4 @@ - /**************************************************************** +/**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * * distributed with this work for additional information * http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java index 6558c79..38917da 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java @@ -71,7 +71,7 @@ public class ChannelImapResponseWriter implements ImapResponseWriter { InputStream in = literal.getInputStream(); if (in instanceof FileInputStream && channel.getFactory() instanceof NioServerSocketChannelFactory) { FileChannel fc = ((FileInputStream) in).getChannel(); - // Zero-copy is only possible if no SSL/TLS and no COMPRESS is in place + // Zero-copy is only possible if no SSL/TLS and no COMPRESS is in place // // See JAMES-1305 and JAMES-1306 ChannelPipeline cp = channel.getPipeline(); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java index 7fe8f7d..2d7f44e 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java @@ -175,10 +175,10 @@ public class ImapRequestFrameDecoder extends FrameDecoder implements NettyConsta // Code portion commented further to JAMES-1436. // TODO Remove if no negative feedback on JAMES-1436. -// ChannelHandler handler = (ChannelHandler) attachment.remove(FRAMER); -// if (handler != null) { -// channel.getPipeline().addFirst(FRAMER, handler); -// } + //ChannelHandler handler = (ChannelHandler) attachment.remove(FRAMER); + //if (handler != null) { + // channel.getPipeline().addFirst(FRAMER, handler); + //} ((SwitchableDelimiterBasedFrameDecoder) channel.getPipeline().get(FRAMER)).enableFraming(); @@ -196,8 +196,8 @@ public class ImapRequestFrameDecoder extends FrameDecoder implements NettyConsta // Code portion commented further to JAMES-1436. // TODO Remove if no negative feedback on JAMES-1436. -// ChannelHandler handler = channel.getPipeline().remove(FRAMER); -// attachment.put(FRAMER, handler); + //ChannelHandler handler = channel.getPipeline().remove(FRAMER); + //attachment.put(FRAMER, handler); // SwitchableDelimiterBasedFrameDecoder added further to JAMES-1436. final SwitchableDelimiterBasedFrameDecoder framer = (SwitchableDelimiterBasedFrameDecoder) pipeline.get(FRAMER); http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java index d0adf08..460ced3 100644 --- a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java +++ b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java @@ -27,12 +27,10 @@ import java.net.ServerSocket; */ public class PortUtil { - private static final int PORT_RANGE_START = 8000; // the lowest possible - // port number assigned - // for testing - private static final int PORT_RANGE_END = 11000; // the highest possible - // port number assigned for - // testing + //the lowest possible port number assigned for testing + private static final int PORT_RANGE_START = 8000; + // the highest possible port number assigned for testing + private static final int PORT_RANGE_END = 11000; private static int PORT_LAST_USED = PORT_RANGE_START; /** @@ -41,8 +39,8 @@ public class PortUtil { * @return port number */ public static int getNonPrivilegedPort() { - return getNextNonPrivilegedPort(); // uses sequential assignment of - // ports + // uses sequential assignment of ports + return getNextNonPrivilegedPort(); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/355bbc31/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java index 26e98bd..09a5a1b 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java @@ -45,7 +45,7 @@ public class ValidSenderDomainHandler extends org.apache.james.protocols.smtp.co Collection<String> records = null; - // try to resolv the provided domain in the senderaddress. If it can not resolved do not accept it. + // try to resolv the provided domain in the senderaddress. If it can not resolved do not accept it. try { records = dnsService.findMXRecords(domain); } catch (org.apache.james.dnsservice.api.TemporaryResolutionException e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
