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 c9dd58e81d67cbcc2d4d6d3f745c81f7be20dc7b Author: Benoit Tellier <[email protected]> AuthorDate: Wed Jun 2 15:59:50 2021 +0700 JAMES-3589 Rename classes to remove 'Camel' prefix --- .../org/apache/james/MemoryJamesServerMain.java | 4 +-- .../james/modules/MailetProcessingModule.java | 4 +-- ...faultProcessorsConfigurationProviderModule.java | 2 +- ...ainerModule.java => MailetContainerModule.java} | 32 +++++++++++----------- ...uleTest.java => MailetContainerModuleTest.java} | 24 ++++++++-------- .../org/apache/james/jmap/draft/JMAPModule.java | 8 +++--- .../james/jmap/draft/MailetPreconditionTest.java | 17 +++++------- ...eProcessor.java => CompositeProcessorImpl.java} | 6 ++-- ...iletProcessor.java => MailetProcessorImpl.java} | 14 +++++----- .../mailetcontainer/impl/MatcherSplitter.java | 4 +-- .../{CamelProcessor.java => ProcessorImpl.java} | 8 +++--- .../impl/jmx/MailProcessorManagement.java | 4 +-- .../lib/AbstractStateCompositeProcessor.java | 8 +++--- .../lib/AbstractStateMailetProcessor.java | 4 +-- .../META-INF/spring/mailetcontainer-context.xml | 2 +- ...orTest.java => CompositeProcessorImplTest.java} | 4 +-- ...essorTest.java => MailetProcessorImplTest.java} | 6 ++-- 17 files changed, 74 insertions(+), 77 deletions(-) diff --git a/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java index 0e16d31..2c29c2c 100644 --- a/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -40,7 +40,6 @@ import org.apache.james.modules.protocols.POP3ServerModule; import org.apache.james.modules.protocols.ProtocolHandlerModule; import org.apache.james.modules.protocols.SMTPServerModule; import org.apache.james.modules.queue.memory.MemoryMailQueueModule; -import org.apache.james.modules.server.CamelMailetContainerModule; import org.apache.james.modules.server.DKIMMailetModule; import org.apache.james.modules.server.DLPRoutesModule; import org.apache.james.modules.server.DataRoutesModules; @@ -50,6 +49,7 @@ import org.apache.james.modules.server.MailQueueRoutesModule; import org.apache.james.modules.server.MailRepositoriesRoutesModule; import org.apache.james.modules.server.MailboxRoutesModule; import org.apache.james.modules.server.MailboxesExportRoutesModule; +import org.apache.james.modules.server.MailetContainerModule; import org.apache.james.modules.server.NoJwtModule; import org.apache.james.modules.server.RawPostDequeueDecoratorModule; import org.apache.james.modules.server.SieveRoutesModule; @@ -123,7 +123,7 @@ public class MemoryJamesServerMain implements JamesServerMain { new ProtocolHandlerModule(), new SMTPServerModule(), new RawPostDequeueDecoratorModule(), - binder -> binder.bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) + binder -> binder.bind(MailetContainerModule.DefaultProcessorsConfigurationSupplier.class) .toInstance(BaseHierarchicalConfiguration::new)); diff --git a/server/container/guice/common/src/main/java/org/apache/james/modules/MailetProcessingModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/MailetProcessingModule.java index 02cdd69..dd64cef 100644 --- a/server/container/guice/common/src/main/java/org/apache/james/modules/MailetProcessingModule.java +++ b/server/container/guice/common/src/main/java/org/apache/james/modules/MailetProcessingModule.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.modules; -import org.apache.james.modules.server.CamelMailetContainerModule; import org.apache.james.modules.server.MailStoreRepositoryModule; +import org.apache.james.modules.server.MailetContainerModule; import com.google.inject.AbstractModule; @@ -28,7 +28,7 @@ public class MailetProcessingModule extends AbstractModule { @Override protected void configure() { install(new MailStoreRepositoryModule()); - install(new CamelMailetContainerModule()); + install(new MailetContainerModule()); } } diff --git a/server/container/guice/common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java index 7f6badb..91ee4dc 100644 --- a/server/container/guice/common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java +++ b/server/container/guice/common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java @@ -28,7 +28,7 @@ public class DefaultProcessorsConfigurationProviderModule extends AbstractModule @Override protected void configure() { - bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) + bind(MailetContainerModule.DefaultProcessorsConfigurationSupplier.class) .toInstance( () -> { try { 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/MailetContainerModule.java similarity index 92% rename from server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java rename to server/container/guice/mailet/src/main/java/org/apache/james/modules/server/MailetContainerModule.java index 584819e..879e26e 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/MailetContainerModule.java @@ -38,10 +38,10 @@ 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.CompositeProcessorImpl; import org.apache.james.mailetcontainer.impl.JamesMailSpooler; import org.apache.james.mailetcontainer.impl.JamesMailetContext; +import org.apache.james.mailetcontainer.impl.MailetProcessorImpl; import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.server.core.configuration.ConfigurationProvider; @@ -76,9 +76,9 @@ import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.google.inject.multibindings.ProvidesIntoSet; -public class CamelMailetContainerModule extends AbstractModule { +public class MailetContainerModule extends AbstractModule { - private static final Logger LOGGER = LoggerFactory.getLogger(CamelMailetContainerModule.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MailetContainerModule.class); public static final ProcessorsCheck.Impl BCC_Check = new ProcessorsCheck.Impl( "transport", @@ -89,8 +89,8 @@ public class CamelMailetContainerModule extends AbstractModule { @Override protected void configure() { - bind(CamelCompositeProcessor.class).in(Scopes.SINGLETON); - bind(MailProcessor.class).to(CamelCompositeProcessor.class); + bind(CompositeProcessorImpl.class).in(Scopes.SINGLETON); + bind(MailProcessor.class).to(CompositeProcessorImpl.class); bind(JamesMailSpooler.class).in(Scopes.SINGLETON); bind(MailSpoolerMBean.class).to(JamesMailSpooler.class); @@ -151,7 +151,7 @@ public class CamelMailetContainerModule extends AbstractModule { @Singleton public static class MailetModuleInitializationOperation implements InitializationOperation { private final ConfigurationProvider configurationProvider; - private final CamelCompositeProcessor camelCompositeProcessor; + private final CompositeProcessorImpl compositeProcessorImpl; private final DefaultProcessorsConfigurationSupplier defaultProcessorsConfigurationSupplier; private final Set<ProcessorsCheck> processorsCheckSet; private final JamesMailSpooler jamesMailSpooler; @@ -159,13 +159,13 @@ public class CamelMailetContainerModule extends AbstractModule { @Inject public MailetModuleInitializationOperation(ConfigurationProvider configurationProvider, - CamelCompositeProcessor camelCompositeProcessor, + CompositeProcessorImpl compositeProcessorImpl, Set<ProcessorsCheck> processorsCheckSet, DefaultProcessorsConfigurationSupplier defaultProcessorsConfigurationSupplier, JamesMailSpooler jamesMailSpooler, JamesMailSpooler.Configuration spoolerConfiguration) { this.configurationProvider = configurationProvider; - this.camelCompositeProcessor = camelCompositeProcessor; + this.compositeProcessorImpl = compositeProcessorImpl; this.processorsCheckSet = processorsCheckSet; this.defaultProcessorsConfigurationSupplier = defaultProcessorsConfigurationSupplier; this.jamesMailSpooler = jamesMailSpooler; @@ -179,8 +179,8 @@ public class CamelMailetContainerModule extends AbstractModule { } private void configureProcessors() throws Exception { - camelCompositeProcessor.configure(getProcessorConfiguration()); - camelCompositeProcessor.init(); + compositeProcessorImpl.configure(getProcessorConfiguration()); + compositeProcessorImpl.init(); jamesMailSpooler.configure(spoolerConfiguration); jamesMailSpooler.init(); @@ -198,11 +198,11 @@ public class CamelMailetContainerModule extends AbstractModule { } private void checkProcessors() throws ConfigurationException { - ImmutableListMultimap<String, MatcherMailetPair> processors = Arrays.stream(camelCompositeProcessor.getProcessorStates()) + ImmutableListMultimap<String, MatcherMailetPair> processors = Arrays.stream(compositeProcessorImpl.getProcessorStates()) .flatMap(state -> { - MailProcessor processor = camelCompositeProcessor.getProcessor(state); - if (processor instanceof CamelMailetProcessor) { - CamelMailetProcessor camelProcessor = (CamelMailetProcessor) processor; + MailProcessor processor = compositeProcessorImpl.getProcessor(state); + if (processor instanceof MailetProcessorImpl) { + MailetProcessorImpl camelProcessor = (MailetProcessorImpl) processor; return camelProcessor.getPairs().stream() .map(pair -> Pair.of(state, pair)); } else { @@ -219,7 +219,7 @@ public class CamelMailetContainerModule extends AbstractModule { @Override public Class<? extends Startable> forClass() { - return CamelCompositeProcessor.class; + return CompositeProcessorImpl.class; } } 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/MailetContainerModuleTest.java similarity index 88% rename from server/container/guice/mailet/src/test/java/org/apache/james/modules/server/CamelMailetContainerModuleTest.java rename to server/container/guice/mailet/src/test/java/org/apache/james/modules/server/MailetContainerModuleTest.java index fcab694..25fc4fc 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/MailetContainerModuleTest.java @@ -33,17 +33,17 @@ 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.CamelCompositeProcessor; -import org.apache.james.modules.server.CamelMailetContainerModule.MailetModuleInitializationOperation; +import org.apache.james.mailetcontainer.impl.CompositeProcessorImpl; +import org.apache.james.modules.server.MailetContainerModule.MailetModuleInitializationOperation; import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.server.core.configuration.FileConfigurationProvider; import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableSet; -class CamelMailetContainerModuleTest { +class MailetContainerModuleTest { - public static final ImmutableSet<CamelMailetContainerModule.ProcessorsCheck> NO_TRANSPORT_CHECKS = ImmutableSet.of(); + public static final ImmutableSet<MailetContainerModule.ProcessorsCheck> NO_TRANSPORT_CHECKS = ImmutableSet.of(); @Test void getMailetContextConfigurationShouldReturnEmptyWhenNoContextSection() throws Exception { @@ -51,7 +51,7 @@ class CamelMailetContainerModuleTest { when(configurationProvider.getConfiguration("mailetcontainer")) .thenReturn(new BaseHierarchicalConfiguration()); - CamelMailetContainerModule testee = new CamelMailetContainerModule(); + MailetContainerModule testee = new MailetContainerModule(); assertThat(testee.getMailetContextConfiguration(configurationProvider).size()) .isEqualTo(0); @@ -63,7 +63,7 @@ class CamelMailetContainerModuleTest { when(configurationProvider.getConfiguration("mailetcontainer")) .thenThrow(new ConfigurationRuntimeException()); - CamelMailetContainerModule testee = new CamelMailetContainerModule(); + MailetContainerModule testee = new MailetContainerModule(); assertThatThrownBy(() -> testee.getMailetContextConfiguration(configurationProvider)) .isInstanceOf(ConfigurationRuntimeException.class); @@ -81,7 +81,7 @@ class CamelMailetContainerModuleTest { ConfigurationProvider configurationProvider = mock(ConfigurationProvider.class); when(configurationProvider.getConfiguration("mailetcontainer")).thenReturn(configuration); - CamelMailetContainerModule testee = new CamelMailetContainerModule(); + MailetContainerModule testee = new MailetContainerModule(); HierarchicalConfiguration<ImmutableNode> mailetContextConfiguration = testee.getMailetContextConfiguration(configurationProvider); assertThat(mailetContextConfiguration.getString("key")) @@ -100,7 +100,7 @@ class CamelMailetContainerModuleTest { .getBytes(StandardCharsets.UTF_8))); MailetModuleInitializationOperation testee = new MailetModuleInitializationOperation(configurationProvider, - mock(CamelCompositeProcessor.class), + mock(CompositeProcessorImpl.class), NO_TRANSPORT_CHECKS, () -> defaultConfiguration, mock(JamesMailSpooler.class), @@ -117,9 +117,9 @@ class CamelMailetContainerModuleTest { .thenThrow(new ConfigurationRuntimeException()); MailetModuleInitializationOperation testee = new MailetModuleInitializationOperation(configurationProvider, - mock(CamelCompositeProcessor.class), + mock(CompositeProcessorImpl.class), NO_TRANSPORT_CHECKS, - mock(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class), + mock(MailetContainerModule.DefaultProcessorsConfigurationSupplier.class), mock(JamesMailSpooler.class), mock(JamesMailSpooler.Configuration.class)); @@ -140,9 +140,9 @@ class CamelMailetContainerModuleTest { when(configurationProvider.getConfiguration("mailetcontainer")).thenReturn(configuration); MailetModuleInitializationOperation testee = new MailetModuleInitializationOperation(configurationProvider, - mock(CamelCompositeProcessor.class), + mock(CompositeProcessorImpl.class), NO_TRANSPORT_CHECKS, - mock(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class), + mock(MailetContainerModule.DefaultProcessorsConfigurationSupplier.class), mock(JamesMailSpooler.class), mock(JamesMailSpooler.Configuration.class)); diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java index 2eba22d..e81fad6 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java @@ -51,8 +51,8 @@ import org.apache.james.jwt.JwtTokenVerifier; import org.apache.james.lifecycle.api.StartUpCheck; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManager.SearchCapabilities; -import org.apache.james.modules.server.CamelMailetContainerModule; -import org.apache.james.modules.server.CamelMailetContainerModule.ProcessorsCheck; +import org.apache.james.modules.server.MailetContainerModule; +import org.apache.james.modules.server.MailetContainerModule.ProcessorsCheck; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import org.apache.james.server.core.configuration.FileConfigurationProvider; import org.apache.james.transport.matchers.All; @@ -79,7 +79,7 @@ import com.google.inject.multibindings.ProvidesIntoSet; public class JMAPModule extends AbstractModule { private static final int DEFAULT_JMAP_PORT = 80; private static final Logger LOGGER = LoggerFactory.getLogger(JMAPModule.class); - public static final CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier DEFAULT_JMAP_PROCESSORS_CONFIGURATION_SUPPLIER = + public static final MailetContainerModule.DefaultProcessorsConfigurationSupplier DEFAULT_JMAP_PROCESSORS_CONFIGURATION_SUPPLIER = () -> { try { return FileConfigurationProvider.getConfig(ClassLoader.getSystemResourceAsStream("defaultJmapMailetContainer.xml")); @@ -114,7 +114,7 @@ public class JMAPModule extends AbstractModule { install(new DraftMethodsModule()); install(new RFC8621MethodsModule()); install(binder -> binder - .bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) + .bind(MailetContainerModule.DefaultProcessorsConfigurationSupplier.class) .toInstance(DEFAULT_JMAP_PROCESSORS_CONFIGURATION_SUPPLIER)); bind(JMAPServer.class).in(Scopes.SINGLETON); diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java index 7706911..62003e4 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java @@ -22,13 +22,11 @@ package org.apache.james.jmap.draft; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.List; - import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.jmap.mailet.VacationMailet; import org.apache.james.jmap.mailet.filter.JMAPFiltering; import org.apache.james.mailetcontainer.impl.MatcherMailetPair; -import org.apache.james.modules.server.CamelMailetContainerModule; +import org.apache.james.modules.server.MailetContainerModule; import org.apache.james.transport.mailets.Null; import org.apache.james.transport.mailets.RemoveMimeHeader; import org.apache.james.transport.matchers.All; @@ -39,7 +37,6 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Lists; class MailetPreconditionTest { @@ -140,13 +137,13 @@ class MailetPreconditionTest { class BccCheck { @Test void bccMailetCheckShouldThrowOnEmptyList() { - assertThatThrownBy(() -> CamelMailetContainerModule.BCC_Check.check(ImmutableMultimap.of())) + assertThatThrownBy(() -> MailetContainerModule.BCC_Check.check(ImmutableMultimap.of())) .isInstanceOf(ConfigurationException.class); } @Test void bccMailetCheckShouldThrowOnNullList() { - assertThatThrownBy(() -> CamelMailetContainerModule.BCC_Check.check(null)) + assertThatThrownBy(() -> MailetContainerModule.BCC_Check.check(null)) .isInstanceOf(NullPointerException.class); } @@ -154,7 +151,7 @@ class MailetPreconditionTest { void bccMailetCheckShouldThrowOnWrongMatcher() { ImmutableMultimap<String, MatcherMailetPair> pairs = ImmutableMultimap.of("tansport", new MatcherMailetPair(new RecipientIsLocal(), new RemoveMimeHeader())); - assertThatThrownBy(() -> CamelMailetContainerModule.BCC_Check.check(pairs)) + assertThatThrownBy(() -> MailetContainerModule.BCC_Check.check(pairs)) .isInstanceOf(ConfigurationException.class); } @@ -162,7 +159,7 @@ class MailetPreconditionTest { void bccMailetCheckShouldThrowOnWrongMailet() { ImmutableMultimap<String, MatcherMailetPair> pairs = ImmutableMultimap.of("tansport", new MatcherMailetPair(new All(), new Null())); - assertThatThrownBy(() -> CamelMailetContainerModule.BCC_Check.check(pairs)) + assertThatThrownBy(() -> MailetContainerModule.BCC_Check.check(pairs)) .isInstanceOf(ConfigurationException.class); } @@ -177,7 +174,7 @@ class MailetPreconditionTest { ImmutableMultimap<String, MatcherMailetPair> pairs = ImmutableMultimap.of("tansport", new MatcherMailetPair(new All(), removeMimeHeader)); - assertThatThrownBy(() -> CamelMailetContainerModule.BCC_Check.check(pairs)) + assertThatThrownBy(() -> MailetContainerModule.BCC_Check.check(pairs)) .isInstanceOf(ConfigurationException.class); } @@ -191,7 +188,7 @@ class MailetPreconditionTest { .build()); ImmutableMultimap<String, MatcherMailetPair> pairs = ImmutableMultimap.of("transport", new MatcherMailetPair(new All(), removeMimeHeader)); - assertThatCode(() -> CamelMailetContainerModule.BCC_Check.check(pairs)) + assertThatCode(() -> MailetContainerModule.BCC_Check.check(pairs)) .doesNotThrowAnyException(); } } diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java similarity index 91% rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessor.java rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java index 81732cd..6a79653 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java @@ -39,7 +39,7 @@ import org.apache.mailet.MailetContext; * It also offer the {@link AbstractStateCompositeProcessor} implementation * which allow to inject {@link Mail} into the routes. */ -public class CamelCompositeProcessor extends AbstractStateCompositeProcessor { +public class CompositeProcessorImpl extends AbstractStateCompositeProcessor { private final MetricFactory metricFactory; private final MailetContext mailetContext; @@ -47,7 +47,7 @@ public class CamelCompositeProcessor extends AbstractStateCompositeProcessor { private final MailetLoader mailetLoader; @Inject - CamelCompositeProcessor(MetricFactory metricFactory, MailetContext mailetContext, MatcherLoader matcherLoader, MailetLoader mailetLoader) { + CompositeProcessorImpl(MetricFactory metricFactory, MailetContext mailetContext, MatcherLoader matcherLoader, MailetLoader mailetLoader) { this.metricFactory = metricFactory; this.mailetContext = mailetContext; this.matcherLoader = matcherLoader; @@ -62,7 +62,7 @@ public class CamelCompositeProcessor extends AbstractStateCompositeProcessor { @Override protected MailProcessor createMailProcessor(String name, HierarchicalConfiguration<ImmutableNode> config) throws Exception { - CamelMailetProcessor processor = new CamelMailetProcessor(metricFactory); + MailetProcessorImpl processor = new MailetProcessorImpl(metricFactory); try { processor.setMailetContext(mailetContext); processor.setMailetLoader(mailetLoader); diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java similarity index 95% rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessor.java rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java index ef406cf..36c9518 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java @@ -48,7 +48,7 @@ import com.google.common.collect.ImmutableSet; * {@link org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor} implementation which use Camel DSL for * the {@link Matcher} / {@link Mailet} routing */ -public class CamelMailetProcessor extends AbstractStateMailetProcessor { +public class MailetProcessorImpl extends AbstractStateMailetProcessor { private static class ProcessingStep { private static class Builder { @FunctionalInterface @@ -112,13 +112,13 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor { } } - private static final Logger LOGGER = LoggerFactory.getLogger(CamelMailetProcessor.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MailetProcessorImpl.class); private final MetricFactory metricFactory; private List<MatcherMailetPair> pairs; - private Map<MatcherSplitter, CamelProcessor> pairsToBeProcessed; + private Map<MatcherSplitter, ProcessorImpl> pairsToBeProcessed; - public CamelMailetProcessor(MetricFactory metricFactory) { + public MailetProcessorImpl(MetricFactory metricFactory) { this.metricFactory = metricFactory; } @@ -150,9 +150,9 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor { lastStep.disposeGhostedEncounteredMails(); } - private ProcessingStep executeProcessingStep(ProcessingStep step, Map.Entry<MatcherSplitter, CamelProcessor> pair) { + private ProcessingStep executeProcessingStep(ProcessingStep step, Map.Entry<MatcherSplitter, ProcessorImpl> pair) { MatcherSplitter matcherSplitter = pair.getKey(); - CamelProcessor processor = pair.getValue(); + ProcessorImpl processor = pair.getValue(); ImmutableList<Mail> afterMatching = step.getInFlightMails() .stream() .flatMap(Throwing.<Mail, Stream<Mail>>function(mail -> matcherSplitter.split(mail).stream()).sneakyThrow()) @@ -198,7 +198,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor { this.pairs = pairs; this.pairsToBeProcessed = pairs.stream() .map(pair -> Pair.of(new MatcherSplitter(metricFactory, this, pair), - new CamelProcessor(metricFactory, this, pair.getMailet()))) + new ProcessorImpl(metricFactory, this, pair.getMailet()))) .collect(Guavate.toImmutableMap(Pair::getKey, Pair::getValue)); } catch (Exception e) { throw new MessagingException("Unable to setup routing for MailetMatcherPairs", e); diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java index ddc1af7..f3f2e44 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java @@ -55,11 +55,11 @@ public class MatcherSplitter { public static final AttributeName MATCHER_MATCHED_ATTRIBUTE = AttributeName.of("matched"); private final MetricFactory metricFactory; - private final CamelMailetProcessor container; + private final MailetProcessorImpl container; private final Matcher matcher; private final String onMatchException; - public MatcherSplitter(MetricFactory metricFactory, CamelMailetProcessor container, MatcherMailetPair pair) { + public MatcherSplitter(MetricFactory metricFactory, MailetProcessorImpl container, MatcherMailetPair pair) { this.metricFactory = metricFactory; this.container = container; this.matcher = pair.getMatcher(); diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java similarity index 96% rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelProcessor.java rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java index 786ae62..86272c7 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CamelProcessor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java @@ -38,14 +38,14 @@ import com.google.common.collect.ImmutableList; /** * Mailet wrapper which execute a Mailet in a Processor */ -public class CamelProcessor { - private static final Logger LOGGER = LoggerFactory.getLogger(CamelProcessor.class); +public class ProcessorImpl { + private static final Logger LOGGER = LoggerFactory.getLogger(ProcessorImpl.class); private final MetricFactory metricFactory; private final Mailet mailet; - private final CamelMailetProcessor processor; + private final MailetProcessorImpl processor; - public CamelProcessor(MetricFactory metricFactory, CamelMailetProcessor processor, Mailet mailet) { + public ProcessorImpl(MetricFactory metricFactory, MailetProcessorImpl processor, Mailet mailet) { this.metricFactory = metricFactory; this.processor = processor; this.mailet = mailet; 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 d8a3f18..893a83a 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,11 +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; +import org.apache.james.mailetcontainer.impl.ProcessorImpl; /** * Wrapper which helps to expose JMX statistics for {@link MailProcessor} and - * {@link CamelProcessor} implementations + * {@link ProcessorImpl} 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 27e652a..c36b5d4 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,16 +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.CompositeProcessorImpl; +import org.apache.james.mailetcontainer.impl.ProcessorImpl; 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 CamelCompositeProcessor} which service the - * {@link Mail} with a {@link CamelProcessor} instances + * Abstract base class for {@link CompositeProcessorImpl} which service the + * {@link Mail} with a {@link ProcessorImpl} 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 6f0ce1e..88a15f5 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,10 +38,10 @@ 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; +import org.apache.james.mailetcontainer.impl.ProcessorImpl; import org.apache.james.mailetcontainer.impl.jmx.JMXStateMailetProcessorListener; import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher; import org.apache.mailet.Mail; @@ -345,7 +345,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con /** * Setup the routing for the configured {@link MatcherMailetPair}'s for this - * {@link CamelProcessor} + * {@link ProcessorImpl} */ 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 e257c5c..13d90ff 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.CamelCompositeProcessor" autowire="byType"/> + class="org.apache.james.mailetcontainer.impl.CompositeProcessorImpl" autowire="byType"/> <!-- mailcontext bean must be defined after mailProcessor diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java similarity index 92% rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessorTest.java rename to server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java index 7e61992..8277a74 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelCompositeProcessorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java @@ -27,11 +27,11 @@ import org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessorTest; import org.apache.james.metrics.tests.RecordingMetricFactory; import org.apache.mailet.base.test.FakeMailContext; -public class CamelCompositeProcessorTest extends AbstractStateCompositeProcessorTest { +public class CompositeProcessorImplTest extends AbstractStateCompositeProcessorTest { @Override protected AbstractStateCompositeProcessor createProcessor(HierarchicalConfiguration<ImmutableNode> config) throws Exception { - CamelCompositeProcessor processor = new CamelCompositeProcessor(new RecordingMetricFactory(), + CompositeProcessorImpl processor = new CompositeProcessorImpl(new RecordingMetricFactory(), FakeMailContext.defaultContext(), new MockMatcherLoader(), new MockMailetLoader()); diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java similarity index 92% rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessorTest.java rename to server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java index adc017a..18a9716 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CamelMailetProcessorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java @@ -31,13 +31,13 @@ import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessorTest; import org.apache.james.metrics.tests.RecordingMetricFactory; import org.apache.mailet.base.test.FakeMailContext; -public class CamelMailetProcessorTest extends AbstractStateMailetProcessorTest { +public class MailetProcessorImplTest extends AbstractStateMailetProcessorTest { @Override protected AbstractStateMailetProcessor createProcessor(HierarchicalConfiguration<ImmutableNode> configuration) throws Exception { - CamelMailetProcessor processor = null; + MailetProcessorImpl processor = null; try { - processor = new CamelMailetProcessor(new RecordingMetricFactory()); + processor = new MailetProcessorImpl(new RecordingMetricFactory()); processor.setMailetContext(FakeMailContext.defaultContext()); processor.setMailetLoader(new MockMailetLoader()); processor.setMatcherLoader(new MockMatcherLoader()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
