JAMES-1854 Remove some IntelliJ warnings

- final variable not compulsory in SievePoster - unused field in SievePoster
apache · Nov 18, 2016 · 4bd1cf7 · 4bd1cf7
1 parent 73fce64
commit 4bd1cf7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/...r/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java b/...r/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
@@ -103,7 +103,7 @@ public void init() throws MessagingException {
         String folder = "INBOX";
         mailDispatcher = MailDispatcher.builder()
             .mailStorer(SieveMailStorer.builder()
-                .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext().getLogger()), folder, usersRepository, getMailetContext()))
+                .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext().getLogger()), folder, usersRepository))
                 .usersRepository(usersRepository)
                 .resourceLocator(ResourceLocatorImpl.instanciate(usersRepository, sieveRepository))
                 .mailetContext(getMailetContext())

diff --git a/...ilet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java b/...ilet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
@@ -93,7 +93,7 @@ public void init() throws MessagingException {
         String folder = getInitParameter(FOLDER_PARAMETER, "INBOX");
         mailDispatcher = MailDispatcher.builder()
             .mailStorer(SieveMailStorer.builder()
-                .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext().getLogger()), folder, usersRepository, getMailetContext()))
+                .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext().getLogger()), folder, usersRepository))
                 .usersRepository(usersRepository)
                 .resourceLocator(ResourceLocatorImpl.instanciate(usersRepository, sieveRepository))
                 .mailetContext(getMailetContext())

diff --git a/...mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java b/...mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java
@@ -22,39 +22,30 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.transport.mailets.delivery.DeliveryUtils;
 import org.apache.james.transport.mailets.delivery.MailboxAppender;
 import org.apache.james.transport.mailets.jsieve.Poster;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.mailet.MailetContext;
-
-import com.google.common.base.Strings;
 
 public class SievePoster implements Poster {
 
     private final MailboxAppender mailboxAppender;
     private final String folder;
     private final UsersRepository usersRepos;
-    private final MailetContext mailetContext;
 
-    public SievePoster(MailboxAppender mailboxAppender, String folder, UsersRepository usersRepos, MailetContext mailetContext) {
+    public SievePoster(MailboxAppender mailboxAppender, String folder, UsersRepository usersRepos) {
         this.mailboxAppender = mailboxAppender;
         this.folder = folder;
         this.usersRepos = usersRepos;
-        this.mailetContext = mailetContext;
     }
 
     @Override
     public void post(String url, MimeMessage mail) throws MessagingException {
-        final int endOfScheme = url.indexOf(':');
+        int endOfScheme = url.indexOf(':');
         if (endOfScheme < 0) {
             throw new MessagingException("Malformed URI");
         } else {
-            final String scheme = url.substring(0, endOfScheme);
+            String scheme = url.substring(0, endOfScheme);
             if (scheme.equals("mailbox")) {
                 handleMailboxProtocol(url, mail, endOfScheme);
             } else {
@@ -81,14 +72,12 @@ private void handleMailboxProtocol(String url, MimeMessage mail, int endOfScheme
     }
 
     private String parseUrlPath(String url, int endOfHost) {
-        String urlPath;
         int length = url.length();
         if (endOfHost + 1 == length) {
-            urlPath = this.folder;
+            return this.folder;
         } else {
-            urlPath = url.substring(endOfHost, length);
+            return url.substring(endOfHost, length);
         }
-        return urlPath;
     }
 
     private String parseUser(String url, int startOfUser, int endOfUser, String host) throws MessagingException {

diff --git a/...ilets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/...ilets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
@@ -109,7 +109,7 @@ public void setUp() throws Exception {
             .resourceLocator(resourceLocator)
             .usersRepository(usersRepository)
             .folder("INBOX")
-            .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, mock(Logger.class)), "INBOX", usersRepository, fakeMailContext))
+            .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, mock(Logger.class)), "INBOX", usersRepository))
             .log(mock(Log.class))
             .mailetContext(fakeMailContext)
             .build();