http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
----------------------------------------------------------------------
diff --git 
a/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java 
b/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
index 0a72269..41cee05 100644
--- 
a/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
+++ 
b/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
@@ -32,7 +32,7 @@ public final class SystemLoggingMonitor implements Monitor {
         this(false);
     }
 
-    public SystemLoggingMonitor(final boolean verbose) {
+    public SystemLoggingMonitor(boolean verbose) {
         this.verbose = verbose;
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
----------------------------------------------------------------------
diff --git 
a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java 
b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
index 1a7b332..1afd1f4 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
@@ -466,7 +466,7 @@ public class ProtocolSession implements ProtocolInteractor {
 
         private final int sessionNumber;
 
-        public ContinuationElement(final int sessionNumber) throws Exception {
+        public ContinuationElement(int sessionNumber) throws Exception {
             this.sessionNumber = sessionNumber < 0 ? 0 : sessionNumber;
         }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
----------------------------------------------------------------------
diff --git 
a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
 
b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
index 58421e4..2f4db62 100644
--- 
a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
+++ 
b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
@@ -71,7 +71,7 @@ public class ProtocolSessionBuilder {
      * @param name not null
      * @param value not null
      */
-    public void setVariable(final String name, final String value) {
+    public void setVariable(String name, String value) {
         variables.put(name, value);
     }
     
@@ -97,7 +97,7 @@ public class ProtocolSessionBuilder {
      * @param reader not null
      * @return The ProtocolSession
      */
-    public ProtocolInteractor buildProtocolSession(final String scriptName, 
final Reader reader)
+    public ProtocolInteractor buildProtocolSession(String scriptName, Reader 
reader)
             throws Exception {
         ProtocolInteractor session = new ProtocolSession();
         addProtocolLines(scriptName, reader, session);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
----------------------------------------------------------------------
diff --git 
a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java 
b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
index c106da0..5eb1b74 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
@@ -51,11 +51,11 @@ public final class ExternalSession implements Session {
 
     private final String shabang;
 
-    public ExternalSession(final SocketChannel socket, final Monitor monitor, 
String shabang) {
+    public ExternalSession(SocketChannel socket, Monitor monitor, String 
shabang) {
         this(socket, monitor, shabang, false);
     }
 
-    public ExternalSession(final SocketChannel socket, final Monitor monitor, 
String shabang, boolean debug) {
+    public ExternalSession(SocketChannel socket, Monitor monitor, String 
shabang, boolean debug) {
         super();
         this.socket = socket;
         this.monitor = monitor;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
----------------------------------------------------------------------
diff --git 
a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
 
b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
index 51eac25..51d49a5 100644
--- 
a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
+++ 
b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
@@ -37,15 +37,15 @@ public class ExternalSessionFactory implements 
SessionFactory {
     protected final Monitor monitor;
     protected final String shabang;
 
-    public ExternalSessionFactory(final Monitor monitor, final String shabang) 
{
+    public ExternalSessionFactory(Monitor monitor, String shabang) {
         this(null, monitor, shabang);
     }
     
-    public ExternalSessionFactory(final String host, final int port, final 
Monitor monitor, final String shabang) {
+    public ExternalSessionFactory(String host, int port, Monitor monitor, 
String shabang) {
         this(new InetSocketAddress(host, port), monitor, shabang);
     }
 
-    public ExternalSessionFactory(InetSocketAddress address, final Monitor 
monitor, final String shabang) {
+    public ExternalSessionFactory(InetSocketAddress address, Monitor monitor, 
String shabang) {
         super();
         this.monitor = monitor;
         this.shabang = shabang;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
----------------------------------------------------------------------
diff --git 
a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java 
b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
index d321f60..6732cc8 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
@@ -51,12 +51,12 @@ public class ScriptedUserAdder implements UserAdder {
      * @param host connect to this host
      * @param port connect to this port
      */
-    public ScriptedUserAdder(final String host, final int port)
+    public ScriptedUserAdder(String host, int port)
     {
         this(host, port, (String) null);
     }
     
-    public ScriptedUserAdder(final String host, final int port, final String 
script) {
+    public ScriptedUserAdder(String host, int port, String script) {
         this(host, port, script, new NullMonitor());
     }
     
@@ -66,11 +66,11 @@ public class ScriptedUserAdder implements UserAdder {
      * @param port connect to this port
      * @param monitor not null
      */
-    public ScriptedUserAdder(final String host, final int port, final Monitor 
monitor) {
+    public ScriptedUserAdder(String host, int port, Monitor monitor) {
         this(host, port, null, monitor);
     }
     
-    public ScriptedUserAdder(final String host, final int port, final String 
script, final Monitor monitor) {
+    public ScriptedUserAdder(String host, int port, String script, Monitor 
monitor) {
         this.host = host;
         this.port = port;
         this.script = script;
@@ -84,7 +84,7 @@ public class ScriptedUserAdder implements UserAdder {
      * @throws Exception upon failure
      * @throws NullPointerException when script has not been set
      */
-    public void addUser(final String user, final String password) throws 
Exception {
+    public void addUser(String user, String password) throws Exception {
         final StringReader reader = new StringReader(script);
         addUser(user, password, reader);
     }
@@ -96,7 +96,7 @@ public class ScriptedUserAdder implements UserAdder {
      * @param reader reader for script, not null
      * @throws Exception upon failure
      */
-    public void addUser(final String user, final String password, final Reader 
reader) throws Exception {
+    public void addUser(String user, String password, Reader reader) throws 
Exception {
         final ProtocolSessionBuilder builder = new ProtocolSessionBuilder();
         builder.setVariable(USER_VARIABLE_NAME, user);
         builder.setVariable(PASSWORD_VARIABLE_NAME, password);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java 
b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
index 9d126e6..19e3343 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
@@ -64,7 +64,7 @@ public class DiscardProtocol {
     private volatile ServerSocketChannel socket;
     
 
-    public DiscardProtocol(final int port) {
+    public DiscardProtocol(int port) {
         super();
         this.port = port;
         queue = new LinkedList<Server>();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
----------------------------------------------------------------------
diff --git 
a/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java 
b/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
index f84cfab..28956d2 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
@@ -85,12 +85,12 @@ public class TestExternalHostSystem extends 
MockObjectTestCase {
         system.addUser(USER, PASSWORD);
     }
 
-    private Session newSession(final String shabang) throws Exception {
+    private Session newSession(String shabang) throws Exception {
         ExternalSessionFactory system = buildSystem(shabang);
         return system.newSession(continuation);
     }
 
-    private ExternalHostSystem buildSystem(final String shabang) {
+    private ExternalHostSystem buildSystem(String shabang) {
         return new ExternalHostSystem(SUPPORTED_FEATURES, "localhost", PORT ,
                 new NullMonitor(), shabang, userAdder);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
 
b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
index 6b28698..1251cff 100644
--- 
a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
+++ 
b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
@@ -50,7 +50,7 @@ public abstract class JamesImapHostSystem implements 
ImapHostSystem {
         users = new HashSet<User>();
     }
 
-    public void configure(final ImapDecoder decoder, final ImapEncoder encoder,
+    public void configure(ImapDecoder decoder, ImapEncoder encoder,
             final ImapProcessor processor) {
         this.decoder = decoder;
         this.encoder = encoder;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
 
b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
index 4cc4aeb..edb277c 100644
--- 
a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
+++ 
b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
@@ -28,7 +28,7 @@ import org.junit.Before;
  */
 public class BaseImapProtocol extends AbstractSimpleScriptedTestProtocol 
implements ImapTestConstants {
 
-    public BaseImapProtocol(final HostSystem hostSystem) throws Exception {
+    public BaseImapProtocol(HostSystem hostSystem) throws Exception {
         super(hostSystem, USER, PASSWORD, "/org/apache/james/imap/scripts/");
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java
 
b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java
index 11fec4d..0a40125 100644
--- 
a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java
+++ 
b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java
@@ -31,7 +31,7 @@ class MailboxUser {
 
     private final Set<String> subscriptions;
 
-    public MailboxUser(final String userName) {
+    public MailboxUser(String userName) {
         this.userName = userName;
         this.subscriptions = new HashSet<String>();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java
 
b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java
index d00a285..f9dc546 100644
--- 
a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java
+++ 
b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java
@@ -68,7 +68,7 @@ public class Docker {
         return container;
     }
 
-    private void waitingForSocketToBeReady(final ContainerCreation container) {
+    private void waitingForSocketToBeReady(ContainerCreation container) {
         Awaitility
             .await()
             .atMost(30, TimeUnit.SECONDS)

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/dns/InMemoryDNSService.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/dns/InMemoryDNSService.java
 
b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/dns/InMemoryDNSService.java
index 3b32fba..24c2ff7 100644
--- 
a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/dns/InMemoryDNSService.java
+++ 
b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/dns/InMemoryDNSService.java
@@ -61,7 +61,7 @@ public class InMemoryDNSService implements DNSService {
     }
 
     @Override
-    public Collection<String> findMXRecords(final String hostname) throws 
TemporaryResolutionException {
+    public Collection<String> findMXRecords(String hostname) throws 
TemporaryResolutionException {
         return hostRecord(hostname).mxRecords;
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
index 8f2132d..068da08 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
@@ -48,7 +48,7 @@ public abstract class AbstractProtocolTransport implements 
ProtocolTransport{
     /**
      * @see 
org.apache.james.protocols.api.ProtocolTransport#writeResponse(org.apache.james.protocols.api.Response,
 org.apache.james.protocols.api.ProtocolSession)
      */
-    public final void writeResponse(Response response, final ProtocolSession 
session) {
+    public final void writeResponse(Response response, ProtocolSession 
session) {
         // if we already in asynchrnous mode we simply enqueue the response
         // we do this synchronously because we may have a dequeuer thread 
working on
         // isAsync and responses.
@@ -80,7 +80,7 @@ public abstract class AbstractProtocolTransport implements 
ProtocolTransport{
      * 
      * @param session
      */
-    private  void writeQueuedResponses(final ProtocolSession session) {
+    private  void writeQueuedResponses(ProtocolSession session) {
         
         // dequeue Responses until non is left
         while (true) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java 
b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
index b398508..8b53650 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
@@ -28,7 +28,7 @@ public class BaseRequest implements Request{
     private final String command;
     private final String argument;
 
-    public BaseRequest(final String command, final String argument) {
+    public BaseRequest(String command, String argument) {
         this.command = command;
         this.argument = argument;
         

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
index 0633b05..146c3f6 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
@@ -63,7 +63,7 @@ public abstract class AbstractProtocolHandlerChain implements 
ProtocolHandlerCha
             if (handler instanceof ExtensibleHandler) {
                 final ExtensibleHandler extensibleHandler = 
(ExtensibleHandler) handler;
                 final List<Class<?>> markerInterfaces = 
extensibleHandler.getMarkerInterfaces();
-                for (final Class<?> markerInterface : markerInterfaces) {
+                for (Class<?> markerInterface : markerInterfaces) {
                     final List<?> extensions = getHandlers(markerInterface);
                     extensibleHandler.wireExtensions(markerInterface, 
extensions);
                 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
index 577fda6..2a29dfe 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
@@ -148,7 +148,7 @@ public class CommandDispatcher<Session extends 
ProtocolSession> implements Exten
      * (non-Javadoc)
      * @see 
org.apache.james.protocols.api.handler.LineHandler#onLine(org.apache.james.protocols.api.ProtocolSession,
 java.nio.ByteBuffer)
      */
-    public Response onLine(final Session session, ByteBuffer line) {
+    public Response onLine(Session session, ByteBuffer line) {
         
         try {
             

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java 
b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java
index 6dca18f..525ed1d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapCommand.java
@@ -24,19 +24,19 @@ package org.apache.james.imap.api;
  * interface should encpasulate all command specific processing.
  */
 public class ImapCommand {
-    public static ImapCommand nonAuthenticatedStateCommand(final String name) {
+    public static ImapCommand nonAuthenticatedStateCommand(String name) {
         return new ImapCommand(false, false, true, name);
     }
 
-    public static ImapCommand authenticatedStateCommand(final String name) {
+    public static ImapCommand authenticatedStateCommand(String name) {
         return new ImapCommand(true, true, false, name);
     }
 
-    public static ImapCommand selectedStateCommand(final String name) {
+    public static ImapCommand selectedStateCommand(String name) {
         return new ImapCommand(false, true, false, name);
     }
 
-    public static ImapCommand anyStateCommand(final String name) {
+    public static ImapCommand anyStateCommand(String name) {
         return new ImapCommand(true, true, true, name);
     }
 
@@ -48,7 +48,7 @@ public class ImapCommand {
 
     private final String name;
 
-    private ImapCommand(boolean validInAuthenticated, boolean validInSelected, 
boolean validInNonAuthenticated, final String name) {
+    private ImapCommand(boolean validInAuthenticated, boolean validInSelected, 
boolean validInNonAuthenticated, String name) {
         super();
         this.validInAuthenticated = validInAuthenticated;
         this.validInSelected = validInSelected;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java 
b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
index b059fb0..107c78e 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
@@ -28,11 +28,11 @@ public class ImapSessionUtils {
 
     public static final String MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY = 
"org.apache.james.api.imap.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY";
 
-    public static MailboxSession getMailboxSession(final ImapSession session) {
+    public static MailboxSession getMailboxSession(ImapSession session) {
         return (MailboxSession) 
session.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY);
     }
 
-    public static String getUserName(final ImapSession imapSession) {
+    public static String getUserName(ImapSession imapSession) {
         final String result;
         final MailboxSession mailboxSession = getMailboxSession(imapSession);
         if (imapSession == null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
index 18f6f21..3f181ba 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
@@ -173,11 +173,11 @@ public class HumanReadableText {
 
     private final Object[] parameters;
 
-    public HumanReadableText(final String key, final String defaultValue) {
+    public HumanReadableText(String key, String defaultValue) {
         this(key, defaultValue, (Object[]) null);
     }
 
-    public HumanReadableText(final String key, final String defaultValue, 
final Object... parameters) {
+    public HumanReadableText(String key, String defaultValue, Object... 
parameters) {
         super();
         this.defaultValue = defaultValue;
         this.key = key;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/display/Locales.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/display/Locales.java 
b/protocols/imap/src/main/java/org/apache/james/imap/api/display/Locales.java
index 5853933..5ce7c08 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/display/Locales.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/display/Locales.java
@@ -40,7 +40,7 @@ public class Locales {
     private final List<Locale> userPreferences;
     private final Locale clientPreference;
 
-    public Locales(final List<Locale> userPreferences, final Locale 
clientPreference) {
+    public Locales(List<Locale> userPreferences, Locale clientPreference) {
         super();
         this.userPreferences = userPreferences;
         this.clientPreference = clientPreference;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
index 311d585..93b88c8 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
@@ -67,7 +67,7 @@ public class BodyFetchElement {
 
     private final Collection<String> fieldNames;
 
-    public BodyFetchElement(final String name, final int sectionType, final 
int[] path, final Collection<String> fieldNames, Long firstOctet, Long 
numberOfOctets) {
+    public BodyFetchElement(String name, int sectionType, int[] path, 
Collection<String> fieldNames, Long firstOctet, Long numberOfOctets) {
         this.name = name;
         this.sectionType = sectionType;
         this.fieldNames = fieldNames;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
index 4169729..154bc95 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
@@ -129,7 +129,7 @@ public final class IdRange implements Iterable<Long>, 
Comparable<IdRange>{
      * @param ranges
      * @return mergedRanges
      */
-    public static List<IdRange> mergeRanges(final List<IdRange> ranges) {
+    public static List<IdRange> mergeRanges(List<IdRange> ranges) {
         List<IdRange> copy = new ArrayList<IdRange>(ranges);
         Collections.sort(copy);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
index ad73e90..c9e9242 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
@@ -35,7 +35,7 @@ public class DayMonthYear {
 
     private final int year;
 
-    public DayMonthYear(final int day, final int month, final int year) {
+    public DayMonthYear(int day, int month, int year) {
         super();
         this.day = day;
         this.month = month;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
index e3b5f95..d288a89 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
@@ -319,7 +319,7 @@ public final class SearchKey {
      *            <code>List</code> of {@link SearchKey}'s composing this key
      * @return <code>SearchKey</code>, not null
      */
-    public static SearchKey buildAnd(final List<SearchKey> keys) {
+    public static SearchKey buildAnd(List<SearchKey> keys) {
         return new SearchKey(TYPE_AND, null, keys, 0, null, null, null, -1, 
-1);
     }
 
@@ -344,7 +344,7 @@ public final class SearchKey {
 
     private final long modSeq;
 
-    private SearchKey(final int type, final DayMonthYear date, final 
List<SearchKey> keys, final long number, final String name, final String value, 
IdRange[] sequence, long seconds, long modSeq) {
+    private SearchKey(int type, DayMonthYear date, List<SearchKey> keys, long 
number, String name, String value, IdRange[] sequence, long seconds, long 
modSeq) {
         super();
         this.type = type;
         this.date = date;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
index 5c47638..045a558 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
@@ -94,7 +94,7 @@ public interface StatusResponse extends ImapResponseMessage {
 
         private final String code;
 
-        Type(final String code) {
+        Type(String code) {
             this.code = code;
         }
 
@@ -324,20 +324,20 @@ public interface StatusResponse extends 
ImapResponseMessage {
         private final boolean useParens;
 
         @SuppressWarnings("unchecked")
-        private ResponseCode(final String code) {
+        private ResponseCode(String code) {
             this(code, Collections.EMPTY_LIST, NO_NUMBER, true);
         }
 
         @SuppressWarnings("unchecked")
-        private ResponseCode(final String code, final long number) {
+        private ResponseCode(String code, long number) {
             this(code, Collections.EMPTY_LIST, number, true);
         }
 
-        private ResponseCode(final String code, final Collection<String> 
parameters) {
+        private ResponseCode(String code, Collection<String> parameters) {
             this(code, parameters, NO_NUMBER, true);
         }
 
-        private ResponseCode(final String code, final Collection<String> 
parameters, final long number, final boolean useParens) {
+        private ResponseCode(String code, Collection<String> parameters, long 
number, boolean useParens) {
             super();
             this.useParens = useParens;
             this.code = code;

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
index 02f2d02..516f23f 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
@@ -61,7 +61,7 @@ public class FetchPartPathDecoder {
     public FetchPartPathDecoder() {
     }
 
-    public int decode(final CharSequence sectionSpecification) throws 
DecodingException {
+    public int decode(CharSequence sectionSpecification) throws 
DecodingException {
         init();
         sectionType = decode(0, sectionSpecification);
         prunePath();
@@ -70,18 +70,18 @@ public class FetchPartPathDecoder {
 
     private void prunePath() {
         if (path != null) {
-            final int length = path.length;
+            int length = path.length;
             if (used < length) {
-                final int[] newPath = new int[used];
+                int[] newPath = new int[used];
                 System.arraycopy(path, 0, newPath, 0, used);
                 path = newPath;
             }
         }
     }
 
-    private int decode(final int at, final CharSequence sectionSpecification) 
throws DecodingException {
-        final int result;
-        final int length = sectionSpecification.length();
+    private int decode(int at, CharSequence sectionSpecification) throws 
DecodingException {
+        int result;
+        int length = sectionSpecification.length();
         if (at < length) {
             final char next = sectionSpecification.charAt(at);
             switch (next) {
@@ -168,113 +168,113 @@ public class FetchPartPathDecoder {
     }
 
     private void mustBeI(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char i = sectionSpecification.charAt(position);
+        char i = sectionSpecification.charAt(position);
         if (!(i == 'i' || i == 'I')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeM(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'm' || next == 'M')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeN(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'n' || next == 'N')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeO(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'o' || next == 'O')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeE(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'e' || next == 'E')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeA(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'a' || next == 'A')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeD(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'd' || next == 'D')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeR(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'r' || next == 'R')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeX(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'x' || next == 'X')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeT(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 't' || next == 'T')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeF(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'f' || next == 'F')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeL(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 'l' || next == 'L')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeS(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == 's' || next == 'S')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeDot(CharSequence sectionSpecification, int position) 
throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == '.')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private void mustBeOpenParen(CharSequence sectionSpecification, int 
position) throws DecodingException {
-        final char next = sectionSpecification.charAt(position);
+        char next = sectionSpecification.charAt(position);
         if (!(next == '(')) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown body specification");
         }
     }
 
     private int header(int at, CharSequence sectionSpecification) throws 
DecodingException {
-        final int result;
-        final int length = sectionSpecification.length();
+        int result;
+        int length = sectionSpecification.length();
         if (length > at + 5) {
             mustBeE(sectionSpecification, at + 1);
             mustBeA(sectionSpecification, at + 2);
@@ -294,8 +294,8 @@ public class FetchPartPathDecoder {
     }
 
     private int headerFields(int at, CharSequence sectionSpecification) throws 
DecodingException {
-        final int result;
-        final int length = sectionSpecification.length();
+        int result;
+        int length = sectionSpecification.length();
         if (length > at + 7) {
             mustBeDot(sectionSpecification, at);
             mustBeF(sectionSpecification, at + 1);
@@ -304,8 +304,8 @@ public class FetchPartPathDecoder {
             mustBeL(sectionSpecification, at + 4);
             mustBeD(sectionSpecification, at + 5);
             mustBeS(sectionSpecification, at + 6);
-            final char next = sectionSpecification.charAt(at + 7);
-            final int namesStartAt;
+            char next = sectionSpecification.charAt(at + 7);
+            int namesStartAt;
             switch (next) {
             case ' ':
                 result = HEADER_FIELDS;
@@ -334,19 +334,19 @@ public class FetchPartPathDecoder {
         return result;
     }
 
-    private void readHeaderNames(final int at, final CharSequence 
sectionSpecification) throws DecodingException {
+    private void readHeaderNames(int at, CharSequence sectionSpecification) 
throws DecodingException {
         names = new ArrayList<String>();
-        final int firstWordStart = skipSpaces(at, sectionSpecification);
+        int firstWordStart = skipSpaces(at, sectionSpecification);
         readHeaderNames(firstWordStart, firstWordStart, sectionSpecification);
     }
 
-    private void readHeaderNames(final int at, final int lastWordStart, final 
CharSequence sectionSpecification) throws DecodingException {
+    private void readHeaderNames(int at, int lastWordStart, CharSequence 
sectionSpecification) throws DecodingException {
         if (at < sectionSpecification.length()) {
             final char next = sectionSpecification.charAt(at);
             switch (next) {
             case ' ':
                 readName(lastWordStart, at, sectionSpecification);
-                final int nextWord = skipSpaces(at, sectionSpecification);
+                int nextWord = skipSpaces(at, sectionSpecification);
                 readHeaderNames(nextWord, nextWord, sectionSpecification);
                 break;
             case ')':
@@ -360,18 +360,18 @@ public class FetchPartPathDecoder {
         }
     }
 
-    private void readName(final int wordStart, final int wordFinish, final 
CharSequence sectionSpecification) {
+    private void readName(int wordStart, int wordFinish, CharSequence 
sectionSpecification) {
         if (wordStart <= wordFinish) {
-            final CharSequence word = 
sectionSpecification.subSequence(wordStart, wordFinish);
-            final String name = word.toString();
+            CharSequence word = sectionSpecification.subSequence(wordStart, 
wordFinish);
+            String name = word.toString();
             names.add(name);
         }
     }
 
-    private int skipSpaces(final int at, final CharSequence 
sectionSpecification) {
-        final int result;
+    private int skipSpaces(int at, CharSequence sectionSpecification) {
+        int result;
         if (at < sectionSpecification.length()) {
-            final char next = sectionSpecification.charAt(at);
+            char next = sectionSpecification.charAt(at);
             if (next == ' ') {
                 result = skipSpaces(at + 1, sectionSpecification);
             } else {
@@ -395,8 +395,8 @@ public class FetchPartPathDecoder {
         return TEXT;
     }
 
-    private int digit(final int at, final CharSequence sectionSpecification, 
int digit) throws DecodingException {
-        final int result;
+    private int digit(int at, CharSequence sectionSpecification, int digit) 
throws DecodingException {
+        int result;
         digit(digit);
         result = decode(at + 1, sectionSpecification);
         return result;
@@ -430,7 +430,7 @@ public class FetchPartPathDecoder {
         if (path == null) {
             path = new int[ARRAY_INITIAL_SIZE];
         } else {
-            final int length = path.length;
+            int length = path.length;
             if (used >= length) {
                 int[] newPath = new int[length + ARRAY_INCREMENT];
                 System.arraycopy(path, 0, newPath, 0, length);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapDecoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapDecoder.java 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapDecoder.java
index b4cff39..b4045c0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapDecoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapDecoder.java
@@ -22,5 +22,5 @@ import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.process.ImapSession;
 
 public interface ImapDecoder {
-    ImapMessage decode(final ImapRequestLineReader request, ImapSession 
session);
+    ImapMessage decode(ImapRequestLineReader request, ImapSession session);
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
index fcf104c..c637df5 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
@@ -369,7 +369,7 @@ public abstract class ImapRequestLineReader {
      * @param charset
      *            , or null for <code>US-ASCII</code>
      */
-    public String consumeLiteral(final Charset charset) throws 
DecodingException {
+    public String consumeLiteral(Charset charset) throws DecodingException {
         if (charset == null) {
             return consumeLiteral(US_ASCII);
         } else {
@@ -441,7 +441,7 @@ public abstract class ImapRequestLineReader {
         return read(size, extraCRLF);
     }
 
-    private String decode(final Charset charset, final ByteBuffer buffer) 
throws DecodingException {
+    private String decode(Charset charset, ByteBuffer buffer) throws 
DecodingException {
         try {
             return 
charset.newDecoder().onMalformedInput(CodingErrorAction.REPORT).onUnmappableCharacter(CodingErrorAction.REPORT).decode(buffer).toString();
 
@@ -563,7 +563,7 @@ public abstract class ImapRequestLineReader {
         return readDigits(0, 0, true, stopOnParen);
     }
     
-    private long readDigits(int add, final long total, final boolean first, 
boolean stopOnParen
+    private long readDigits(int add, long total, boolean first, boolean 
stopOnParen
             ) throws DecodingException {
         final char next;
         if (first) {
@@ -863,12 +863,12 @@ public abstract class ImapRequestLineReader {
          * @param endOfInput
          *            is the input ended
          */
-        private CoderResult decodeByteBufferToCharacterBuffer(final boolean 
endOfInput) throws DecodingException {
+        private CoderResult decodeByteBufferToCharacterBuffer(boolean 
endOfInput) throws DecodingException {
             buffer.flip();
             return decodeMoreBytesToCharacterBuffer(endOfInput);
         }
 
-        private CoderResult decodeMoreBytesToCharacterBuffer(final boolean 
endOfInput) throws DecodingException {
+        private CoderResult decodeMoreBytesToCharacterBuffer(boolean 
endOfInput) throws DecodingException {
             final CoderResult coderResult = decoder.decode(buffer, charBuffer, 
endOfInput);
             if (coderResult.isOverflow()) {
                 upsizeCharBuffer();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
index 7c02252..2103b10 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
@@ -39,7 +39,7 @@ public abstract class AbstractImapCommandParser implements 
MessagingImapCommandP
 
     private StatusResponseFactory statusResponseFactory;
 
-    public AbstractImapCommandParser(final ImapCommand command) {
+    public AbstractImapCommandParser(ImapCommand command) {
         super();
         this.command = command;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
index 6f94543..91bd2ab 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
@@ -46,11 +46,11 @@ public class DefaultImapDecoder implements ImapDecoder {
     private final static String INVALID_COMMAND_COUNT = 
"INVALID_COMMAND_COUNT";
     public final static int DEFAULT_MAX_INVALID_COMMANDS = 9;
 
-    public DefaultImapDecoder(final StatusResponseFactory responseFactory, 
final ImapCommandParserFactory imapCommands) {
+    public DefaultImapDecoder(StatusResponseFactory responseFactory, 
ImapCommandParserFactory imapCommands) {
         this(responseFactory, imapCommands, DEFAULT_MAX_INVALID_COMMANDS);
     }
 
-    public DefaultImapDecoder(final StatusResponseFactory responseFactory, 
final ImapCommandParserFactory imapCommands, int maxInvalidCommands) {
+    public DefaultImapDecoder(StatusResponseFactory responseFactory, 
ImapCommandParserFactory imapCommands, int maxInvalidCommands) {
         this.responseFactory = responseFactory;
         this.imapCommands = imapCommands;
         this.maxInvalidCommands = maxInvalidCommands;
@@ -77,7 +77,7 @@ public class DefaultImapDecoder implements ImapDecoder {
         return message;
     }
 
-    private ImapMessage decodeCommandTagged(final ImapRequestLineReader 
request, final String tag, final ImapSession session) {
+    private ImapMessage decodeCommandTagged(ImapRequestLineReader request, 
String tag, ImapSession session) {
         ImapMessage message;
         if (session.getLog().isDebugEnabled()) {
             session.getLog().debug("Got <tag>: " + tag);
@@ -94,7 +94,7 @@ public class DefaultImapDecoder implements ImapDecoder {
         return message;
     }
 
-    private ImapMessage unknownCommand(final String tag, final ImapSession 
session) {
+    private ImapMessage unknownCommand(String tag, ImapSession session) {
         ImapMessage message;
         Object c = session.getAttribute(INVALID_COMMAND_COUNT);
         int count = 0;
@@ -118,7 +118,7 @@ public class DefaultImapDecoder implements ImapDecoder {
         return message;
     }
 
-    private ImapMessage decodeCommandNamed(final ImapRequestLineReader 
request, final String tag, String commandName, final ImapSession session) {
+    private ImapMessage decodeCommandNamed(ImapRequestLineReader request, 
String tag, String commandName, ImapSession session) {
         ImapMessage message;
         if (session.getLog().isDebugEnabled()) {
             session.getLog().debug("Got <command>: " + commandName);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
index 56a537b..660ad0a 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
@@ -28,7 +28,7 @@ import org.apache.james.protocols.imap.DecodingException;
 
 abstract class AbstractUidCommandParser extends AbstractImapCommandParser {
 
-    public AbstractUidCommandParser(final ImapCommand command) {
+    public AbstractUidCommandParser(ImapCommand command) {
         super(command);
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
index a2787fb..ec89b13 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
@@ -38,7 +38,7 @@ public class ImapParserFactory implements 
ImapCommandParserFactory {
 
     private final StatusResponseFactory statusResponseFactory;
 
-    public ImapParserFactory(final StatusResponseFactory 
statusResponseFactory) {
+    public ImapParserFactory(StatusResponseFactory statusResponseFactory) {
         this.statusResponseFactory = statusResponseFactory;
         _imapCommands = new HashMap<String, Class<?>>();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
index e8b5a62..357079a 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
@@ -36,7 +36,7 @@ public class ListCommandParser extends 
AbstractUidCommandParser {
         
super(ImapCommand.authenticatedStateCommand(ImapConstants.LIST_COMMAND_NAME));
     }
 
-    protected ListCommandParser(final ImapCommand command) {
+    protected ListCommandParser(ImapCommand command) {
         super(command);
     }
 
@@ -81,7 +81,7 @@ public class ListCommandParser extends 
AbstractUidCommandParser {
         return createMessage(command, referenceName, mailboxPattern, tag);
     }
 
-    protected ImapMessage createMessage(ImapCommand command, final String 
referenceName, final String mailboxPattern, final String tag) {
+    protected ImapMessage createMessage(ImapCommand command, String 
referenceName, String mailboxPattern, String tag) {
         return new ListRequest(command, referenceName, mailboxPattern, tag);
     }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
index 8251a9f..ffef6da 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
@@ -176,7 +176,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return ImapRequestLineReader.cap(next);
     }
     
-    private SearchKey cc(ImapRequestLineReader request, final Charset charset) 
throws DecodingException {
+    private SearchKey cc(ImapRequestLineReader request, Charset charset) 
throws DecodingException {
         final SearchKey result;
         nextIsSpace(request);
         final String value = request.astring(charset);
@@ -184,7 +184,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return result;
     }
 
-    private SearchKey c(ImapSession session, ImapRequestLineReader request, 
final boolean isFirstToken, final Charset charset) throws DecodingException, 
IllegalCharsetNameException, UnsupportedCharsetException {
+    private SearchKey c(ImapSession session, ImapRequestLineReader request, 
boolean isFirstToken, Charset charset) throws DecodingException, 
IllegalCharsetNameException, UnsupportedCharsetException {
         final int next = consumeAndCap(request);
         switch (next) {
         case 'C':
@@ -196,7 +196,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         }
     }
 
-    private SearchKey charset(ImapSession session, ImapRequestLineReader 
request, final boolean isFirstToken) throws DecodingException, 
IllegalCharsetNameException, UnsupportedCharsetException {
+    private SearchKey charset(ImapSession session, ImapRequestLineReader 
request, boolean isFirstToken) throws DecodingException, 
IllegalCharsetNameException, UnsupportedCharsetException {
         final SearchKey result;
         nextIsA(request);
         nextIsR(request);
@@ -256,7 +256,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         }
     }
 
-    private SearchKey t(ImapRequestLineReader request, final Charset charset) 
throws DecodingException {
+    private SearchKey t(ImapRequestLineReader request, Charset charset) throws 
DecodingException {
         final int next = consumeAndCap(request);
         switch (next) {
         case 'E':
@@ -268,7 +268,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         }
     }
 
-    private SearchKey s(ImapRequestLineReader request, final Charset charset) 
throws DecodingException {
+    private SearchKey s(ImapRequestLineReader request, Charset charset) throws 
DecodingException {
         final int next = consumeAndCap(request);
         switch (next) {
         case 'E':
@@ -357,7 +357,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         }
     }
 
-    private SearchKey f(ImapRequestLineReader request, final Charset charset) 
throws DecodingException {
+    private SearchKey f(ImapRequestLineReader request, Charset charset) throws 
DecodingException {
         final int next = consumeAndCap(request);
         switch (next) {
         case 'L':
@@ -409,7 +409,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return result;
     }
 
-    private SearchKey header(ImapRequestLineReader request, final Charset 
charset) throws DecodingException {
+    private SearchKey header(ImapRequestLineReader request, Charset charset) 
throws DecodingException {
         final SearchKey result;
         nextIsE(request);
         nextIsA(request);
@@ -450,7 +450,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return result;
     }
 
-    private SearchKey from(ImapRequestLineReader request, final Charset 
charset) throws DecodingException {
+    private SearchKey from(ImapRequestLineReader request, Charset charset) 
throws DecodingException {
         final SearchKey result;
         nextIsO(request);
         nextIsM(request);
@@ -623,7 +623,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         }
     }
 
-    private SearchKey body(ImapRequestLineReader request, final Charset 
charset) throws DecodingException {
+    private SearchKey body(ImapRequestLineReader request, Charset charset) 
throws DecodingException {
         final SearchKey result;
         nextIsD(request);
         nextIsY(request);
@@ -707,7 +707,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return result;
     }
 
-    private SearchKey text(ImapRequestLineReader request, final Charset 
charset) throws DecodingException {
+    private SearchKey text(ImapRequestLineReader request, Charset charset) 
throws DecodingException {
         final SearchKey result;
         nextIsX(request);
         nextIsT(request);
@@ -731,7 +731,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return SearchKey.buildSequenceSet(range);
     }
 
-    private SearchKey to(ImapRequestLineReader request, final Charset charset) 
throws DecodingException {
+    private SearchKey to(ImapRequestLineReader request, Charset charset) 
throws DecodingException {
         final SearchKey result;
         nextIsSpace(request);
         final String value = request.astring(charset);
@@ -739,7 +739,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return result;
     }
 
-    private SearchKey subject(ImapRequestLineReader request, final Charset 
charset) throws DecodingException {
+    private SearchKey subject(ImapRequestLineReader request, Charset charset) 
throws DecodingException {
         final SearchKey result;
         nextIsB(request);
         nextIsJ(request);
@@ -877,7 +877,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         nextIs(request, 'V', 'v');
     }
 
-    private void nextIs(ImapRequestLineReader request, final char upper, final 
char lower) throws DecodingException {
+    private void nextIs(ImapRequestLineReader request, char upper, char lower) 
throws DecodingException {
         final char next = request.consume();
         if (next != upper && next != lower) {
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown search key");
@@ -904,7 +904,7 @@ public class SearchCommandParser extends 
AbstractUidCommandParser {
         return result;
     }
 
-    private ImapMessage unsupportedCharset(final String tag, final ImapCommand 
command) {
+    private ImapMessage unsupportedCharset(String tag, ImapCommand command) {
         final StatusResponseFactory factory = getStatusResponseFactory();
         final ResponseCode badCharset = 
StatusResponse.ResponseCode.badCharset(CharsetUtil.getAvailableCharsetNames());
         return factory.taggedNo(tag, command, HumanReadableText.BAD_CHARSET, 
badCharset);

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
index 2bba26f..4d07e44 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
@@ -33,7 +33,7 @@ public class XListCommandParser extends ListCommandParser {
     }
 
     @Override
-    protected ImapMessage createMessage(ImapCommand command, final String 
referenceName, final String mailboxPattern, final String tag) {
+    protected ImapMessage createMessage(ImapCommand command, String 
referenceName, String mailboxPattern, String tag) {
         return new XListRequest(command, referenceName, mailboxPattern, tag);
     }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
index 0d9b6c5..f66efc2 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
@@ -35,7 +35,7 @@ public class ContinuationResponseEncoder extends 
AbstractChainedImapEncoder {
 
     private final Localizer localizer;
 
-    public ContinuationResponseEncoder(ImapEncoder next, final Localizer 
localizer) {
+    public ContinuationResponseEncoder(ImapEncoder next, Localizer localizer) {
         super(next);
         this.localizer = localizer;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java
index c133236..fd3a1ab 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java
@@ -37,7 +37,7 @@ public class EncoderUtils {
      *            <code>Date</code>, not null
      * @return encoded IMAP <code>date-time</code>, not null
      */
-    public static String encodeDateTime(final Date date) {
+    public static String encodeDateTime(Date date) {
         final FastDateFormat format = FastDateFormat.getInstance("dd-MMM-yyyy 
HH:mm:ss Z", TimeZone.getTimeZone("GMT"), Locale.US);
         return format.format(date);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
index 9427832..acf63d2 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
@@ -29,7 +29,7 @@ import org.apache.james.imap.message.response.ExpungeResponse;
 public class ExpungeResponseEncoder extends AbstractChainedImapEncoder {
     public static final String EXPUNGE = "EXPUNGE";
 
-    public ExpungeResponseEncoder(final ImapEncoder next) {
+    public ExpungeResponseEncoder(ImapEncoder next) {
         super(next);
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
index 4647fc9..1e1f834 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
@@ -53,12 +53,12 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
      *            true to activate a workaround for broken clients who cannot
      *            parse BODYSTRUCTURE extensions, false to fully support 
RFC3501
      */
-    public FetchResponseEncoder(final ImapEncoder next, final boolean 
neverAddBodyStructureExtensions) {
+    public FetchResponseEncoder(ImapEncoder next, boolean 
neverAddBodyStructureExtensions) {
         super(next);
         this.neverAddBodyStructureExtensions = neverAddBodyStructureExtensions;
     }
 
-    public boolean isAcceptable(final ImapMessage message) {
+    public boolean isAcceptable(ImapMessage message) {
         return (message instanceof FetchResponse);
     }
 
@@ -111,7 +111,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeStructure(final ImapResponseComposer composer, final 
Structure structure, final boolean includeExtensions, final boolean 
isInnerPart, ImapSession session) throws IOException {
+    private void encodeStructure(ImapResponseComposer composer, Structure 
structure, boolean includeExtensions, boolean isInnerPart, ImapSession session) 
throws IOException {
 
         final String mediaType;
         final String subType;
@@ -126,7 +126,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         encodeStructure(composer, structure, includeExtensions, mediaType, 
subType, isInnerPart, session);
     }
 
-    private void encodeStructure(final ImapResponseComposer composer, final 
Structure structure, final boolean includeExtensions, final String mediaType, 
final String subType, boolean isInnerPart, ImapSession session) throws 
IOException {
+    private void encodeStructure(ImapResponseComposer composer, Structure 
structure, boolean includeExtensions, String mediaType, String subType, boolean 
isInnerPart, ImapSession session) throws IOException {
         //
         // Workaround for broken clients
         // See IMAP-91
@@ -149,7 +149,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeBasic(final ImapResponseComposer composer, final 
Structure structure, final boolean includeExtensions, final String mediaType, 
final String subType, ImapSession session) throws IOException {
+    private void encodeBasic(ImapResponseComposer composer, Structure 
structure, boolean includeExtensions, String mediaType, String subType, 
ImapSession session) throws IOException {
         if (ImapConstants.MIME_TYPE_TEXT.equalsIgnoreCase(mediaType)) {
 
             final long lines = structure.getLines();
@@ -165,7 +165,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         composer.closeParen();
     }
 
-    private void encodeOnePartBodyExtensions(final ImapResponseComposer 
composer, final Structure structure, ImapSession session) throws IOException {
+    private void encodeOnePartBodyExtensions(ImapResponseComposer composer, 
Structure structure, ImapSession session) throws IOException {
         final String md5 = structure.getMD5();
         final List<String> languages = structure.getLanguages();
         final String location = structure.getLocation();
@@ -175,7 +175,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         nillableQuote(composer, location);
     }
 
-    private ImapResponseComposer bodyFldDsp(final Structure structure, final 
ImapResponseComposer composer, ImapSession session) throws IOException {
+    private ImapResponseComposer bodyFldDsp(Structure structure, 
ImapResponseComposer composer, ImapSession session) throws IOException {
         final String disposition = structure.getDisposition();
         if (disposition == null) {
             composer.nil();
@@ -189,14 +189,14 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         return composer;
     }
 
-    private void bodyFldParam(final Map<String, String> params, final 
ImapResponseComposer composer, ImapSession session) throws IOException {
+    private void bodyFldParam(Map<String, String> params, ImapResponseComposer 
composer, ImapSession session) throws IOException {
         if (params == null || params.isEmpty()) {
             composer.nil();
         } else {
             composer.openParen();
             final Set<String> keySet = params.keySet();
             final Collection<String> names = new TreeSet<String>(keySet);
-            for (final String name : names) {
+            for (String name : names) {
                 final String value = params.get(name);
                 if (value == null) {
                     final Logger logger = session.getLog();
@@ -213,7 +213,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeBodyFields(final ImapResponseComposer composer, final 
Structure structure, final String mediaType, final String subType) throws 
IOException {
+    private void encodeBodyFields(ImapResponseComposer composer, Structure 
structure, String mediaType, String subType) throws IOException {
         final List<String> bodyParams = structure.getParameters();
         final String id = structure.getId();
         final String description = structure.getDescription();
@@ -226,7 +226,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         composer.quoteUpperCaseAscii(encoding).message(octets);
     }
 
-    private void encodeMultipart(ImapResponseComposer composer, Structure 
structure, final String subType, final boolean includeExtensions, ImapSession 
session) throws IOException {
+    private void encodeMultipart(ImapResponseComposer composer, Structure 
structure, String subType, boolean includeExtensions, ImapSession session) 
throws IOException {
         composer.openParen();
 
         for (Iterator<Structure> it = structure.parts(); it.hasNext();) {
@@ -245,7 +245,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         composer.closeParen();
     }
 
-    private void encodeRfc822Message(ImapResponseComposer composer, Structure 
structure, final String mediaType, final String subType, final boolean 
includeExtensions, ImapSession session) throws IOException {
+    private void encodeRfc822Message(ImapResponseComposer composer, Structure 
structure, String mediaType, String subType, boolean includeExtensions, 
ImapSession session) throws IOException {
         final long lines = structure.getLines();
         final FetchResponse.Envelope envelope = structure.getEnvelope();
         final FetchResponse.Structure embeddedStructure = structure.getBody();
@@ -261,7 +261,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         composer.closeParen();
     }
 
-    private void encodeBodyElements(final ImapResponseComposer composer, final 
List<FetchResponse.BodyElement> elements) throws IOException {
+    private void encodeBodyElements(ImapResponseComposer composer, 
List<FetchResponse.BodyElement> elements) throws IOException {
         if (elements != null) {
             for (FetchResponse.BodyElement element : elements) {
                 final String name = element.getName();
@@ -271,7 +271,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeSize(ImapResponseComposer composer, final FetchResponse 
fetchResponse) throws IOException {
+    private void encodeSize(ImapResponseComposer composer, FetchResponse 
fetchResponse) throws IOException {
         final Long size = fetchResponse.getSize();
         if (size != null) {
             // TODO: add method to composer
@@ -280,7 +280,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeInternalDate(ImapResponseComposer composer, final 
FetchResponse fetchResponse) throws IOException {
+    private void encodeInternalDate(ImapResponseComposer composer, 
FetchResponse fetchResponse) throws IOException {
         final Date internalDate = fetchResponse.getInternalDate();
         if (internalDate != null) {
             // TODO: add method to composer
@@ -289,7 +289,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeUid(ImapResponseComposer composer, final FetchResponse 
fetchResponse) throws IOException {
+    private void encodeUid(ImapResponseComposer composer, FetchResponse 
fetchResponse) throws IOException {
         final Long uid = fetchResponse.getUid();
         if (uid != null) {
             composer.message(ImapConstants.UID);
@@ -297,19 +297,19 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeFlags(ImapResponseComposer composer, final 
FetchResponse fetchResponse) throws IOException {
+    private void encodeFlags(ImapResponseComposer composer, FetchResponse 
fetchResponse) throws IOException {
         final Flags flags = fetchResponse.getFlags();
         if (flags != null) {
             composer.flags(flags);
         }
     }
 
-    private void encodeEnvelope(final ImapResponseComposer composer, final 
FetchResponse fetchResponse) throws IOException {
+    private void encodeEnvelope(ImapResponseComposer composer, FetchResponse 
fetchResponse) throws IOException {
         final FetchResponse.Envelope envelope = fetchResponse.getEnvelope();
         encodeEnvelope(composer, envelope, true);
     }
 
-    private void encodeEnvelope(final ImapResponseComposer composer, final 
FetchResponse.Envelope envelope, boolean prefixWithName) throws IOException {
+    private void encodeEnvelope(ImapResponseComposer composer, 
FetchResponse.Envelope envelope, boolean prefixWithName) throws IOException {
         if (envelope != null) {
             final String date = envelope.getDate();
             final String subject = envelope.getSubject();
@@ -341,7 +341,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeAddresses(final ImapResponseComposer composer, final 
FetchResponse.Envelope.Address[] addresses) throws IOException {
+    private void encodeAddresses(ImapResponseComposer composer, 
FetchResponse.Envelope.Address[] addresses) throws IOException {
         if (addresses == null || addresses.length == 0) {
             composer.nil();
         } else {
@@ -353,7 +353,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
         }
     }
 
-    private void encodeAddress(final ImapResponseComposer composer, final 
FetchResponse.Envelope.Address address) throws IOException {
+    private void encodeAddress(ImapResponseComposer composer, 
FetchResponse.Envelope.Address address) throws IOException {
         final String name = address.getPersonalName();
         final String domainList = address.getAtDomainList();
         final String mailbox = address.getMailboxName();
@@ -382,7 +382,7 @@ public class FetchResponseEncoder extends 
AbstractChainedImapEncoder {
                composer.nil();
         } else {
                composer.openParen();
-            for (final String string : quotes) {
+            for (String string : quotes) {
                nillableQuote(composer,string);
             }
             composer.closeParen();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
index d814be3..d08880b 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
@@ -99,7 +99,7 @@ public interface ImapResponseComposer {
      * @return composer
      * @throws IOException
      */
-    ImapResponseComposer commandName(final String name) throws IOException;
+    ImapResponseComposer commandName(String name) throws IOException;
 
     /**
      * Write the message of type <code>String</code>
@@ -108,7 +108,7 @@ public interface ImapResponseComposer {
      * @return composer
      * @throws IOException
      */
-    ImapResponseComposer message(final String message) throws IOException;
+    ImapResponseComposer message(String message) throws IOException;
 
     /**
      * Write the message of type <code>Long</code>
@@ -117,7 +117,7 @@ public interface ImapResponseComposer {
      * @return composer
      * @throws IOException
      */
-    ImapResponseComposer message(final long number) throws IOException;
+    ImapResponseComposer message(long number) throws IOException;
 
     /**
      * First encodes the given {@code mailboxName} using
@@ -128,7 +128,7 @@ public interface ImapResponseComposer {
      * @return
      * @throws IOException
      */
-    ImapResponseComposer mailbox(final String mailboxName) throws IOException;
+    ImapResponseComposer mailbox(String mailboxName) throws IOException;
 
     /**
      * Write the given sequence-set
@@ -137,7 +137,7 @@ public interface ImapResponseComposer {
      * @return composer
      * @throws IOException
      */
-    ImapResponseComposer sequenceSet(final IdRange[] ranges) throws 
IOException;
+    ImapResponseComposer sequenceSet(IdRange[] ranges) throws IOException;
 
     /**
      * Write a CRLF and flush the composer which will write the content of it 
to
@@ -202,7 +202,7 @@ public interface ImapResponseComposer {
      * @return self, not null
      * @throws IOException
      */
-    ImapResponseComposer upperCaseAscii(final String message) throws 
IOException;
+    ImapResponseComposer upperCaseAscii(String message) throws IOException;
 
     /**
      * Appends the given message after conversion to upper case. The message 
may
@@ -214,7 +214,7 @@ public interface ImapResponseComposer {
      * @return self, not null
      * @throws IOException
      */
-    ImapResponseComposer quoteUpperCaseAscii(final String message) throws 
IOException;
+    ImapResponseComposer quoteUpperCaseAscii(String message) throws 
IOException;
 
     /**
      * Tell the {@link ImapResponseComposer} to skip the next written space

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
index 06bb947..b0c238a 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
@@ -36,7 +36,7 @@ public class LSubResponseEncoder extends 
AbstractChainedImapEncoder {
         super(next);
     }
 
-    protected void doEncode(final ImapMessage acceptableMessage, final 
ImapResponseComposer composer, ImapSession session) throws IOException {
+    protected void doEncode(ImapMessage acceptableMessage, 
ImapResponseComposer composer, ImapSession session) throws IOException {
         final AbstractListingResponse response = (AbstractListingResponse) 
acceptableMessage;
         
ListingEncodingUtils.encodeListingResponse(ImapConstants.LSUB_RESPONSE_NAME, 
composer, response);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
index 0841f44..e15cde1 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
@@ -36,7 +36,7 @@ public class ListResponseEncoder extends 
AbstractChainedImapEncoder {
         super(next);
     }
 
-    protected void doEncode(final ImapMessage acceptableMessage, final 
ImapResponseComposer composer, ImapSession session) throws IOException {
+    protected void doEncode(ImapMessage acceptableMessage, 
ImapResponseComposer composer, ImapSession session) throws IOException {
         final AbstractListingResponse response = (AbstractListingResponse) 
acceptableMessage;
         
ListingEncodingUtils.encodeListingResponse(ImapConstants.LIST_RESPONSE_NAME, 
composer, response);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
index 393cf14..c24dba1 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
@@ -32,7 +32,7 @@ import 
org.apache.james.imap.message.response.AbstractListingResponse;
  */
 public class ListingEncodingUtils {
 
-    public static void encodeListingResponse(final String responseTypeName, 
final ImapResponseComposer composer, final AbstractListingResponse response) 
throws IOException {
+    public static void encodeListingResponse(String responseTypeName, 
ImapResponseComposer composer, AbstractListingResponse response) throws 
IOException {
         final List<String> attributes = getNameAttributes(response);
 
         final String name = response.getName();
@@ -42,7 +42,7 @@ public class ListingEncodingUtils {
         composer.message(responseTypeName);
         composer.openParen();
         if (attributes != null) {
-            for (final String attribute : attributes) {
+            for (String attribute : attributes) {
                 composer.message(attribute);
             }
         }
@@ -58,7 +58,7 @@ public class ListingEncodingUtils {
         composer.end();
     }
 
-    private static List<String> getNameAttributes(final 
AbstractListingResponse response) {
+    private static List<String> getNameAttributes(AbstractListingResponse 
response) {
         final List<String> attributes;
         if (response.isNameAttributed()) {
             attributes = new ArrayList<String>();

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
index 79c47e7..f139b03 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
@@ -33,7 +33,7 @@ public class RecentResponseEncoder extends 
AbstractChainedImapEncoder {
         super(next);
     }
 
-    public boolean isAcceptable(final ImapMessage message) {
+    public boolean isAcceptable(ImapMessage message) {
         return (message instanceof RecentResponse);
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
index 2f5006e..e01de28 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
@@ -39,7 +39,7 @@ public class StatusResponseEncoder extends 
AbstractChainedImapEncoder {
 
     private final Localizer localizer;
 
-    public StatusResponseEncoder(ImapEncoder next, final Localizer localizer) {
+    public StatusResponseEncoder(ImapEncoder next, Localizer localizer) {
         super(next);
         this.localizer = localizer;
     }


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

Reply via email to