You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2016/03/01 20:56:27 UTC

[03/10] james-project git commit: JAMES-1695 remove useless final qualifiers

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
index c916740..0b808eb 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
@@ -171,7 +171,7 @@ public class SearchCommandParserCharsetTest {
                 true, "US-ASCII");
     }
 
-    private void checkUTF8Valid(byte[] term, final SearchKey key)
+    private void checkUTF8Valid(byte[] term, SearchKey key)
             throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(NioUtils.add(NioUtils.add(CHARSET,
@@ -181,7 +181,7 @@ public class SearchCommandParserCharsetTest {
         assertEquals(key, searchKey);
     }
 
-    private void checkValid(String input, final SearchKey key, boolean isFirst,
+    private void checkValid(String input, SearchKey key, boolean isFirst,
             String charset) throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(input.getBytes(charset)),

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
index c58d420..c83aeb2 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
@@ -128,7 +128,7 @@ public class SearchCommandParserNotTest {
         assertEquals("foo", keys.get(1).getValue()); 
     } 
 
-    private void checkValid(String input, final SearchKey key) throws Exception {
+    private void checkValid(String input, SearchKey key) throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(input.getBytes("US-ASCII")),
                 new ByteArrayOutputStream());

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
index d2d7570..bcb3b20 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
@@ -271,7 +271,7 @@ public class SearchCommandParserQuotedCharsetTest {
                 true, "US-ASCII");
     }
 
-    private void checkUTF8Valid(byte[] term, final SearchKey key)
+    private void checkUTF8Valid(byte[] term, SearchKey key)
             throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(add(add(CHARSET, term),
@@ -281,7 +281,7 @@ public class SearchCommandParserQuotedCharsetTest {
         assertEquals(key, searchKey);
     }
 
-    private void checkValid(String input, final SearchKey key, boolean isFirst,
+    private void checkValid(String input, SearchKey key, boolean isFirst,
             String charset) throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(input.getBytes(charset)),

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
index c23809f..004f1b8 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
@@ -101,7 +101,7 @@ public class SearchCommandParserSearchKeySequenceSetTest {
         checkValid(sequence, key);
     }
 
-    private void checkValid(String input, final SearchKey key) throws Exception {
+    private void checkValid(String input, SearchKey key) throws Exception {
         input = input + "\r\n";
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(input.getBytes("US-ASCII")),

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
index f864e8f..5f3fd3e 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
@@ -381,7 +381,7 @@ public class SearchCommandParserSearchKeyTest {
     }
 
    
-    private void checkValid(String input, final SearchKey key) throws Exception {
+    private void checkValid(String input, SearchKey key) throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(input.getBytes("US-ASCII")),
                 new ByteArrayOutputStream());
@@ -733,7 +733,7 @@ public class SearchCommandParserSearchKeyTest {
         checkValid(number + "\r\n", key);
     }
 
-    private void checkInvalid(String input, final SearchKey key)
+    private void checkInvalid(String input, SearchKey key)
             throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(input.getBytes("US-ASCII")),

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
index 2812faf..75444d0 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
@@ -82,8 +82,8 @@ public class StoreCommandParserTest {
                 flags, false, "A01");
     }
     
-    private void check(String input, final IdRange[] idSet,final boolean silent,
-            final Boolean sign, final Flags flags, final boolean useUids, final String tag)
+    private void check(String input, IdRange[] idSet, boolean silent,
+            final Boolean sign, Flags flags, boolean useUids, String tag)
             throws Exception {
         ImapRequestLineReader reader = new ImapRequestStreamLineReader(
                 new ByteArrayInputStream(input.getBytes("US-ASCII")),

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
index cc377b7..896d6d0 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
@@ -142,7 +142,7 @@ public class NamespaceProcessorTest {
         subject.doProcess(namespaceRequest, responderMock, imapSessionStub);
     }
 
-    private NamespaceResponse buildResponse(final List<NamespaceResponse.Namespace> sharedSpaces) {
+    private NamespaceResponse buildResponse(List<NamespaceResponse.Namespace> sharedSpaces) {
        
         final List<NamespaceResponse.Namespace> personalSpaces = new ArrayList<NamespaceResponse.Namespace>();
         personalSpaces.add(new NamespaceResponse.Namespace(PERSONAL_PREFIX, MailboxConstants.DEFAULT_DELIMITER));

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
index 819fd07..5984cb8 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
@@ -485,7 +485,7 @@ public class SearchProcessorTest {
         check(key, query);
     }
 
-    private void check(final SearchKey key, final SearchQuery query) throws Exception {        
+    private void check(SearchKey key, final SearchQuery query) throws Exception {        
         mockery.checking(new Expectations() {{
             allowing(session).getAttribute(
                     with(equal(SearchProcessor.SEARCH_MODSEQ))); will(returnValue(null));

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
index aff9d01..e5f342b 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
@@ -72,7 +72,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
      * (non-Javadoc)
      * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(org.apache.james.protocols.smtp.SMTPSession, java.nio.ByteBuffer, org.apache.james.protocols.api.handler.LineHandler)
      */
-    public Response onLine(final SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) {
+    public Response onLine(SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) {
         MailEnvelopeImpl env = (MailEnvelopeImpl) session.getAttachment(DataCmdHandler.MAILENV, ProtocolSession.State.Transaction);
         OutputStream out = env.getMessageOutputStream();
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
index 2fb0f2b..9ed65c1 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
@@ -113,7 +113,7 @@ public class DNSRBLHandlerTest {
     /**
      * Setup mocked smtpsession
      */
-    private void setupMockedSMTPSession(final MailAddress rcpt) {
+    private void setupMockedSMTPSession(MailAddress rcpt) {
         mockedSMTPSession = new BaseFakeSMTPSession() {
             HashMap<String,Object> sessionState = new HashMap<String,Object>();
             HashMap<String,Object> connectionState = new HashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
index f7594a9..94ede21 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
@@ -45,8 +45,8 @@ public class ResolvableEhloHeloHandlerTest {
     public final static String VALID_HOST = "james.apache.org";
 
 
-    private SMTPSession setupMockSession(final String argument,
-             final boolean relaying, final boolean authRequired, final String user, final MailAddress recipient) {
+    private SMTPSession setupMockSession(String argument,
+             final boolean relaying, final boolean authRequired, final String user, MailAddress recipient) {
 
         return new BaseFakeSMTPSession() {
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
index 3fb7009..6090872 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
@@ -36,7 +36,7 @@ public class MailetLoaderBeanFactory extends AbstractLoaderBeanFactory<Mailet> i
     /**
      * @see org.apache.james.mailetcontainer.api.MailetLoader#getMailet(org.apache.mailet.MailetConfig)
      */
-    public Mailet getMailet(final MailetConfig config) throws MessagingException {
+    public Mailet getMailet(MailetConfig config) throws MessagingException {
         String mailetName = config.getMailetName();
 
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 ad5bc27..d361dbf 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
@@ -143,7 +143,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
      * @param beanName
      */
     @Override
-    public Object postProcessAfterInitialization(final Object bean, final String beanName) throws BeansException {
+    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
         if (logger.isDebugEnabled())
             logger.debug("processing [" + bean.getClass().getName() + ", " + beanName + "]");
         // Catch FactoryBean created instances.
@@ -205,7 +205,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
     }
 
     @SuppressWarnings("rawtypes")
-    private FactoryBean getServiceImporter(final A s, final Method writeMethod, String beanName) throws Exception {
+    private FactoryBean getServiceImporter(A s, Method writeMethod, String beanName) throws Exception {
         // Invocations will block here, so although the ApplicationContext is
         // created nothing will
         // proceed until all the dependencies are satisfied.

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java
index 1d757c0..91674d2 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java
@@ -138,7 +138,7 @@ public abstract class AbstractBundleTracker implements BeanFactoryAware, BundleL
      * @return factory
      * @throws Exception
      */
-    private BeanFactory getBeanFactory(final BundleContext bundleContext) throws Exception {
+    private BeanFactory getBeanFactory(BundleContext bundleContext) throws Exception {
         final String filter = "(" + OsgiServicePropertiesResolver.BEAN_NAME_PROPERTY_KEY + "=" + bundleContext.getBundle().getSymbolicName() + ")";
         final ServiceReference<?>[] applicationContextRefs = bundleContext.getServiceReferences(ApplicationContext.class.getName(), filter);
         

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/container/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java
index ecf579e..8aeaaf5 100644
--- a/server/container/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java
+++ b/server/container/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java
@@ -30,7 +30,7 @@ public class NamedThreadFactory implements ThreadFactory {
     private final AtomicLong count = new AtomicLong();
     private final int priority;
 
-    public NamedThreadFactory(final String name, final int priority) {
+    public NamedThreadFactory(String name, int priority) {
         if (priority > Thread.MAX_PRIORITY || priority < Thread.MIN_PRIORITY) {
             throw new IllegalArgumentException("Priority must be <= " + Thread.MAX_PRIORITY + " and >=" + Thread.MIN_PRIORITY);
         }
@@ -38,7 +38,7 @@ public class NamedThreadFactory implements ThreadFactory {
         this.priority = priority;
     }
 
-    public NamedThreadFactory(final String name) {
+    public NamedThreadFactory(String name) {
         this(name, Thread.NORM_PRIORITY);
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 a2e8c8c..f355209 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
@@ -75,7 +75,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
      * @param logger
      * @throws NamingException
      */
-    public RetryingContext(final RetrySchedule schedule, final int maxRetries, final Logger logger)
+    public RetryingContext(RetrySchedule schedule, int maxRetries, Logger logger)
             throws NamingException {
         this(DEFAULT_EXCEPTION_CLASSES, schedule, maxRetries, logger);
     }
@@ -89,7 +89,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
      * @param logger
      * @throws NamingException
      */
-    public RetryingContext(final Class<?>[] exceptionClasses, final RetrySchedule schedule, final int maxRetries, final Logger logger)
+    public RetryingContext(Class<?>[] exceptionClasses, RetrySchedule schedule, int maxRetries, Logger logger)
             throws NamingException {
         this();
         _schedule = schedule;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 369457d..a5bbc21 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
@@ -156,7 +156,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public void deleteScript(final String user, final String name) throws UserNotFoundException,
+    public void deleteScript(String user, String name) throws UserNotFoundException,
             ScriptNotFoundException, IsActiveException, StorageException {
         synchronized (lock) {
             File file = getScriptFile(user, name);
@@ -172,7 +172,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public InputStream getScript(final String user, final String name) throws UserNotFoundException,
+    public InputStream getScript(String user, String name) throws UserNotFoundException,
             ScriptNotFoundException, StorageException {
         InputStream script;
         try {
@@ -192,7 +192,7 @@ public class SieveFileRepository implements SieveRepository {
      * @see SieveRepository#haveSpace(java.lang.String, java.lang.String, long)
      */
     @Override
-    public void haveSpace(final String user, final String name, final long size) throws UserNotFoundException,
+    public void haveSpace(String user, String name, long size) throws UserNotFoundException,
             QuotaExceededException, StorageException {
         long usedSpace = 0;
         for (File file : getUserDirectory(user).listFiles()) {
@@ -228,7 +228,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public List<ScriptSummary> listScripts(final String user) throws UserNotFoundException, StorageException {
+    public List<ScriptSummary> listScripts(String user) throws UserNotFoundException, StorageException {
         File[] files = getUserDirectory(user).listFiles();
         List<ScriptSummary> summaries = new ArrayList<ScriptSummary>(files.length);
         File activeFile = null;
@@ -237,7 +237,7 @@ public class SieveFileRepository implements SieveRepository {
         } catch (ScriptNotFoundException ex) {
             // no op
         }
-        for (final File file : files) {
+        for (File file : files) {
             if (!SYSTEM_FILES.contains(file.getName())) {
                 summaries.add(new ScriptSummary(file.getName(), isActive(file, activeFile)));
             }
@@ -251,7 +251,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public void putScript(final String user, final String name, final String content)
+    public void putScript(String user, String name, String content)
             throws UserNotFoundException, StorageException, QuotaExceededException {
         synchronized (lock) {
             File file = new File(getUserDirectory(user), name);
@@ -261,7 +261,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public void renameScript(final String user, final String oldName, final String newName)
+    public void renameScript(String user, String oldName, String newName)
             throws UserNotFoundException, ScriptNotFoundException,
             DuplicateException, StorageException {
         synchronized (lock) {
@@ -283,7 +283,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public InputStream getActive(final String user) throws UserNotFoundException,
+    public InputStream getActive(String user) throws UserNotFoundException,
             ScriptNotFoundException, StorageException {
         InputStream script;
         try {
@@ -295,7 +295,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public void setActive(final String user, final String name) throws UserNotFoundException,
+    public void setActive(String user, String name) throws UserNotFoundException,
             ScriptNotFoundException, StorageException {
         synchronized (lock) {
             // Turn off currently active script, if any
@@ -391,7 +391,7 @@ public class SieveFileRepository implements SieveRepository {
         return file;
     }
 
-    public void ensureUser(final String user) throws StorageException {
+    public void ensureUser(String user) throws StorageException {
         synchronized (lock) {
             try {
                 FileUtils.forceMkdir(getUserDirectoryFile(user));
@@ -449,7 +449,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public synchronized void setQuota(final long quota) throws StorageException {
+    public synchronized void setQuota(long quota) throws StorageException {
         File file = getQuotaFile();
         String content = Long.toString(quota);
         toFile(file, content);
@@ -460,12 +460,12 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public boolean hasQuota(final String user) throws UserNotFoundException, StorageException {
+    public boolean hasQuota(String user) throws UserNotFoundException, StorageException {
         return getQuotaFile(user).exists();
     }
 
     @Override
-    public long getQuota(final String user) throws UserNotFoundException, QuotaNotFoundException, StorageException {
+    public long getQuota(String user) throws UserNotFoundException, QuotaNotFoundException, StorageException {
         Long quota = null;
         File file = getQuotaFile(user);
         if (file.exists()) {
@@ -490,7 +490,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public void removeQuota(final String user) throws UserNotFoundException,
+    public void removeQuota(String user) throws UserNotFoundException,
             QuotaNotFoundException, StorageException {
         synchronized (lock) {
             File file = getQuotaFile(user);
@@ -506,7 +506,7 @@ public class SieveFileRepository implements SieveRepository {
     }
 
     @Override
-    public void setQuota(final String user, final long quota) throws UserNotFoundException,
+    public void setQuota(String user, long quota) throws UserNotFoundException,
             StorageException {
         synchronized (lock) {
             File file = getQuotaFile(user);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
index 709be4c..b33e71f 100644
--- a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
@@ -77,7 +77,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
     /**
      * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
-    protected void doConfigure(final HierarchicalConfiguration configuration) throws ConfigurationException {
+    protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         super.doConfigure(configuration);
         destination = configuration.getString("destination.[@URL]");
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
index 944db8b..22f61b7 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
@@ -140,7 +140,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      * @throws UsersRepositoryException
      *            If an error occurred
      */
-    public void updateUser(final User user) throws UsersRepositoryException {
+    public void updateUser(User user) throws UsersRepositoryException {
         if (user != null && user instanceof JCRUser) {
             final JCRUser jcrUser = (JCRUser) user;
             final String userName = jcrUser.getUserName();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
index bf88395..9eb20b5 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
@@ -51,7 +51,7 @@ public class JCRUser implements User {
     private final String userName;
     private String hashedSaltedPassword;
 
-    public JCRUser(final String userName, String hashedSaltedPassword) {
+    public JCRUser(String userName, String hashedSaltedPassword) {
         super();
         this.userName = userName;
         this.hashedSaltedPassword = hashedSaltedPassword;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
index bab0300..640f9ab 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
@@ -87,7 +87,7 @@ public class JPAUser implements User {
     protected JPAUser() {
     }
 
-    public JPAUser(final String userName, String password, String alg) {
+    public JPAUser(String userName, String password, String alg) {
         super();
         this.name = userName;
         this.alg = alg;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
index 057555b..fc1c16a 100644
--- a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
+++ b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
@@ -37,7 +37,7 @@ public class Lock {
      *            the Object on which to check the lock
      * @return true if the object is locked, false otherwise
      */
-    public boolean isLocked(final Object key) {
+    public boolean isLocked(Object key) {
         return (locks.get(key) != null);
     }
 
@@ -48,7 +48,7 @@ public class Lock {
      *            the Object on which to lock
      * @return true if the calling thread can lock, false otherwise
      */
-    public boolean canI(final Object key) {
+    public boolean canI(Object key) {
         Object o = locks.get(key);
 
         return null == o || o == this.getCallerId();
@@ -62,7 +62,7 @@ public class Lock {
      *            the Object on which to lock
      * @return true if the locking was successful, false otherwise
      */
-    public boolean lock(final Object key) {
+    public boolean lock(Object key) {
         Object theLock;
 
         synchronized (this) {
@@ -82,7 +82,7 @@ public class Lock {
      *            the Object on which the lock is held
      * @return true if the unlocking was successful, false otherwise
      */
-    public boolean unlock(final Object key) {
+    public boolean unlock(Object key) {
         Object theLock;
         synchronized (this) {
             theLock = locks.get(key);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
index 7ff68e9..8531c69 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
@@ -97,7 +97,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
 
         try {
             directory = m_baseDirectory.getCanonicalFile();
-        } catch (final IOException ioe) {
+        } catch (IOException ioe) {
             throw new ConfigurationException("Unable to form canonical representation of " + m_baseDirectory);
         }
 
@@ -154,7 +154,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
      * @throws ConfigurationException
      *             get thrown on invalid destintion syntax
      */
-    protected void setDestination(final String destination) throws ConfigurationException {
+    protected void setDestination(String destination) throws ConfigurationException {
 
         if (!destination.startsWith(FileSystem.FILE_PROTOCOL)) {
             throw new ConfigurationException("cannot handle destination " + destination);
@@ -181,12 +181,12 @@ public abstract class AbstractFileRepository implements Repository, Configurable
     }
 
     @Override
-    public Repository getChildRepository(final String childName) {
+    public Repository getChildRepository(String childName) {
         AbstractFileRepository child;
 
         try {
             child = createChildRepository();
-        } catch (final Exception e) {
+        } catch (Exception e) {
             throw new RuntimeException("Cannot create child repository " + childName + " : " + e);
         }
 
@@ -195,13 +195,13 @@ public abstract class AbstractFileRepository implements Repository, Configurable
 
         try {
             child.setDestination(m_baseDirectory.getAbsolutePath() + File.pathSeparatorChar + childName + File.pathSeparator);
-        } catch (final ConfigurationException ce) {
+        } catch (ConfigurationException ce) {
             throw new RuntimeException("Cannot set destination for child child " + "repository " + childName + " : " + ce);
         }
 
         try {
             child.init();
-        } catch (final Exception e) {
+        } catch (Exception e) {
             throw new RuntimeException("Cannot initialize child " + "repository " + childName + " : " + e);
         }
 
@@ -221,7 +221,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
      * @throws IOException
      *             get thrown on IO error
      */
-    protected File getFile(final String key) throws IOException {
+    protected File getFile(String key) throws IOException {
         return new File(encode(key));
     }
 
@@ -234,7 +234,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
      * @throws IOException
      *             get thrown on IO error
      */
-    protected InputStream getInputStream(final String key) throws IOException {
+    protected InputStream getInputStream(String key) throws IOException {
         // This was changed to SharedFileInputStream but reverted to
         // fix JAMES-559. Usign SharedFileInputStream should be a good
         // performance improvement, but more checks have to be done
@@ -252,7 +252,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
      * @throws IOException
      *             get thrown on IO error
      */
-    protected OutputStream getOutputStream(final String key) throws IOException {
+    protected OutputStream getOutputStream(String key) throws IOException {
         return new FileOutputStream(getFile(key));
     }
 
@@ -264,7 +264,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
      * @throws IOException 
      */
     
-    public synchronized boolean remove(final String key) {
+    public synchronized boolean remove(String key) {
         try {
             FileUtils.forceDelete(getFile(key));
             return true;
@@ -282,13 +282,13 @@ public abstract class AbstractFileRepository implements Repository, Configurable
      *            the key which checked for
      * @return true if the repository contains the key
      */
-    public synchronized boolean containsKey(final String key) {
+    public synchronized boolean containsKey(String key) {
         try {
             final File file = getFile(key);
             if (DEBUG)
                 getLogger().debug("checking key " + key);
             return file.exists();
-        } catch (final Exception e) {
+        } catch (Exception e) {
             throw new RuntimeException("Exception caught while searching " + "an object: " + e);
         }
     }
@@ -321,7 +321,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
      * @return result a unique String represent the Object which belongs to the
      *         key
      */
-    protected String encode(final String key) {
+    protected String encode(String key) {
         final byte[] bytes = key.getBytes();
         final char[] buffer = new char[bytes.length << 1];
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
index 9e79ddd..c7c256c 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
@@ -31,12 +31,12 @@ import java.io.ObjectStreamClass;
 public class ClassLoaderObjectInputStream extends ObjectInputStream {
     private final ClassLoader m_classLoader;
 
-    public ClassLoaderObjectInputStream(final ClassLoader classLoader, final InputStream inputStream) throws IOException {
+    public ClassLoaderObjectInputStream(ClassLoader classLoader, InputStream inputStream) throws IOException {
         super(inputStream);
         m_classLoader = classLoader;
     }
 
-    protected Class<?> resolveClass(final ObjectStreamClass objectStreamClass) throws IOException, ClassNotFoundException {
+    protected Class<?> resolveClass(ObjectStreamClass objectStreamClass) throws IOException, ClassNotFoundException {
         final Class<?> clazz = Class.forName(objectStreamClass.getName(), false, m_classLoader);
 
         if (null != clazz) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
index fd367e2..a5ab933 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
@@ -42,15 +42,15 @@ import java.io.FilenameFilter;
 public class ExtensionFileFilter implements FilenameFilter {
     private final String[] m_extensions;
 
-    public ExtensionFileFilter(final String[] extensions) {
+    public ExtensionFileFilter(String[] extensions) {
         m_extensions = extensions;
     }
 
-    public ExtensionFileFilter(final String extension) {
+    public ExtensionFileFilter(String extension) {
         m_extensions = new String[] { extension };
     }
 
-    public boolean accept(final File file, final String name) {
+    public boolean accept(File file, String name) {
         for (String m_extension : m_extensions) {
             if (name.endsWith(m_extension)) {
                 return true;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
index 149382f..1fe1ba0 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
@@ -44,7 +44,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
      * @see
      * org.apache.james.repository.api.ObjectRepository#get(java.lang.String)
      */
-    public synchronized Object get(final String key) {
+    public synchronized Object get(String key) {
         try {
             final InputStream inputStream = getInputStream(key);
 
@@ -61,7 +61,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
             } finally {
                 inputStream.close();
             }
-        } catch (final Throwable e) {
+        } catch (Throwable e) {
             throw new RuntimeException("Exception caught while retrieving an object, cause: " + e.toString());
         }
     }
@@ -71,7 +71,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
      * org.apache.james.repository.api.ObjectRepository#get(java.lang.String,
      * java.lang.ClassLoader)
      */
-    public synchronized Object get(final String key, final ClassLoader classLoader) {
+    public synchronized Object get(String key, ClassLoader classLoader) {
         try {
             final InputStream inputStream = getInputStream(key);
 
@@ -91,7 +91,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
                 stream.close();
                 inputStream.close();
             }
-        } catch (final Throwable e) {
+        } catch (Throwable e) {
             throw new RuntimeException("Exception caught while retrieving an object: " + e);
         }
 
@@ -102,7 +102,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
      * org.apache.james.repository.api.ObjectRepository#put(java.lang.String,
      * java.lang.Object)
      */
-    public synchronized void put(final String key, final Object value) {
+    public synchronized void put(String key, Object value) {
         try {
             final OutputStream outputStream = getOutputStream(key);
 
@@ -114,7 +114,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
             } finally {
                 outputStream.close();
             }
-        } catch (final Exception e) {
+        } catch (Exception e) {
             throw new RuntimeException("Exception caught while storing an object: " + e);
         }
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
index 4b32f98..5c5329d 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
@@ -41,10 +41,10 @@ public class FilePersistentStreamRepository extends AbstractFileRepository imple
 
 
     @Override
-    public synchronized InputStream get(final String key) {
+    public synchronized InputStream get(String key) {
         try {
             return getInputStream(key);
-        } catch (final IOException ioe) {
+        } catch (IOException ioe) {
             final String message = "Exception caught while retrieving a stream ";
             getLogger().warn(message, ioe);
             throw new RuntimeException(message + ": " + ioe);
@@ -53,11 +53,11 @@ public class FilePersistentStreamRepository extends AbstractFileRepository imple
 
 
     @Override
-    public synchronized OutputStream put(final String key) {
+    public synchronized OutputStream put(String key) {
         try {
             final OutputStream outputStream = getOutputStream(key);
             return new BufferedOutputStream(outputStream);
-        } catch (final IOException ioe) {
+        } catch (IOException ioe) {
             final String message = "Exception caught while storing a stream ";
             getLogger().warn(message, ioe);
             throw new RuntimeException(message + ": " + ioe);
@@ -70,7 +70,7 @@ public class FilePersistentStreamRepository extends AbstractFileRepository imple
      * @param key the key to get the size for
      * @return size the Size which belongs to the givens keys file
      */
-    public long getSize(final String key) {
+    public long getSize(String key) {
         try {
             return getFile(key).length();
         } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
index 96aa1c2..0f40f00 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
@@ -36,7 +36,7 @@ public class NumberedRepositoryFileFilter implements FilenameFilter {
      * @param extension
      *            the extension for which checked
      */
-    public NumberedRepositoryFileFilter(final String extension) {
+    public NumberedRepositoryFileFilter(String extension) {
         postfix = extension;
         prefix = ".Repository";
     }
@@ -44,7 +44,7 @@ public class NumberedRepositoryFileFilter implements FilenameFilter {
     /**
      * @see java.io.FilenameFilter#accept(File, String)
      */
-    public boolean accept(final File file, final String name) {
+    public boolean accept(File file, String name) {
         // System.out.println("check: " + name);
         // System.out.println("post: " + postfix);
         if (!name.endsWith(postfix)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
index a3ba16b..f4aadec 100644
--- a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
+++ b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
@@ -118,7 +118,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
     @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
 
-        final boolean autodiscover = configuration.getBoolean("autodiscover", true);
+        boolean autodiscover = configuration.getBoolean("autodiscover", true);
 
         List<Name> sPaths = new ArrayList<Name>();
         if (autodiscover) {
@@ -164,7 +164,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
             dnsServers.add("127.0.0.1");
         }
 
-        final boolean authoritative = configuration.getBoolean("authoritative", false);
+        boolean authoritative = configuration.getBoolean("authoritative", false);
         // TODO: Check to see if the credibility field is being used correctly.
         // From the
         // docs I don't think so

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
index 1536c1a..e3ad217 100644
--- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
+++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
@@ -175,7 +175,7 @@ public class InetNetworkBuilder {
      * @param netspec
      * @return addrMask the address/mask of the given argument
      */
-    private static String normalizeV4FromAsterisk(final String netspec) {
+    private static String normalizeV4FromAsterisk(String netspec) {
 
         String[] masks = { "0.0.0.0/0.0.0.0", "0.0.0/255.0.0.0", "0.0/255.255.0.0", "0/255.255.255.0" };
 
@@ -212,7 +212,7 @@ public class InetNetworkBuilder {
      *            the xxx.xxx.xxx.xxx/yyy format
      * @return addrMask the xxx.xxx.xxx.xxx/yyy.yyy.yyy.yyy format
      */
-    private static String normalizeV4FromCIDR(final String netspec) {
+    private static String normalizeV4FromCIDR(String netspec) {
 
         final int bits = 32 - Integer.parseInt(netspec.substring(netspec.indexOf('/') + 1));
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java
index f9c188b..857aa37 100644
--- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java
+++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java
@@ -52,7 +52,7 @@ public class Inet4Network implements InetNetwork {
     }
 
     @Override
-    public boolean contains(final InetAddress ip) {
+    public boolean contains(InetAddress ip) {
         if (InetNetworkBuilder.isV6(ip.getHostAddress())) {
             return false;
         }
@@ -78,7 +78,7 @@ public class Inet4Network implements InetNetwork {
         return (obj != null) && (obj instanceof InetNetwork) && ((((Inet4Network) obj).network.equals(network)) && (((Inet4Network) obj).netmask.equals(netmask)));
     }
 
-    private static InetAddress maskIP(final InetAddress ip, final InetAddress mask) {
+    private static InetAddress maskIP(InetAddress ip, InetAddress mask) {
         return maskIP(ip.getAddress(), mask.getAddress());
     }
 
@@ -92,7 +92,7 @@ public class Inet4Network implements InetNetwork {
      *            the byte[] represent the netmask
      * @return inetAddress the InetAddress generated of the passed arguments.
      */
-    private static InetAddress maskIP(final byte[] ip, final byte[] mask) {
+    private static InetAddress maskIP(byte[] ip, byte[] mask) {
         if (ip.length != mask.length) {
             throw new IllegalArgumentException("IP address and mask must be of the same length.");
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java
index 27f0f41..d944849 100644
--- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java
+++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java
@@ -50,7 +50,7 @@ public class Inet6Network implements InetNetwork {
     }
 
     @Override
-    public boolean contains(final InetAddress ip) {
+    public boolean contains(InetAddress ip) {
         if (!InetNetworkBuilder.isV6(ip.getHostAddress())) {
             return false;
         }
@@ -76,7 +76,7 @@ public class Inet6Network implements InetNetwork {
         return (obj != null) && (obj instanceof InetNetwork) && ((((Inet6Network) obj).network.equals(network)) && (((Inet6Network) obj).netmask.equals(netmask)));
     }
 
-    private static InetAddress maskIP(final InetAddress ip, Integer mask) {
+    private static InetAddress maskIP(InetAddress ip, Integer mask) {
         byte[] maskBytes = new byte[16];
         int i = 0;
         while (mask > 0) {
@@ -95,7 +95,7 @@ public class Inet6Network implements InetNetwork {
      * @param mask the byte[] represent the netmask
      * @return inetAddress the InetAddress generated of the passed arguments.
      */
-    private static InetAddress maskIP(final byte[] ip, final byte[] mask) {
+    private static InetAddress maskIP(byte[] ip, byte[] mask) {
         if (ip.length != mask.length) {
             throw new IllegalArgumentException("IP address and mask must be of the same length.");
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/netmatcher/NetMatcher.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/netmatcher/NetMatcher.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/netmatcher/NetMatcher.java
index e93c759..6816a7e 100644
--- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/netmatcher/NetMatcher.java
+++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/netmatcher/NetMatcher.java
@@ -56,7 +56,7 @@ public class NetMatcher {
      * @param dnsServer
      *            the DNSService which will be used in this class
      */
-    public NetMatcher(final String[] nets, DNSService dnsServer) {
+    public NetMatcher(String[] nets, DNSService dnsServer) {
         this.dnsServer = dnsServer;
         initInetNetworks(nets);
     }
@@ -69,7 +69,7 @@ public class NetMatcher {
      * @param dnsServer
      *            the DNSService which will be used in this class
      */
-    public NetMatcher(final Collection<String> nets, DNSService dnsServer) {
+    public NetMatcher(Collection<String> nets, DNSService dnsServer) {
         this.dnsServer = dnsServer;
         initInetNetworks(nets);
     }
@@ -81,7 +81,7 @@ public class NetMatcher {
      *            the ipAddress or host name to check
      * @see #matchInetNetwork(InetAddress)
      */
-    public boolean matchInetNetwork(final String hostIP) {
+    public boolean matchInetNetwork(String hostIP) {
 
         InetAddress ip;
 
@@ -104,7 +104,7 @@ public class NetMatcher {
      *            InetAddress
      * @return true if match the network
      */
-    public boolean matchInetNetwork(final InetAddress ip) {
+    public boolean matchInetNetwork(InetAddress ip) {
 
         boolean sameNet = false;
 
@@ -137,7 +137,7 @@ public class NetMatcher {
      * @param nets
      *            a Collection which holds all networks
      */
-    private void initInetNetworks(final Collection<String> nets) {
+    private void initInetNetworks(Collection<String> nets) {
         initInetNetworks(nets.toArray(new String[nets.size()]));
     }
 
@@ -147,7 +147,7 @@ public class NetMatcher {
      * @param nets
      *            a String[] which holds all networks
      */
-    private void initInetNetworks(final String[] nets) {
+    private void initInetNetworks(String[] nets) {
 
         networks = new TreeSet<InetNetwork>(new Comparator<InetNetwork>() {
             public int compare(InetNetwork in1, InetNetwork in2) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
index 7a006f2..330b38b 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
@@ -163,7 +163,7 @@ public abstract class AbstractStateCompositeProcessor implements MailProcessor,
     @PostConstruct
     public void init() throws Exception {
         List<HierarchicalConfiguration> processorConfs = config.configurationsAt("processor");
-        for (final HierarchicalConfiguration processorConf : processorConfs) {
+        for (HierarchicalConfiguration processorConf : processorConfs) {
             String processorName = processorConf.getString("[@state]");
 
             // if the "child" processor has no jmx config we just use the one of

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
index 00b8b01..3b5c943 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
@@ -1611,7 +1611,7 @@ public class RemoteDelivery extends GenericMailet implements Runnable {
      * @return an Iterator over HostAddress instances, sorted by priority
      * @since v2.2.0a16-unstable
      */
-    private Iterator<HostAddress> getGatewaySMTPHostAddresses(final Collection<String> gatewayServers) {
+    private Iterator<HostAddress> getGatewaySMTPHostAddresses(Collection<String> gatewayServers) {
         Iterator<String> gateways = gatewayServers.iterator();
 
         return new MXHostAddressIterator(gateways, dnsServer, false, logAdapter);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
index 7b28b42..54a7abf 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
@@ -131,8 +131,8 @@ public class SieveMailet extends SieveMailboxMailet implements Poster {
 
             final String scheme = url.substring(0, endOfScheme);
             if ("mailbox".equals(scheme)) {
-                final int startOfUser = endOfScheme + 3;
-                final int endOfUser = url.indexOf('@', startOfUser);
+                int startOfUser = endOfScheme + 3;
+                int endOfUser = url.indexOf('@', startOfUser);
                 if (endOfUser < 0) {
                     // TODO: When user missing, append to a default location
                     throw new MessagingException("Shared mailbox is not supported");
@@ -140,11 +140,11 @@ public class SieveMailet extends SieveMailboxMailet implements Poster {
                     // lowerCase the user - see
                     // https://issues.apache.org/jira/browse/JAMES-1369
                     String user = url.substring(startOfUser, endOfUser).toLowerCase();
-                    final int startOfHost = endOfUser + 1;
-                    final int endOfHost = url.indexOf('/', startOfHost);
-                    final String host = url.substring(startOfHost, endOfHost);
-                    final String urlPath;
-                    final int length = url.length();
+                    int startOfHost = endOfUser + 1;
+                    int endOfHost = url.indexOf('/', startOfHost);
+                    String host = url.substring(startOfHost, endOfHost);
+                    String urlPath;
+                    int length = url.length();
                     if (endOfHost + 1 == length) {
                         urlPath = this.folder;
                     } else {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
index 4dfdfdd..7736bc9 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
@@ -774,7 +774,7 @@ public class SieveMailetTest {
         verify(messageManager).appendMessage(any(InputStream.class), any(Date.class), any(MailboxSession.class), eq(true), any(Flags.class));
     }
 
-    private void prepareTestUsingScript(final String script) throws Exception {
+    private void prepareTestUsingScript(String script) throws Exception {
         when(usersRepository.supportVirtualHosting()).thenReturn(false);
         when(sieveRepository.getActive("receiver")).thenReturn(ClassLoader.getSystemResourceAsStream(script));
         sieveMailet.init(fakeMailetConfig);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java
index 6f01b44..a4d6190 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java
@@ -52,7 +52,7 @@ public class MultipleClassesDeserializer extends StdDeserializer<Object> {
                 .orElseThrow(() -> new JsonMappingException("Can't map request to a known registered class"));
     }
 
-    private Object readValue(ObjectMapper mapper, final JsonNode root, Class<?> clazz) {
+    private Object readValue(ObjectMapper mapper, JsonNode root, Class<?> clazz) {
         try {
             return mapper.treeToValue(root, clazz);
         } catch (JsonProcessingException e) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 648a57d..da4d907 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
@@ -88,7 +88,7 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC
     }
 
     @Override
-    public void doConfigure(final HierarchicalConfiguration configuration) throws ConfigurationException {
+    public void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         
         super.doConfigure(configuration);
         

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
index 426ce97..cc24c20 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
@@ -71,11 +71,11 @@ public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler imp
 
     private final boolean plainAuthDisallowed;
     
-    public ImapChannelUpstreamHandler(final String hello, final ImapProcessor processor, ImapEncoder encoder, final Logger logger, boolean compress, boolean plainAuthDisallowed) {
+    public ImapChannelUpstreamHandler(String hello, ImapProcessor processor, ImapEncoder encoder, Logger logger, boolean compress, boolean plainAuthDisallowed) {
         this(hello, processor, encoder, logger, compress, plainAuthDisallowed, null, null);
     }
 
-    public ImapChannelUpstreamHandler(final String hello, final ImapProcessor processor, ImapEncoder encoder, final Logger logger, boolean compress, boolean plainAuthDisallowed, SSLContext context, String[] enabledCipherSuites) {
+    public ImapChannelUpstreamHandler(String hello, ImapProcessor processor, ImapEncoder encoder, Logger logger, boolean compress, boolean plainAuthDisallowed, SSLContext context, String[] enabledCipherSuites) {
         this.logger = logger;
         this.hello = hello;
         this.processor = processor;
@@ -91,7 +91,7 @@ public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler imp
     }
 
     @Override
-    public void channelBound(final ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+    public void channelBound(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
         ImapSession imapsession = new NettyImapSession(ctx.getChannel(), logger, context, enabledCipherSuites, compress, plainAuthDisallowed);
         attributes.set(ctx.getChannel(), imapsession);
         super.channelBound(ctx, e);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
index 7846f8e..696df8a 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
@@ -29,12 +29,12 @@ public class SwitchableDelimiterBasedFrameDecoder extends DelimiterBasedFrameDec
 
 	private volatile boolean framingEnabled = true;
 
-	public SwitchableDelimiterBasedFrameDecoder(final int maxFrameLength, final boolean stripDelimiter, final ChannelBuffer... delimiters) {
+	public SwitchableDelimiterBasedFrameDecoder(int maxFrameLength, boolean stripDelimiter, ChannelBuffer... delimiters) {
 		super(maxFrameLength, stripDelimiter, delimiters);
 	}
 
 	@Override
-	public synchronized void messageReceived(final ChannelHandlerContext ctx, final MessageEvent e) throws Exception {
+	public synchronized void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
 		if(this.framingEnabled) {
 			super.messageReceived(ctx, e);
 		} else {
@@ -47,7 +47,7 @@ public class SwitchableDelimiterBasedFrameDecoder extends DelimiterBasedFrameDec
 
 	}
 
-	public synchronized void disableFraming(final ChannelHandlerContext ctx) {
+	public synchronized void disableFraming(ChannelHandlerContext ctx) {
 		this.framingEnabled = false;
 		if(this.cumulation != null && this.cumulation.readable()) {
 			final ChannelBuffer spareBytes = this.cumulation.readBytes(this.cumulation.readableBytes());

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java
index a56f25d..6dfad6c 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java
@@ -90,9 +90,9 @@ public class ProtocolHandlerChainImpl implements ProtocolHandlerChain {
 
     private void wireExtensibleHandlers() throws WiringException {
         LinkedList<ExtensibleHandler> eHandlers = getHandlers(ExtensibleHandler.class);
-        for (final ExtensibleHandler extensibleHandler : eHandlers) {
+        for (ExtensibleHandler extensibleHandler : eHandlers) {
             final List<Class<?>> markerInterfaces = extensibleHandler.getMarkerInterfaces();
-            for (final Class<?> markerInterface : markerInterfaces) {
+            for (Class<?> markerInterface : markerInterfaces) {
                 final List<?> extensions = getHandlers(markerInterface);
                 // ok now time for try the wiring
                 extensibleHandler.wireExtensions(markerInterface, extensions);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
index 3611afb..1d2dd05 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -176,7 +176,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
             if (!ip.equals("0.0.0.0")) {
                 try {
                     ip = InetAddress.getByName(ip).getHostName();
-                } catch (final UnknownHostException unhe) {
+                } catch (UnknownHostException unhe) {
                     throw new ConfigurationException("Malformed bind parameter in configuration of service " + getServiceType(), unhe);
                 }
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
index 73cdb09..3794d54 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java
@@ -47,7 +47,7 @@ public class DataLineLMTPHandler extends DataLineJamesMessageHookHandler {
 
 
     @Override
-    protected Response processExtensions(SMTPSession session, final Mail mail) {
+    protected Response processExtensions(SMTPSession session, Mail mail) {
         LMTPMultiResponse mResponse = null;
 
         // build a wrapper around the Mail

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
index eed61b0..2a8367c 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
@@ -57,7 +57,7 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe
         return "LMTP Service";
     }
 
-    public void doConfigure(final HierarchicalConfiguration configuration) throws ConfigurationException {
+    public void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         super.doConfigure(configuration);
         if (isEnabled()) {
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 56c1165..67a7876 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
@@ -187,7 +187,7 @@ public class URIScanner {
     static public HashSet<String> scanContentForDomains(HashSet<String> domains, CharSequence content) {
         HashSet<String> newDomains = new HashSet<String>();
         HashSet<String> hosts = scanContentForHosts(content);
-        for (final String host : hosts) {
+        for (String host : hosts) {
             final String domain = domainFromHost(host);
 
             if (null != domain) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 295fcc4..611fdbc 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
@@ -114,7 +114,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
     }
 
     @Override
-    public void doConfigure(final HierarchicalConfiguration configuration) throws ConfigurationException {
+    public void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         super.doConfigure(configuration);
         if (isEnabled()) {
             String authRequiredString = configuration.getString("authRequired", "false").trim().toLowerCase();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
index 9a7f78f..8286199 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
@@ -121,7 +121,7 @@ public class SPFHandlerTest {
     /**
      * Setup mocked smtpsession
      */
-    private void setupMockedSMTPSession(final String ip, final String helo) {
+    private void setupMockedSMTPSession(String ip, final String helo) {
         mockedSMTPSession = new BaseFakeSMTPSession() {
 
             private final HashMap<String, Object> sstate = new HashMap<String, Object>();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 1fa5e9a..8a32e62 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
@@ -41,7 +41,7 @@ public class SpamAssassinHandlerTest {
     private Mail mockedMail;
     public final static String SPAMD_HOST = "localhost";
 
-    private SMTPSession setupMockedSMTPSession(final Mail mail) {
+    private SMTPSession setupMockedSMTPSession(Mail mail) {
         mockedMail = mail;
 
         return new BaseFakeSMTPSession() {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
index 3dd07e3..e12433b 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
@@ -52,7 +52,7 @@ public class URIRBLHandlerTest {
     private static final String URISERVER = "multi.surbl.org.";
     private Mail mockedMail;
 
-    private SMTPSession setupMockedSMTPSession(final Mail mail) {
+    private SMTPSession setupMockedSMTPSession(Mail mail) {
         mockedMail = mail;
 
         return new BaseFakeSMTPSession() {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 4c6bef3..acd379b 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
@@ -71,7 +71,7 @@ public class ValidRcptHandlerTest {
         });
     }
 
-    private SMTPSession setupMockedSMTPSession(final SMTPConfiguration conf, final MailAddress rcpt,
+    private SMTPSession setupMockedSMTPSession(SMTPConfiguration conf, MailAddress rcpt,
                                                final boolean relayingAllowed) {
 
         return new BaseFakeSMTPSession() {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 6e21686..84a18f5 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
@@ -41,7 +41,7 @@ public class ValidRcptMXTest {
     private final static String INVALID_MX = "mx." + INVALID_HOST;
     private final static String LOOPBACK = "127.0.0.1";
 
-    private SMTPSession setupMockedSMTPSession(final MailAddress rcpt) {
+    private SMTPSession setupMockedSMTPSession(MailAddress rcpt) {
         return new BaseFakeSMTPSession() {
 
             private final HashMap<String, Object> sstate = new HashMap<String, Object>();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
index dbb507a..068a7bb 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
@@ -92,7 +92,7 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport {
      * Construct a {@link ActiveMQMailQueue} which only use {@link BlobMessage}
      * 
      */
-    public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, final String queuename, final Logger logger) {
+    public ActiveMQMailQueue(ConnectionFactory connectionFactory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queuename, Logger logger) {
         this(connectionFactory, mailQueueItemDecoratorFactory, queuename, true, logger);
     }
 
@@ -104,7 +104,7 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport {
      * @param useBlob
      * @param logger
      */
-    public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, final String queuename, boolean useBlob, final Logger logger) {
+    public ActiveMQMailQueue(ConnectionFactory connectionFactory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queuename, boolean useBlob, Logger logger) {
         super(connectionFactory, mailQueueItemDecoratorFactory, queuename, logger);
         this.useBlob = useBlob;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org