You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/11/10 02:12:42 UTC
[james-project] branch master updated: [UPGRADE] JSieve 0.7 -> 0.8 (#1294)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 62b3730ad0 [UPGRADE] JSieve 0.7 -> 0.8 (#1294)
62b3730ad0 is described below
commit 62b3730ad0953bb1800707ad2274c2ce0af1ba17
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Thu Nov 10 09:12:37 2022 +0700
[UPGRADE] JSieve 0.7 -> 0.8 (#1294)
---
pom.xml | 2 +-
.../org/apache/james/transport/mailets/Sieve.java | 4 ----
.../mailets/jsieve/delivery/SieveExecutor.java | 20 +++++---------------
.../mailets/jsieve/delivery/SieveExecutorTest.java | 2 --
4 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2e3a071080..094257bbee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -605,7 +605,7 @@
<javax.inject.version>1</javax.inject.version>
<javax.activation.groupId>javax.activation</javax.activation.groupId>
<javax.activation.artifactId>activation</javax.activation.artifactId>
- <jsieve.version>0.7</jsieve.version>
+ <jsieve.version>0.8</jsieve.version>
<spring.version>4.3.25.RELEASE</spring.version>
<activmq-artemis.version>2.26.0</activmq-artemis.version>
<apache-jspf-resolver.version>1.0.1</apache-jspf-resolver.version>
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java
index 77b0d347c1..4d1e416482 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java
@@ -22,8 +22,6 @@ package org.apache.james.transport.mailets;
import javax.inject.Inject;
import javax.mail.MessagingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.james.core.MailAddress;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.sieverepository.api.SieveRepository;
@@ -60,11 +58,9 @@ public class Sieve extends GenericMailet {
@Override
public void init() throws MessagingException {
- Log log = LogFactory.getLog(Sieve.class);
sieveExecutor = SieveExecutor.builder()
.resourceLocator(resourceLocator)
.mailetContext(getMailetContext())
- .log(log)
.sievePoster(new SievePoster(usersRepository, MailboxConstants.INBOX))
.build();
}
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java
index ad79440f8c..74771476e4 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java
@@ -22,7 +22,6 @@ package org.apache.james.transport.mailets.jsieve.delivery;
import javax.mail.MessagingException;
-import org.apache.commons.logging.Log;
import org.apache.james.core.MailAddress;
import org.apache.james.server.core.MailImpl;
import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
@@ -59,7 +58,6 @@ public class SieveExecutor {
private MailetContext mailetContext;
private SievePoster sievePoster;
private ResourceLocator resourceLocator;
- private Log log;
public Builder sievePoster(SievePoster sievePoster) {
this.sievePoster = sievePoster;
@@ -76,17 +74,11 @@ public class SieveExecutor {
return this;
}
- public Builder log(Log log) {
- this.log = log;
- return this;
- }
-
public SieveExecutor build() throws MessagingException {
Preconditions.checkNotNull(mailetContext);
Preconditions.checkNotNull(resourceLocator);
- Preconditions.checkNotNull(log);
Preconditions.checkNotNull(sievePoster);
- return new SieveExecutor(mailetContext, sievePoster, resourceLocator, log);
+ return new SieveExecutor(mailetContext, sievePoster, resourceLocator);
}
}
@@ -97,19 +89,17 @@ public class SieveExecutor {
private final ActionDispatcher actionDispatcher;
public SieveExecutor(MailetContext mailetContext, SievePoster sievePoster,
- ResourceLocator resourceLocator, Log log) throws MessagingException {
+ ResourceLocator resourceLocator) throws MessagingException {
this.mailetContext = mailetContext;
this.sievePoster = sievePoster;
this.resourceLocator = resourceLocator;
- factory = createFactory(log);
+ this.factory = createFactory();
this.actionDispatcher = new ActionDispatcher();
}
- private SieveFactory createFactory(Log log) throws MessagingException {
+ private SieveFactory createFactory() throws MessagingException {
try {
- final ConfigurationManager configurationManager = new ConfigurationManager();
- configurationManager.setLog(log);
- return configurationManager.build();
+ return new ConfigurationManager().build();
} catch (SieveConfigurationException e) {
throw new MessagingException("Failed to load standard Sieve configuration.", e);
}
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutorTest.java
index 6ed0d995b1..c5c28e19cc 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutorTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutorTest.java
@@ -24,7 +24,6 @@ import static org.apache.mailet.base.MailAddressFixture.RECIPIENT1;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
-import org.apache.commons.logging.Log;
import org.apache.james.core.builder.MimeMessageBuilder;
import org.apache.james.server.core.MailImpl;
import org.apache.james.transport.mailets.jsieve.ResourceLocator;
@@ -43,7 +42,6 @@ class SieveExecutorTest {
.mailetContext(mailetContext)
.sievePoster(mock(SievePoster.class))
.resourceLocator(mock(ResourceLocator.class))
- .log(mock(Log.class))
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org