You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/06/17 03:16:05 UTC
[james-project] 03/05: JAMES-3589 Move mailetcontainer classes out
of camel package
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 42107ec0092418c08b27918a13b017fa54f4e81b
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 2 15:57:56 2021 +0700
JAMES-3589 Move mailetcontainer classes out of camel package
---
.../org/apache/james/modules/server/CamelMailetContainerModule.java | 4 ++--
.../apache/james/modules/server/CamelMailetContainerModuleTest.java | 2 +-
.../mailetcontainer/impl/{camel => }/CamelCompositeProcessor.java | 2 +-
.../mailetcontainer/impl/{camel => }/CamelMailetProcessor.java | 5 ++---
.../james/mailetcontainer/impl/{camel => }/CamelProcessor.java | 4 +---
.../james/mailetcontainer/impl/{camel => }/MatcherSplitter.java | 4 +---
.../james/mailetcontainer/impl/jmx/MailProcessorManagement.java | 3 ++-
.../james/mailetcontainer/lib/AbstractStateCompositeProcessor.java | 6 ++++--
.../james/mailetcontainer/lib/AbstractStateMailetProcessor.java | 3 ++-
.../src/main/resources/META-INF/spring/mailetcontainer-context.xml | 2 +-
.../impl/{camel => }/CamelCompositeProcessorTest.java | 2 +-
.../mailetcontainer/impl/{camel => }/CamelMailetProcessorTest.java | 2 +-
12 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
index ebf1390..584819e 100644
--- a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
+++ b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
@@ -38,11 +38,11 @@ import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.MailetLoader;
import org.apache.james.mailetcontainer.api.MatcherLoader;
import org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean;
+import org.apache.james.mailetcontainer.impl.CamelCompositeProcessor;
+import org.apache.james.mailetcontainer.impl.CamelMailetProcessor;
import org.apache.james.mailetcontainer.impl.JamesMailSpooler;
import org.apache.james.mailetcontainer.impl.JamesMailetContext;
import org.apache.james.mailetcontainer.impl.MatcherMailetPair;
-import org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor;
-import org.apache.james.mailetcontainer.impl.camel.CamelMailetProcessor;
import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.transport.mailets.RemoveMimeHeader;
diff --git a/server/container/guice/mailet/src/test/java/org/apache/james/modules/server/CamelMailetContainerModuleTest.java b/server/container/guice/mailet/src/test/java/org/apache/james/modules/server/CamelMailetContainerModuleTest.java
index cfd3fae..fcab694 100644
--- a/server/container/guice/mailet/src/test/java/org/apache/james/modules/server/CamelMailetContainerModuleTest.java
+++ b/server/container/guice/mailet/src/test/java/org/apache/james/modules/server/CamelMailetContainerModuleTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.configuration2.XMLConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.james.mailetcontainer.impl.JamesMailSpooler;
-import org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor;
+import org.apache.james.mailetcontainer.impl.CamelCompositeProcessor;
import org.apache.james.modules.server.CamelMailetContainerModule.MailetModuleInitializationOperation;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.server.core.configuration.FileConfigurationProvider;
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessor.java
similarity index 98%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessor.java
index 53394c2..81732cd 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessor.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.impl.camel;
+package org.apache.james.mailetcontainer.impl;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessor.java
similarity index 97%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessor.java
index adeda11..ef406cf 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessor.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.impl.camel;
+package org.apache.james.mailetcontainer.impl;
-import static org.apache.james.mailetcontainer.impl.camel.MatcherSplitter.MATCHER_MATCHED_ATTRIBUTE;
+import static org.apache.james.mailetcontainer.impl.MatcherSplitter.MATCHER_MATCHED_ATTRIBUTE;
import java.util.List;
import java.util.Map;
@@ -31,7 +31,6 @@ import javax.mail.MessagingException;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.mailetcontainer.impl.MatcherMailetPair;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.mailet.Mail;
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelProcessor.java
similarity index 96%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelProcessor.java
index 0ba3254..786ae62 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelProcessor.java
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.impl.camel;
+package org.apache.james.mailetcontainer.impl;
import java.io.Closeable;
import java.util.List;
import java.util.Locale;
-import org.apache.james.mailetcontainer.impl.MailetConfigImpl;
-import org.apache.james.mailetcontainer.impl.ProcessorUtil;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.metrics.api.TimeMetric;
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java
similarity index 97%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java
index cc534e7..ddc1af7 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.impl.camel;
+package org.apache.james.mailetcontainer.impl;
import java.io.Closeable;
import java.util.ArrayList;
@@ -29,8 +29,6 @@ import java.util.Optional;
import javax.mail.MessagingException;
import org.apache.james.core.MailAddress;
-import org.apache.james.mailetcontainer.impl.MatcherMailetPair;
-import org.apache.james.mailetcontainer.impl.ProcessorUtil;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.metrics.api.TimeMetric;
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
index 5719653..d8a3f18 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
@@ -26,10 +26,11 @@ import javax.management.StandardMBean;
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean;
+import org.apache.james.mailetcontainer.impl.CamelProcessor;
/**
* Wrapper which helps to expose JMX statistics for {@link MailProcessor} and
- * {@link org.apache.james.mailetcontainer.impl.camel.CamelProcessor} implementations
+ * {@link CamelProcessor} implementations
*/
public class MailProcessorManagement extends StandardMBean implements MailProcessorManagementMBean {
private final String processorName;
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
index c38f616..27e652a 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
@@ -35,14 +35,16 @@ import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.mailetcontainer.api.MailProcessor;
+import org.apache.james.mailetcontainer.impl.CamelCompositeProcessor;
+import org.apache.james.mailetcontainer.impl.CamelProcessor;
import org.apache.james.mailetcontainer.impl.jmx.JMXStateCompositeProcessorListener;
import org.apache.mailet.Mail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Abstract base class for {@link org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor} which service the
- * {@link Mail} with a {@link org.apache.james.mailetcontainer.impl.camel.CamelProcessor} instances
+ * Abstract base class for {@link CamelCompositeProcessor} which service the
+ * {@link Mail} with a {@link CamelProcessor} instances
*/
public abstract class AbstractStateCompositeProcessor implements MailProcessor, Configurable {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStateCompositeProcessor.class);
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index f010731..6f0ce1e 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -38,6 +38,7 @@ import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.MailetLoader;
import org.apache.james.mailetcontainer.api.MatcherLoader;
+import org.apache.james.mailetcontainer.impl.CamelProcessor;
import org.apache.james.mailetcontainer.impl.MailetConfigImpl;
import org.apache.james.mailetcontainer.impl.MatcherConfigImpl;
import org.apache.james.mailetcontainer.impl.MatcherMailetPair;
@@ -344,7 +345,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
/**
* Setup the routing for the configured {@link MatcherMailetPair}'s for this
- * {@link org.apache.james.mailetcontainer.impl.camel.CamelProcessor}
+ * {@link CamelProcessor}
*/
protected abstract void setupRouting(List<MatcherMailetPair> pairs) throws MessagingException;
diff --git a/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml b/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
index cbab870..e257c5c 100644
--- a/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
+++ b/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
@@ -25,7 +25,7 @@
<!-- Mailet Container Beans. -->
<bean id="mailprocessor" name="processorRoute"
- class="org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor" autowire="byType"/>
+ class="org.apache.james.mailetcontainer.impl.CamelCompositeProcessor" autowire="byType"/>
<!--
mailcontext bean must be defined after mailProcessor
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessorTest.java
similarity index 97%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
rename to server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessorTest.java
index 1f6f954..7e61992 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.impl.camel;
+package org.apache.james.mailetcontainer.impl;
import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.tree.ImmutableNode;
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessorTest.java
similarity index 98%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java
rename to server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessorTest.java
index f083e30..adc017a 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessorTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.impl.camel;
+package org.apache.james.mailetcontainer.impl;
import static org.mockito.Mockito.mock;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org