You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2016/11/23 13:50:23 UTC
[20/46] james-project git commit: JAMES-1854 Remove some IntelliJ
warnings
JAMES-1854 Remove some IntelliJ warnings
- final variable not compulsory in SievePoster
- unused field in SievePoster
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4bd1cf7c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4bd1cf7c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4bd1cf7c
Branch: refs/heads/master
Commit: 4bd1cf7cecd67524a7c7179956771627e92461ce
Parents: 73fce64
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Oct 31 18:52:15 2016 +0100
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Fri Nov 18 18:46:46 2016 +0700
----------------------------------------------------------------------
.../transport/mailets/SieveLocalDelivery.java | 2 +-
.../mailets/SieveToRecipientFolder.java | 2 +-
.../mailets/jsieve/delivery/SievePoster.java | 21 +++++---------------
.../mailets/delivery/SieveIntegrationTest.java | 2 +-
4 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4bd1cf7c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
index e9b2d6e..bdd3eb5 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
@@ -103,7 +103,7 @@ public class SieveLocalDelivery extends GenericMailet {
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())
http://git-wip-us.apache.org/repos/asf/james-project/blob/4bd1cf7c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
index 8f5d258..17f75f3 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
@@ -93,7 +93,7 @@ public class SieveToRecipientFolder extends GenericMailet {
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())
http://git-wip-us.apache.org/repos/asf/james-project/blob/4bd1cf7c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java
index f530ad3..3caae1f 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java
@@ -22,39 +22,30 @@ package org.apache.james.transport.mailets.jsieve.delivery;
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 @@ public class SievePoster implements Poster {
}
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 {
http://git-wip-us.apache.org/repos/asf/james-project/blob/4bd1cf7c/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
index f5008a6..3b88303 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
@@ -109,7 +109,7 @@ public class SieveIntegrationTest {
.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();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org