http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/core/src/main/java/org/apache/james/server/core/InternetHeadersInputStream.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/InternetHeadersInputStream.java b/server/container/core/src/main/java/org/apache/james/server/core/InternetHeadersInputStream.java index 58bf8dd..62a8739 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/InternetHeadersInputStream.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/InternetHeadersInputStream.java @@ -33,7 +33,7 @@ import javax.mail.internet.InternetHeaders; */ public class InternetHeadersInputStream extends InputStream { - private final static String LINE_SEPERATOR = "\r\n"; + private static final String LINE_SEPERATOR = "\r\n"; private final Enumeration<String> headerLines; private byte[] currLine;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java index 0eea1de..e6617e6 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java @@ -57,12 +57,12 @@ public class MimeMessageInputStreamSource extends MimeMessageSource implements D /** * 100kb threshold for the stream. */ - private final static int THRESHOLD = 1024 * 100; + private static final int THRESHOLD = 1024 * 100; /** * Temporary directory to use */ - private final static File TMPDIR = new File(System.getProperty("java.io.tmpdir")); + private static final File TMPDIR = new File(System.getProperty("java.io.tmpdir")); /** * Construct a new MimeMessageInputStreamSource from an http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java index a3a068e..1a37cfc 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java @@ -52,7 +52,7 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { * System property which tells JAMES if it should copy a message in memory * or via a temporary file. Default is the file */ - public final static String USE_MEMORY_COPY = "james.message.usememorycopy"; + public static final String USE_MEMORY_COPY = "james.message.usememorycopy"; /** * Can provide an input stream to the data http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java index b4ef788..428a8d2 100644 --- a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java +++ b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java @@ -65,8 +65,8 @@ public class JMXServerModule extends AbstractModule { private static final String JMX_COMPONENT_NAME_MAILBOXMANAGERBEAN = "org.apache.james:type=component,name=mailboxmanagerbean"; private static final String JMX_COMPONENT_MAILBOXCOPIER = "org.apache.james:type=component,name=mailboxcopier"; private static final String JMX_COMPONENT_REINDEXER = "org.apache.james:type=component,name=reindexerbean"; - private final static String JMX_COMPONENT_QUOTA = "org.apache.james:type=component,name=quotamanagerbean"; - private final static String JMX_COMPONENT_SIEVE = "org.apache.james:type=component,name=sievemanagerbean"; + private static final String JMX_COMPONENT_QUOTA = "org.apache.james:type=component,name=quotamanagerbean"; + private static final String JMX_COMPONENT_SIEVE = "org.apache.james:type=component,name=sievemanagerbean"; @Override protected void configure() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java b/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java index c8bdc91..16795e6 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java @@ -34,7 +34,7 @@ public class JamesServerApplicationContext extends ClassPathXmlApplicationContex * The resourceloader to use. This must be defined as static, otherwise it * will fail to startup.. */ - private final static JamesResourceLoader resourceLoader = new DefaultJamesResourceLoader(new JamesServerResourceLoader("../")); + private static final JamesResourceLoader resourceLoader = new DefaultJamesResourceLoader(new JamesServerResourceLoader("../")); public JamesServerApplicationContext(String[] configs) { super(configs); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java index 102221a..274f9ce 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java @@ -39,7 +39,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid private final ConcurrentHashMap<String, Logger> logMap = new ConcurrentHashMap<>(); private Map<String, String> logs; - private final static String PREFIX = "james."; + private static final String PREFIX = "james."; /** * Use {@link Logger} to create the Log http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java index 8e2a97e..91fa919 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java @@ -55,7 +55,7 @@ import org.springframework.util.ReflectionUtils; */ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotation> extends InstantiationAwareBeanPostProcessorAdapter implements BundleContextAware, BeanClassLoaderAware, BeanFactoryAware{ - public final static long DEFAULT_TIMEOUT = 60 * 1000* 5; + public static final long DEFAULT_TIMEOUT = 60 * 1000* 5; private BundleContext bundleContext; private static final Logger logger = LoggerFactory.getLogger(AbstractOSGIAnnotationBeanPostProcessor.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java index 4f1f5d6..a158829 100644 --- a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java +++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java @@ -94,19 +94,19 @@ public class BayesianAnalyzer { * Number of "interesting" tokens to use to compute overall spamminess * probability. */ - private final static int MAX_INTERESTING_TOKENS = 15; + private static final int MAX_INTERESTING_TOKENS = 15; /** * Minimum probability distance from 0.5 to consider a token "interesting" * to use to compute overall spamminess probability. */ - private final static double INTERESTINGNESS_THRESHOLD = 0.46; + private static final double INTERESTINGNESS_THRESHOLD = 0.46; /** * Default token probability to use when a token has not been encountered * before. */ - private final static double DEFAULT_TOKEN_PROBABILITY = 0.4; + private static final double DEFAULT_TOKEN_PROBABILITY = 0.4; /** * Map of ham tokens and their occurrences. http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 b9788e6..0c1e758 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 @@ -50,7 +50,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer { private static final Logger LOGGER = LoggerFactory.getLogger(JDBCBayesianAnalyzer.class); /** Public object representing a lock on database activity. */ - public final static String DATABASE_LOCK = "database lock"; + public static final String DATABASE_LOCK = "database lock"; /** * The JDBCUtil helper class http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 8e108c1..eeb237a 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 @@ -38,7 +38,7 @@ import org.apache.james.util.retry.api.RetrySchedule; * * @see org.apache.james.util.retry.naming.RetryingContext */ -abstract public class ExceptionRetryHandler implements RetryHandler { +public abstract class ExceptionRetryHandler implements RetryHandler { private Class<?>[] _exceptionClasses = null; private ExceptionRetryingProxy _proxy = null; @@ -126,7 +126,7 @@ abstract public class ExceptionRetryHandler implements RetryHandler { /** */ - abstract public Object operation() throws Exception; + public abstract Object operation() throws Exception; /** * @return the retryInterval http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java index 68a1c09..84c0ab8 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; /** * Abstract class <code>LoggingRetryHandler</code> implements logging of failures */ -abstract public class LoggingRetryHandler extends NamingExceptionRetryHandler { +public abstract class LoggingRetryHandler extends NamingExceptionRetryHandler { private static final Logger LOGGER = LoggerFactory.getLogger(LoggingRetryHandler.class); /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 5e1c49e..a6e14aa 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 @@ -34,7 +34,7 @@ import org.apache.james.util.retry.api.RetrySchedule; * @see org.apache.james.user.ldap.ExceptionRetryHandler * */ -abstract public class NamingExceptionRetryHandler extends ExceptionRetryHandler { +public abstract class NamingExceptionRetryHandler extends ExceptionRetryHandler { /** * Creates a new instance of NamingExceptionRetryHandler. http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java index 18452a5..2216829 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java @@ -44,9 +44,9 @@ import org.apache.james.util.retry.api.RetrySchedule; * @see org.apache.james.util.retry.api.ExceptionRetryingProxy * @see javax.naming.Context */ -abstract public class RetryingContext implements Context, ExceptionRetryingProxy { +public abstract class RetryingContext implements Context, ExceptionRetryingProxy { - static public final Class<?>[] DEFAULT_EXCEPTION_CLASSES = new Class<?>[] { + public static final Class<?>[] DEFAULT_EXCEPTION_CLASSES = new Class<?>[] { CommunicationException.class, ServiceUnavailableException.class, NoInitialContextException.class }; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java index 88a65ca..047be38 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java @@ -42,7 +42,7 @@ import org.apache.james.util.retry.naming.RetryingContext; * @see org.apache.james.util.retry.api.ExceptionRetryingProxy * @see javax.naming.directory.DirContext */ -abstract public class RetryingDirContext extends RetryingContext implements DirContext { +public abstract class RetryingDirContext extends RetryingContext implements DirContext { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java index ae07fc5..a38016b 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java @@ -39,7 +39,7 @@ import org.apache.james.util.retry.naming.directory.RetryingDirContext; * @see org.apache.james.util.retry.api.ExceptionRetryingProxy * @see javax.naming.ldap.LdapContext */ -abstract public class RetryingLdapContext extends RetryingDirContext implements LdapContext { +public abstract class RetryingLdapContext extends RetryingDirContext implements LdapContext { /** * Creates a new instance of RetryingLdapContext. http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java index bb222ac..871ea51 100644 --- a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java +++ b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java @@ -41,10 +41,10 @@ import com.google.common.io.Closeables; public class SpamAssassinInvoker { /** The mail attribute under which the status get stored */ - public final static String STATUS_MAIL_ATTRIBUTE_NAME = "org.apache.james.spamassassin.status"; + public static final String STATUS_MAIL_ATTRIBUTE_NAME = "org.apache.james.spamassassin.status"; /** The mail attribute under which the flag get stored */ - public final static String FLAG_MAIL_ATTRIBUTE_NAME = "org.apache.james.spamassassin.flag"; + public static final String FLAG_MAIL_ATTRIBUTE_NAME = "org.apache.james.spamassassin.flag"; private final String spamdHost; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java b/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java index 519b7d8..60faeee 100644 --- a/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java +++ b/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java @@ -52,7 +52,7 @@ public class SqlResources { private final Map<String, String> m_dbOptions = new HashMap<>(); /** A set of all used String values */ - static private final Map<String, String> stringTable = java.util.Collections.synchronizedMap(new HashMap<String, String>()); + private static final Map<String, String> stringTable = java.util.Collections.synchronizedMap(new HashMap<String, String>()); /** * <p> http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java index a45ae25..6aa8f80 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java @@ -77,7 +77,7 @@ public class SieveFileRepository implements SieveRepository { * @return * @throws FileNotFoundException */ - static protected String toString(File file, String encoding) throws FileNotFoundException { + protected static String toString(File file, String encoding) throws FileNotFoundException { String script = null; Scanner scanner = null; try { @@ -92,7 +92,7 @@ public class SieveFileRepository implements SieveRepository { return script; } - static protected void toFile(File file, String content) throws StorageException { + protected static void toFile(File file, String content) throws StorageException { // Create a temporary file int bufferSize = content.length() > MAX_BUFF_SIZE ? MAX_BUFF_SIZE : content.length(); File tmpFile = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java index 6c3e796..762df55 100644 --- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java +++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java @@ -72,7 +72,7 @@ import org.slf4j.LoggerFactory; public class JCRMailRepository extends AbstractMailRepository implements MailRepository { private static final Logger LOGGER = LoggerFactory.getLogger(JCRMailRepository.class); - private final static String MAIL_PATH = "mailrepository"; + private static final String MAIL_PATH = "mailrepository"; private Repository repository; private SimpleCredentials creds; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java index 966feee..dfc19d8 100644 --- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java +++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java @@ -87,7 +87,7 @@ public class RecipientRewriteTableUtil { * replaced where found in the input strings * @return the requested resource */ - static public String replaceParameters(String str, Map<String, String> parameters) { + public static String replaceParameters(String str, Map<String, String> parameters) { if (str != null && parameters != null) { // Do parameter replacements for this string resource. StringBuilder replaceBuffer = new StringBuilder(64); @@ -113,7 +113,7 @@ public class RecipientRewriteTableUtil { * the string to replace with * @return the substituted string */ - static private String substituteSubString(String input, String find, String replace) { + private static String substituteSubString(String input, String find, String replace) { int find_length = find.length(); int replace_length = replace.length(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 eaefd1d..49fc402 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 @@ -41,10 +41,10 @@ public abstract class AbstractRecipientRewriteTableTest { @Rule public ExpectedException expectedException = ExpectedException.none(); protected AbstractRecipientRewriteTable virtualUserTable; - protected final static int REGEX_TYPE = 0; - protected final static int ERROR_TYPE = 1; - protected final static int ADDRESS_TYPE = 2; - protected final static int ALIASDOMAIN_TYPE = 3; + protected static final int REGEX_TYPE = 0; + protected static final int ERROR_TYPE = 1; + protected static final int ADDRESS_TYPE = 2; + protected static final int ALIASDOMAIN_TYPE = 3; public void setUp() throws Exception { virtualUserTable = getRecipientRewriteTable(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java index 9247783..7c9ce32 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java @@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory; @Experimental public abstract class AbstractRecipientRewriteTable extends GenericMailet { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRecipientRewriteTable.class); - static private final String MARKER = "org.apache.james.transport.mailets.AbstractRecipientRewriteTable.mapped"; + private static final String MARKER = "org.apache.james.transport.mailets.AbstractRecipientRewriteTable.mapped"; private DNSService dns; private DomainList domainList; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java index 8ce3db9..0185e8b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java @@ -58,8 +58,8 @@ public class SPF extends GenericMailet { private boolean addHeader = false; private org.apache.james.jspf.impl.SPF spf; - public final static String EXPLANATION_ATTRIBUTE = "org.apache.james.transport.mailets.spf.explanation"; - public final static String RESULT_ATTRIBUTE = "org.apache.james.transport.mailets.spf.result"; + public static final String EXPLANATION_ATTRIBUTE = "org.apache.james.transport.mailets.spf.explanation"; + public static final String RESULT_ATTRIBUTE = "org.apache.james.transport.mailets.spf.result"; /** * @see org.apache.mailet.base.GenericMailet#init() http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 0dbb78f..99cfa9f 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 @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; public class ActionUtils { private static final Logger LOGGER = LoggerFactory.getLogger(ActionUtils.class); - private final static String ATTRIBUTE_PREFIX = ActionUtils.class.getPackage().getName() + "."; + private static final String ATTRIBUTE_PREFIX = ActionUtils.class.getPackage().getName() + "."; /** * Answers the sole intended recipient for aMail. http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java index d9e92b7..1aa6d41 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java @@ -36,7 +36,7 @@ import com.sun.mail.smtp.SMTPSenderFailedException; public class EnhancedMessagingException { - private final static Logger logger = LoggerFactory.getLogger(EnhancedMessagingException.class); + private static final Logger logger = LoggerFactory.getLogger(EnhancedMessagingException.class); private final MessagingException messagingException; private final Optional<Integer> returnCode; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java index 1c970d6..6905a6e 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java @@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableList; public class RemoteDeliveryConfiguration { - private final static Logger LOGGER = LoggerFactory.getLogger(RemoteDeliveryConfiguration.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RemoteDeliveryConfiguration.class); public static final String DELIVERY_THREADS = "deliveryThreads"; public static final String USE_PRIORITY = "usePriority"; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java index 146e0c3..e38ac68 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java @@ -64,7 +64,7 @@ import org.apache.mailet.MailetContext; * @since 2.2.0 */ @Experimental -abstract public class AbstractStorageQuota extends AbstractQuotaMatcher { +public abstract class AbstractStorageQuota extends AbstractQuotaMatcher { private MailboxManager manager; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java index 10c7963..6b7826f 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java @@ -39,8 +39,8 @@ import org.junit.Test; public class InSpammerBlacklistTest { private InSpammerBlacklist matcher; - private final static String BLACKLIST = "my.black.list."; - private final static StringBuffer LISTED_HOST = new StringBuffer("111.222.111.222"); + private static final String BLACKLIST = "my.black.list."; + private static final StringBuffer LISTED_HOST = new StringBuffer("111.222.111.222"); private DNSService setUpDNSServer() { return new MockDNSService() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java index 6395da9..7d63468 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java @@ -85,7 +85,7 @@ public class FetchMail implements Runnable, Configurable { /** * Key fields for DynamicAccounts. */ - private final static class DynamicAccountKey { + private static final class DynamicAccountKey { /** * The base user name without prfix or suffix */ @@ -164,7 +164,7 @@ public class FetchMail implements Runnable, Configurable { } - private final static class ParsedDynamicAccountParameters { + private static final class ParsedDynamicAccountParameters { private String fieldUserPrefix; private String fieldUserSuffix; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java index 32cd262..ade4313 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java @@ -232,7 +232,7 @@ public class MessageProcessor extends ProcessorAbstract { /** * Field names for an RFC2822 compliant RECEIVED Header */ - static final private String fieldRFC2822RECEIVEDHeaderFields = "from by via with id for ;"; + private static final String fieldRFC2822RECEIVEDHeaderFields = "from by via with id for ;"; /** * Recipient is blacklisted http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java index 7bee2a2..9ffc884 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java @@ -49,7 +49,7 @@ import org.apache.james.core.MailAddress; * information about the environment for the processor. * </p> */ -abstract public class ProcessorAbstract { +public abstract class ProcessorAbstract { /** * The prefix to place in front of any mail attributes used by this * Processor. @@ -463,7 +463,7 @@ abstract public class ProcessorAbstract { /** * Process the mail elements of the receiver */ - abstract public void process() throws MessagingException; + public abstract void process() throws MessagingException; /** * Returns the blacklist. http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keyword.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keyword.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keyword.java index ca18d2b..a9f0e7f 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keyword.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keyword.java @@ -33,24 +33,24 @@ import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; public class Keyword { - private final static int FLAG_NAME_MIN_LENGTH = 1; - private final static int FLAG_NAME_MAX_LENGTH = 255; - private final static CharMatcher FLAG_NAME_PATTERN = + private static final int FLAG_NAME_MIN_LENGTH = 1; + private static final int FLAG_NAME_MAX_LENGTH = 255; + private static final CharMatcher FLAG_NAME_PATTERN = CharMatcher.JAVA_LETTER_OR_DIGIT .or(CharMatcher.is('$')) .or(CharMatcher.is('_')); - public final static Keyword DRAFT = new Keyword("$Draft"); - public final static Keyword SEEN = new Keyword("$Seen"); - public final static Keyword FLAGGED = new Keyword("$Flagged"); - public final static Keyword ANSWERED = new Keyword("$Answered"); - public final static Keyword DELETED = new Keyword("$Deleted"); - public final static Keyword RECENT = new Keyword("$Recent"); - public final static Keyword FORWARDED = new Keyword("$Forwarded"); - public final static Boolean FLAG_VALUE = true; - - private final static ImmutableList<Keyword> NON_EXPOSED_IMAP_KEYWORDS = ImmutableList.of(Keyword.RECENT, Keyword.DELETED); - private final static ImmutableBiMap<Flags.Flag, Keyword> IMAP_SYSTEM_FLAGS = ImmutableBiMap.<Flags.Flag, Keyword>builder() + public static final Keyword DRAFT = new Keyword("$Draft"); + public static final Keyword SEEN = new Keyword("$Seen"); + public static final Keyword FLAGGED = new Keyword("$Flagged"); + public static final Keyword ANSWERED = new Keyword("$Answered"); + public static final Keyword DELETED = new Keyword("$Deleted"); + public static final Keyword RECENT = new Keyword("$Recent"); + public static final Keyword FORWARDED = new Keyword("$Forwarded"); + public static final Boolean FLAG_VALUE = true; + + private static final ImmutableList<Keyword> NON_EXPOSED_IMAP_KEYWORDS = ImmutableList.of(Keyword.RECENT, Keyword.DELETED); + private static final ImmutableBiMap<Flags.Flag, Keyword> IMAP_SYSTEM_FLAGS = ImmutableBiMap.<Flags.Flag, Keyword>builder() .put(Flags.Flag.DRAFT, DRAFT) .put(Flags.Flag.SEEN, SEEN) .put(Flags.Flag.FLAGGED, FLAGGED) http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java index 5e1c537..5b349a6 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java @@ -81,7 +81,7 @@ import com.google.common.collect.Sets; import com.jayway.jsonpath.JsonPath; public class GetMessagesMethodTest { - private final static String FORWARDED = "forwarded"; + private static final String FORWARDED = "forwarded"; public static final Flags FLAGS = null; public static final boolean NOT_RECENT = false; private MessageIdManager messageIdManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordTest.java index 58fdb24..c175e6d 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordTest.java @@ -33,8 +33,8 @@ import org.junit.rules.ExpectedException; import nl.jqno.equalsverifier.EqualsVerifier; public class KeywordTest { - private final static int FLAG_NAME_MAX_LENTH = 255; - private final static String ANY_KEYWORD = "AnyKeyword"; + private static final int FLAG_NAME_MAX_LENTH = 255; + private static final String ANY_KEYWORD = "AnyKeyword"; @Rule public ExpectedException expectedException = ExpectedException.none(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/UpdateMessagePatchTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/UpdateMessagePatchTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/UpdateMessagePatchTest.java index faf7f53..3c8e66d 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/UpdateMessagePatchTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/UpdateMessagePatchTest.java @@ -31,7 +31,7 @@ import org.junit.rules.ExpectedException; import com.google.common.collect.ImmutableMap; public class UpdateMessagePatchTest { - private final static String FORWARDED = "forwarded"; + private static final String FORWARDED = "forwarded"; @Rule public ExpectedException expectedException = ExpectedException.none(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java index 857af1f..bb36e15 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java @@ -40,7 +40,7 @@ import org.junit.Test; import com.google.common.collect.ImmutableList; public class FilterToSearchQueryTest { - private final static String FORWARDED = "forwarded"; + private static final String FORWARDED = "forwarded"; @Test public void filterConditionShouldThrowWhenUnknownFilter() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java index b043428..f2184f6 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java @@ -77,10 +77,10 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC private int timeout; private int literalSizeLimit; - public final static int DEFAULT_MAX_LINE_LENGTH = 65536; // Use a big default - public final static int DEFAULT_IN_MEMORY_SIZE_LIMIT = 10485760; // Use 10MB as default - public final static int DEFAULT_TIMEOUT = 30 * 60; // default timeout is 30 seconds - public final static int DEFAULT_LITERAL_SIZE_LIMIT = 0; + public static final int DEFAULT_MAX_LINE_LENGTH = 65536; // Use a big default + public static final int DEFAULT_IN_MEMORY_SIZE_LIMIT = 10485760; // Use 10MB as default + public static final int DEFAULT_TIMEOUT = 30 * 60; // default timeout is 30 seconds + public static final int DEFAULT_LITERAL_SIZE_LIMIT = 0; public IMAPServer(ImapDecoder decoder, ImapEncoder encoder, ImapProcessor processor, ImapMetrics imapMetrics) { this.processor = processor; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 f33e63f..7fe8f7d 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 @@ -51,10 +51,10 @@ public class ImapRequestFrameDecoder extends FrameDecoder implements NettyConsta private final ImapDecoder decoder; private final int inMemorySizeLimit; private final int literalSizeLimit; - private final static String NEEDED_DATA = "NEEDED_DATA"; - private final static String STORED_DATA = "STORED_DATA"; - private final static String WRITTEN_DATA = "WRITTEN_DATA"; - private final static String OUTPUT_STREAM = "OUTPUT_STREAM"; + private static final String NEEDED_DATA = "NEEDED_DATA"; + private static final String STORED_DATA = "STORED_DATA"; + private static final String WRITTEN_DATA = "WRITTEN_DATA"; + private static final String OUTPUT_STREAM = "OUTPUT_STREAM"; public ImapRequestFrameDecoder(ImapDecoder decoder, int inMemorySizeLimit, int literalSizeLimit) { this.decoder = decoder; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java index 63646b4..4f796bf 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java @@ -115,7 +115,7 @@ public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineRead */ public final class NotEnoughDataException extends RuntimeException { - public final static int UNKNOWN_SIZE = -1; + public static final int UNKNOWN_SIZE = -1; private final int size; public NotEnoughDataException(int size) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/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 75ef53e..f5082b3 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 @@ -59,7 +59,7 @@ public class PortUtil { * * @return port number */ - protected synchronized static int getNextNonPrivilegedPort() { + protected static synchronized int getNextNonPrivilegedPort() { // Hack to increase probability that the port is bindable int nextPortCandidate = PORT_LAST_USED; while (true) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java index 28422ae..bb7963a 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java @@ -43,7 +43,7 @@ import org.slf4j.Logger; public class ManageSieveChannelUpstreamHandler extends SimpleChannelUpstreamHandler { - final static String SSL_HANDLER = "sslHandler"; + static final String SSL_HANDLER = "sslHandler"; private final Logger logger; private final ChannelLocal<Session> attributes; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java index 9ad91c8..9f5f87c 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java @@ -48,15 +48,15 @@ public class ManageSieveServer extends AbstractConfigurableAsyncServer implement private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveServer.class); - final static String SSL_HANDLER = "sslHandler"; - final static String FRAMER = "framer"; - final static String CORE_HANDLER = "coreHandler"; - final static String GROUP_HANDLER = "groupHandler"; - final static String CONNECTION_LIMIT_HANDLER = "connectionLimitHandler"; - final static String CONNECTION_LIMIT_PER_IP_HANDLER = "connectionPerIpLimitHandler"; - final static String CONNECTION_COUNT_HANDLER = "connectionCountHandler"; - final static String CHUNK_WRITE_HANDLER = "chunkWriteHandler"; - final static String EXECUTION_HANDLER = "executionHandler"; + static final String SSL_HANDLER = "sslHandler"; + static final String FRAMER = "framer"; + static final String CORE_HANDLER = "coreHandler"; + static final String GROUP_HANDLER = "groupHandler"; + static final String CONNECTION_LIMIT_HANDLER = "connectionLimitHandler"; + static final String CONNECTION_LIMIT_PER_IP_HANDLER = "connectionPerIpLimitHandler"; + static final String CONNECTION_COUNT_HANDLER = "connectionCountHandler"; + static final String CHUNK_WRITE_HANDLER = "chunkWriteHandler"; + static final String EXECUTION_HANDLER = "executionHandler"; private final int maxLineLength; private final ManageSieveProcessor manageSieveProcessor; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java index 45ab614..162153b 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java @@ -44,26 +44,26 @@ import org.apache.james.protocols.pop3.core.WelcomeMessageHandler; public class CoreCmdHandlerLoader implements HandlersPackage { - private final static String CAPACMDHANDLER = CapaCmdHandler.class.getName(); - private final static String USERCMDHANDLER = UserCmdHandler.class.getName(); - private final static String PASSCMDHANDLER = PassCmdHandler.class.getName(); - private final static String LISTCMDHANDLER = ListCmdHandler.class.getName(); - private final static String UIDLCMDHANDLER = UidlCmdHandler.class.getName(); - private final static String RSETCMDHANDLER = RsetCmdHandler.class.getName(); - private final static String DELECMDHANDLER = DeleCmdHandler.class.getName(); - private final static String NOOPCMDHANDLER = NoopCmdHandler.class.getName(); - private final static String RETRSCMDHANDLER = RetrCmdHandler.class.getName(); - private final static String TOPCMDHANDLER = TopCmdHandler.class.getName(); - private final static String STATCMDHANDLER = StatCmdHandler.class.getName(); - private final static String QUITCMDHANDLER = QuitCmdHandler.class.getName(); - private final static String WELCOMEMESSAGEHANDLER = WelcomeMessageHandler.class.getName(); - private final static String UNKOWNCMDHANDLER = UnknownCmdHandler.class.getName(); - private final static String STLSCMDHANDLER = StlsCmdHandler.class.getName(); - - private final static String COMMANDDISPATCHER = CommandDispatcher.class.getName(); + private static final String CAPACMDHANDLER = CapaCmdHandler.class.getName(); + private static final String USERCMDHANDLER = UserCmdHandler.class.getName(); + private static final String PASSCMDHANDLER = PassCmdHandler.class.getName(); + private static final String LISTCMDHANDLER = ListCmdHandler.class.getName(); + private static final String UIDLCMDHANDLER = UidlCmdHandler.class.getName(); + private static final String RSETCMDHANDLER = RsetCmdHandler.class.getName(); + private static final String DELECMDHANDLER = DeleCmdHandler.class.getName(); + private static final String NOOPCMDHANDLER = NoopCmdHandler.class.getName(); + private static final String RETRSCMDHANDLER = RetrCmdHandler.class.getName(); + private static final String TOPCMDHANDLER = TopCmdHandler.class.getName(); + private static final String STATCMDHANDLER = StatCmdHandler.class.getName(); + private static final String QUITCMDHANDLER = QuitCmdHandler.class.getName(); + private static final String WELCOMEMESSAGEHANDLER = WelcomeMessageHandler.class.getName(); + private static final String UNKOWNCMDHANDLER = UnknownCmdHandler.class.getName(); + private static final String STLSCMDHANDLER = StlsCmdHandler.class.getName(); + + private static final String COMMANDDISPATCHER = CommandDispatcher.class.getName(); // logging stuff - private final static String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName(); + private static final String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName(); private final List<String> commands = new LinkedList<>(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java index 907e9e7..f96ff8b 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java @@ -45,14 +45,14 @@ import com.google.common.collect.ImmutableList; public class MailboxAdapter implements Mailbox { - private static abstract class POP3FetchGroup implements FetchGroup { + private abstract static class POP3FetchGroup implements FetchGroup { @Override public Set<PartContentDescriptor> getPartContentDescriptors() { return new HashSet<>(); } } - private final static FetchGroup FULL_GROUP = new POP3FetchGroup() { + private static final FetchGroup FULL_GROUP = new POP3FetchGroup() { @Override public int content() { @@ -61,7 +61,7 @@ public class MailboxAdapter implements Mailbox { }; - private final static FetchGroup BODY_GROUP = new POP3FetchGroup() { + private static final FetchGroup BODY_GROUP = new POP3FetchGroup() { @Override public int content() { @@ -70,7 +70,7 @@ public class MailboxAdapter implements Mailbox { }; - private final static FetchGroup HEADERS_GROUP = new POP3FetchGroup() { + private static final FetchGroup HEADERS_GROUP = new POP3FetchGroup() { @Override public int content() { @@ -78,7 +78,7 @@ public class MailboxAdapter implements Mailbox { } }; - private final static FetchGroup METADATA_GROUP = new POP3FetchGroup() { + private static final FetchGroup METADATA_GROUP = new POP3FetchGroup() { @Override public int content() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java index b2c3bc6..72c0c0f 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java @@ -30,7 +30,7 @@ public class JamesWelcomeMessageHandler extends WelcomeMessageHandler { /** * SMTP Server identification string used in SMTP headers */ - private final static String SERVICE_TYPE = "JAMES SMTP Server"; + private static final String SERVICE_TYPE = "JAMES SMTP Server"; @Override protected String getServiceType(SMTPSession session) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java index 449716e..115bff2 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java @@ -37,22 +37,22 @@ public class TLDLookup { * collection of known mult-part TLDs change to contain characters other * than these, this string must be modified. */ - static private final String tld = "[A-Za-z0-9\\-]*"; + private static final String tld = "[A-Za-z0-9\\-]*"; /** Simple regular expression that matches a two-part TLD */ - static private final String tld2 = tld + "\\." + tld; + private static final String tld2 = tld + "\\." + tld; /** Simple regular expression that matches a three-part TLD */ - static private final String tld3 = tld + "\\." + tld + "\\." + tld; + private static final String tld3 = tld + "\\." + tld + "\\." + tld; /** Array of all known multi-level TLDs */ - static private final String[] multiPartTLDs = initMultiPartTLDs(); + private static final String[] multiPartTLDs = initMultiPartTLDs(); /** A set of all known two-part TLDs */ - static private final HashSet<String> twoPartTLDs = initTwoPartTLDs(); + private static final HashSet<String> twoPartTLDs = initTwoPartTLDs(); /** A set of all known three-part TLDs */ - static private final HashSet<String> threePartTLDs = initThreePartTLDs(); + private static final HashSet<String> threePartTLDs = initThreePartTLDs(); /** * Determines if a two-part domain string (xxx.xxx) is contained in the @@ -62,7 +62,7 @@ public class TLDLookup { * a String representing a two-part domain * @return true if the domain string is found in the cache, false otherwise */ - static public boolean isTwoPartTLD(String domain) { + public static boolean isTwoPartTLD(String domain) { return twoPartTLDs.contains(domain); } @@ -74,7 +74,7 @@ public class TLDLookup { * a String representing a three-part domain * @return true if the domain string is found in the cache, false otherwise */ - static public boolean isThreePartTLD(String domain) { + public static boolean isThreePartTLD(String domain) { return threePartTLDs.contains(domain); } @@ -83,7 +83,7 @@ public class TLDLookup { * * @return a HashSet containing all known two-part TLDs */ - static private HashSet<String> initTwoPartTLDs() { + private static HashSet<String> initTwoPartTLDs() { HashSet<String> set = new HashSet<>(900); for (String multiPartTLD : multiPartTLDs) { try { @@ -103,7 +103,7 @@ public class TLDLookup { * * @return a HashSet containing all known three-part TLDs */ - static private HashSet<String> initThreePartTLDs() { + private static HashSet<String> initThreePartTLDs() { HashSet<String> set = new HashSet<>(); for (String multiPartTLD : multiPartTLDs) { try { @@ -124,7 +124,7 @@ public class TLDLookup { * * @return an array of all known multi-part TLDs */ - static private String[] initMultiPartTLDs() { + private static String[] initMultiPartTLDs() { String[] tmp = new String[] { "com.ac", "edu.ac", "gov.ac", "edu.ai", "gov.ai", "com.ar", "net.ar", "org.ar", "gov.ar", "mil.ar", "edu.ar", "int.ar", "co.at", "ac.at", "or.at", "gv.at", "priv.at", "com.au", "gov.au", "org.au", "edu.au", "id.au", "oz.au", "info.au", "net.au", "asn.au", "csiro.au", "telememo.au", "conf.au", "otc.au", "com.az", "net.az", "org.az", "com.bb", "net.bb", "org.bb", "ac.be", "belgie.be", "dns.be", "fgov.be", "com.bh", "gov.bh", "net.bh", "edu.bh", "org.bh", "com.bm", "edu.bm", "gov.bm", "org.bm", "net.bm", "adm.br", "adv.br", "agr.br", "am.br", "arq.br", "art.br", "ato.br", "bio.br", "bmd.br", "cim.br", "cng.br", "cnt.br", "com.br", "coop.br", "ecn.br", "edu.br", "eng.br", "esp.br", "etc.br", "eti.br", "far.br", "fm.br", "fnd.br", "fot.br", "fst.br", "g12.br", "ggf.br", "gov.br", "imb.br", "ind.br", "inf.br", http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java index dde058d..dce1959 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java @@ -61,9 +61,9 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco public static final String SPF_TEMPBLOCKLISTED = "SPF_TEMPBLOCKLISTED"; - public final static String SPF_HEADER = "SPF_HEADER"; + public static final String SPF_HEADER = "SPF_HEADER"; - public final static String SPF_HEADER_MAIL_ATTRIBUTE_NAME = "org.apache.james.spf.header"; + public static final String SPF_HEADER_MAIL_ATTRIBUTE_NAME = "org.apache.james.spf.header"; /** If set to true the mail will also be rejected on a softfail */ private boolean blockSoftFail = false; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java index a47efce..c8b6e9c 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java @@ -55,9 +55,9 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler { /** This log is the fall back shared by all instances */ private static final Logger LOGGER = LoggerFactory.getLogger(URIRBLHandler.class); - private final static String LISTED_DOMAIN = "LISTED_DOMAIN"; + private static final String LISTED_DOMAIN = "LISTED_DOMAIN"; - private final static String URBLSERVER = "URBL_SERVER"; + private static final String URBLSERVER = "URBL_SERVER"; private DNSService dnsService; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java index be303db..dd1d3ff 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java @@ -36,141 +36,141 @@ public class URIScanner { private static final Logger LOGGER = LoggerFactory.getLogger(URIScanner.class); // These regular expressions "inspired" by Spamassassin - static private final String reserved = ";/?:@&=+$,[]\\#|"; + private static final String reserved = ";/?:@&=+$,[]\\#|"; - static private final String reservedNoColon = ";/?@&=+$,[]\\#|"; + private static final String reservedNoColon = ";/?@&=+$,[]\\#|"; - static private final String mark = "-_.!~*'()"; + private static final String mark = "-_.!~*'()"; - static private final String unreserved = "A-Za-z0-9" + escape(mark) + "\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f"; + private static final String unreserved = "A-Za-z0-9" + escape(mark) + "\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f"; - static private final String uricSet = escape(reserved) + unreserved + "%"; + private static final String uricSet = escape(reserved) + unreserved + "%"; - static private final String uricNoColon = escape(reservedNoColon) + unreserved + "%"; + private static final String uricNoColon = escape(reservedNoColon) + unreserved + "%"; - static private final String schemeRE = "(?-xism:(?:https?|ftp|mailto|javascript|file))"; + private static final String schemeRE = "(?-xism:(?:https?|ftp|mailto|javascript|file))"; - static private final String schemelessRE = "(?-xism:(?<![.=])(?:(?i)www\\d*\\.|(?i)ftp\\.))"; + private static final String schemelessRE = "(?-xism:(?<![.=])(?:(?i)www\\d*\\.|(?i)ftp\\.))"; - static private final String uriRE = "(?-xism:\\b(?:" + schemeRE + ":[" + uricNoColon + "]|" + schemelessRE + ")[" + uricSet + "#]*)"; + private static final String uriRE = "(?-xism:\\b(?:" + schemeRE + ":[" + uricNoColon + "]|" + schemelessRE + ")[" + uricSet + "#]*)"; /** Pre-compiled pattern that matches URIs */ - static private final Pattern uriPattern = Pattern.compile(uriRE); + private static final Pattern uriPattern = Pattern.compile(uriRE); /** Pre-compiled pattern that matches URI scheme strings */ - static private final Pattern schemePattern = Pattern.compile("^" + schemeRE + ":"); + private static final Pattern schemePattern = Pattern.compile("^" + schemeRE + ":"); /** Pre-compiled pattern used to cleanup a found URI string */ - static private final Pattern uriCleanup = Pattern.compile("^<(.*)>$"); + private static final Pattern uriCleanup = Pattern.compile("^<(.*)>$"); /** Pre-compiled pattern used to cleanup a found URI string */ - static private final Pattern uriCleanup2 = Pattern.compile("[\\]\\)>#]$"); + private static final Pattern uriCleanup2 = Pattern.compile("[\\]\\)>#]$"); /** Pre-compile pattern for identifying "mailto" patterns */ - static private final Pattern uriCleanup3 = Pattern.compile("^(?i)mailto:([^\\/]{2})(.*)$"); + private static final Pattern uriCleanup3 = Pattern.compile("^(?i)mailto:([^\\/]{2})(.*)$"); // These regular expressions also "inspired" by Spamassassin - static private final String esc = "\\\\"; + private static final String esc = "\\\\"; - static private final String period = "\\."; + private static final String period = "\\."; - static private final String space = "\\040"; + private static final String space = "\\040"; - static private final String open_br = "\\["; + private static final String open_br = "\\["; - static private final String close_br = "\\]"; + private static final String close_br = "\\]"; - static private final String nonASCII = "\\x80-\\xff"; + private static final String nonASCII = "\\x80-\\xff"; - static private final String ctrl = "\\000-\\037"; + private static final String ctrl = "\\000-\\037"; - static private final String cr_list = "\\n\\015"; + private static final String cr_list = "\\n\\015"; - static private final String qtext = "[^" + esc + nonASCII + cr_list + "\"]"; + private static final String qtext = "[^" + esc + nonASCII + cr_list + "\"]"; - static private final String dtext = "[^" + esc + nonASCII + cr_list + open_br + close_br + "]"; + private static final String dtext = "[^" + esc + nonASCII + cr_list + open_br + close_br + "]"; - static private final String quoted_pair = esc + "[^" + nonASCII + "]"; + private static final String quoted_pair = esc + "[^" + nonASCII + "]"; - static private final String atom_char = "[^(" + space + ")<>@,;:\"." + esc + open_br + close_br + ctrl + nonASCII + "]"; + private static final String atom_char = "[^(" + space + ")<>@,;:\"." + esc + open_br + close_br + ctrl + nonASCII + "]"; - static private final String atom = "(?>" + atom_char + "+)"; + private static final String atom = "(?>" + atom_char + "+)"; - static private final String quoted_str = "\"" + qtext + "*(?:" + quoted_pair + qtext + "*)*\""; + private static final String quoted_str = "\"" + qtext + "*(?:" + quoted_pair + qtext + "*)*\""; - static private final String word = "(?:" + atom + "|" + quoted_str + ")"; + private static final String word = "(?:" + atom + "|" + quoted_str + ")"; - static private final String local_part = word + "(?:" + period + word + ")*"; + private static final String local_part = word + "(?:" + period + word + ")*"; - static private final String label = "[A-Za-z\\d](?:[A-Za-z\\d-]*[A-Za-z\\d])?"; + private static final String label = "[A-Za-z\\d](?:[A-Za-z\\d-]*[A-Za-z\\d])?"; - static private final String domain_ref = label + "(?:" + period + label + ")*"; + private static final String domain_ref = label + "(?:" + period + label + ")*"; - static private final String domain_lit = open_br + "(?:" + dtext + "|" + quoted_pair + ")*" + close_br; + private static final String domain_lit = open_br + "(?:" + dtext + "|" + quoted_pair + ")*" + close_br; - static private final String domain = "(?:" + domain_ref + "|" + domain_lit + ")"; + private static final String domain = "(?:" + domain_ref + "|" + domain_lit + ")"; - static private final String Addr_spec_re = "(?-xism:" + local_part + "\\s*\\@\\s*" + domain + ")"; + private static final String Addr_spec_re = "(?-xism:" + local_part + "\\s*\\@\\s*" + domain + ")"; /** Pre-compiled pattern for matching "schemeless" mailto strings */ - static private final Pattern emailAddrPattern = Pattern.compile(Addr_spec_re); + private static final Pattern emailAddrPattern = Pattern.compile(Addr_spec_re); /** Simple reqular expression to match an octet part of an IP address */ - static private final String octet = "(?:[1-2][0-9][0-9])|(?:[1-9][0-9])|(?:[0-9])"; + private static final String octet = "(?:[1-2][0-9][0-9])|(?:[1-9][0-9])|(?:[0-9])"; /** * Simple regular expression to match a part of a domain string in the * TLDLookup cache. */ - static private final String tld = "[A-Za-z0-9\\-]*"; + private static final String tld = "[A-Za-z0-9\\-]*"; /** Simple regular expression that matches a two-part TLD */ - static private final String tld2 = tld + "\\." + tld; + private static final String tld2 = tld + "\\." + tld; /** Simple regular expression that matches a three-part TLD */ - static private final String tld3 = tld + "\\." + tld + "\\." + tld; + private static final String tld3 = tld + "\\." + tld + "\\." + tld; /** * Regular expression that matches and captures parts of a possible one-part * TLD domain string */ - static private final String tldCap = "(" + tld + "\\.(" + tld + "))$"; + private static final String tldCap = "(" + tld + "\\.(" + tld + "))$"; /** * Regular expression that matches and captures parts of a possible two-part * TLD domain string */ - static private final String tld2Cap = "(" + tld + "\\.(" + tld2 + "))$"; + private static final String tld2Cap = "(" + tld + "\\.(" + tld2 + "))$"; /** * Regular expression that matches and captures parts of a possible * three-part TLD domain string */ - static private final String tld3Cap = "(" + tld + "\\.(" + tld3 + "))$"; + private static final String tld3Cap = "(" + tld + "\\.(" + tld3 + "))$"; /** Regular expression that matches and captures parts of an IP address */ - static private final String ipCap = "((" + octet + ")\\.(" + octet + ")\\.(" + octet + ")\\.(" + octet + "))$"; + private static final String ipCap = "((" + octet + ")\\.(" + octet + ")\\.(" + octet + ")\\.(" + octet + "))$"; /** Pre-compiled pattern that matches IP addresses */ - static private final Pattern ipCapPattern = Pattern.compile(ipCap); + private static final Pattern ipCapPattern = Pattern.compile(ipCap); /** * Pre-compiled pattern that matches domain string that is possibly * contained in a one-part TLD */ - static private final Pattern tldCapPattern = Pattern.compile(tldCap); + private static final Pattern tldCapPattern = Pattern.compile(tldCap); /** * Pre-compiled pattern that matches domain string that is possibly * contained in a two-part TLD */ - static private final Pattern tld2CapPattern = Pattern.compile(tld2Cap); + private static final Pattern tld2CapPattern = Pattern.compile(tld2Cap); /** * Pre-compiled pattern that matches domain string that is possibly * contained in a three-part TLD */ - static private final Pattern tld3CapPattern = Pattern.compile(tld3Cap); + private static final Pattern tld3CapPattern = Pattern.compile(tld3Cap); /** * <p> @@ -190,7 +190,7 @@ public class URIScanner { * a character sequence to be scanned for URIs * @return newDomains the domains which were extracted */ - static public HashSet<String> scanContentForDomains(HashSet<String> domains, CharSequence content) { + public static HashSet<String> scanContentForDomains(HashSet<String> domains, CharSequence content) { HashSet<String> hosts = scanContentForHosts(content); return hosts.stream() .map(URIScanner::domainFromHost) @@ -207,7 +207,7 @@ public class URIScanner { * a character sequence to be scanned for URIs * @return a HashSet containing host strings */ - static protected HashSet<String> scanContentForHosts(CharSequence content) { + protected static HashSet<String> scanContentForHosts(CharSequence content) { HashSet<String> set = new HashSet<>(); // look for URIs @@ -277,7 +277,7 @@ public class URIScanner { * @return the host portion of the supplied URI, null if no host string * could be found */ - static protected String hostFromUriStr(String uriStr) { + protected static String hostFromUriStr(String uriStr) { LOGGER.debug("hostFromUriStr(\"{}\")", uriStr); String host = null; URI uri; @@ -303,7 +303,7 @@ public class URIScanner { * a string containing a host name * @return the registrar domain portion of the supplied host string */ - static protected String domainFromHost(String host) { + protected static String domainFromHost(String host) { LOGGER.debug("domainFromHost(\"{}\")", host); String domain = null; Matcher mat; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java index aad6429..7eeecf0 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java @@ -51,9 +51,9 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * Whether authentication is required to use this SMTP server. */ - private final static int AUTH_DISABLED = 0; - private final static int AUTH_REQUIRED = 1; - private final static int AUTH_ANNOUNCE = 2; + private static final int AUTH_DISABLED = 0; + private static final int AUTH_REQUIRED = 1; + private static final int AUTH_ANNOUNCE = 2; private int authRequired = AUTH_DISABLED; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java index 3016e44..cc26723 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java @@ -44,7 +44,7 @@ import org.junit.Test; public class SpamAssassinHandlerTest { private Mail mockedMail; - public final static String SPAMD_HOST = "localhost"; + public static final String SPAMD_HOST = "localhost"; private SMTPSession setupMockedSMTPSession(Mail mail) { mockedMail = mail; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java index 34efb66..de8fb36 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java @@ -44,11 +44,11 @@ import org.junit.Test; public class ValidRcptHandlerTest { - private final static String VALID_DOMAIN = "localhost"; - private final static String VALID_USER = "postmaster"; - private final static String INVALID_USER = "invalid"; - private final static String USER1 = "user1"; - private final static String USER2 = "user2"; + private static final String VALID_DOMAIN = "localhost"; + private static final String VALID_USER = "postmaster"; + private static final String INVALID_USER = "invalid"; + private static final String USER1 = "user1"; + private static final String USER2 = "user2"; UsersRepository users; ValidRcptHandler handler; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java index ab94a2d..c7b9d33 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java @@ -37,9 +37,9 @@ import org.junit.Test; public class ValidRcptMXTest { - private final static String INVALID_HOST = "invalid.host.de"; - private final static String INVALID_MX = "mx." + INVALID_HOST; - private final static String LOOPBACK = "127.0.0.1"; + private static final String INVALID_HOST = "invalid.host.de"; + private static final String INVALID_MX = "mx." + INVALID_HOST; + private static final String LOOPBACK = "127.0.0.1"; private SMTPSession setupMockedSMTPSession(MailAddress rcpt) { return new BaseFakeSMTPSession() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java index 13b65b0..1195a8e 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java @@ -48,7 +48,7 @@ public class FileSystemBlobStrategy implements BlobUploadStrategy, BlobDownloadS private final BlobTransferPolicy policy; private final int splitCount; private final Object lock = new Object(); - private final static SecureRandom RANDOM = new SecureRandom(); + private static final SecureRandom RANDOM = new SecureRandom(); public FileSystemBlobStrategy(BlobTransferPolicy policy, FileSystem fileSystem, int splitCount) { this.fileSystem = fileSystem; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java index a85b831..a3cdea8 100644 --- a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java +++ b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java @@ -31,7 +31,7 @@ import com.google.common.base.Throwables; public class ActiveMQMailQueueBlobTest extends ActiveMQMailQueueTest { - public final static String BASE_DIR = "file://target/james-test"; + public static final String BASE_DIR = "file://target/james-test"; private MyFileSystem fs; @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
