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
commit 3d39f3cfdfba889d80576b45f5a825b54deb2a35 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Jun 21 14:22:08 2019 +0700 JAMES-2294 s/STATE_TRANSPORT/TRANSPORT_PROCESSOR --- .../james/mailets/NetworkMatcherIntegrationTest.java | 16 ++++++++-------- .../apache/james/mailets/SmtpAuthIntegrationTest.java | 2 +- .../james/mailets/configuration/MailetConfiguration.java | 2 +- .../mailets/configuration/ProcessorConfiguration.java | 4 ++-- .../mailets/MailReprocessingIntegrationTest.java | 6 +++--- .../apache/james/transport/mailets/ToRepositoryTest.java | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java index f355a69..776d0ee 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java @@ -93,7 +93,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrInNetwork.class) .matcherCondition("127.0.0.0/8") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) @@ -113,7 +113,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrNotInNetwork.class) .matcherCondition("172.0.0.0/8") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) @@ -133,7 +133,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrInNetwork.class) .matcherCondition("127.0.0.0/2") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) @@ -153,7 +153,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrInNetwork.class) .matcherCondition("127.0.4.108/8") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) @@ -173,7 +173,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrInNetwork.class) .matcherCondition("127.255.255.255/8") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) @@ -193,7 +193,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrInNetwork.class) .matcherCondition("126.0.0.0/4") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) @@ -213,7 +213,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrInNetwork.class) .matcherCondition("172.0.0.0/8") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) @@ -237,7 +237,7 @@ public class NetworkMatcherIntegrationTest { .matcher(RemoteAddrNotInNetwork.class) .matcherCondition("127.0.0.0/8") .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(toRepository())); messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java index c048d65..72a3c9b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java @@ -68,7 +68,7 @@ public class SmtpAuthIntegrationTest { .addMailet(MailetConfiguration.builder() .matcher(SMTPAuthSuccessful.class) .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR)) .addMailet(MailetConfiguration.TO_BOUNCE); MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java index cdba77d..8896bdf 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java @@ -95,7 +95,7 @@ public class MailetConfiguration implements SerializableAsXml { public static final MailetConfiguration TO_TRANSPORT = MailetConfiguration.builder() .matcher(All.class) .mailet(ToProcessor.class) - .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT) + .addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR) .build(); public static final MailetConfiguration TO_BOUNCE = MailetConfiguration.builder() diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java index 08a0a17..c36fb00 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java @@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableList; public class ProcessorConfiguration implements SerializableAsXml { - public static final String STATE_TRANSPORT = "transport"; + public static final String TRANSPORT_PROCESSOR = "transport"; public static final String STATE_ROOT = "root"; public static final String STATE_BOUNCES = "bounces"; public static final String STATE_ERROR = "error"; @@ -39,7 +39,7 @@ public class ProcessorConfiguration implements SerializableAsXml { } public static Builder transport() { - return builder().state(STATE_TRANSPORT); + return builder().state(TRANSPORT_PROCESSOR); } public static Builder root() { diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java index d77a618..429f777 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java @@ -28,7 +28,7 @@ import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.RECIPIENT2; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; -import static org.apache.james.mailets.configuration.ProcessorConfiguration.STATE_TRANSPORT; +import static org.apache.james.mailets.configuration.ProcessorConfiguration.TRANSPORT_PROCESSOR; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.MemoryJamesServerMain; @@ -124,7 +124,7 @@ public class MailReprocessingIntegrationTest { .spec(specification) .param("action", "reprocess") .param("queue", MailQueueFactory.SPOOL) - .param("processor", STATE_TRANSPORT) + .param("processor", TRANSPORT_PROCESSOR) .patch("/mailRepositories/" + REPOSITORY_B.getPath().urlEncoded() + "/mails"); // Then I can move it to repository A @@ -152,7 +152,7 @@ public class MailReprocessingIntegrationTest { .spec(specification) .param("action", "reprocess") .param("queue", MailQueueFactory.SPOOL) - .param("processor", STATE_TRANSPORT) + .param("processor", TRANSPORT_PROCESSOR) .patch("/mailRepositories/" + REPOSITORY_B.getPath().urlEncoded() + "/mails"); // I can move it to repository A diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java index 6cfd351..238711d 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java @@ -114,7 +114,7 @@ public class ToRepositoryTest { String taskId = with() .spec(webAdminAPI) - .queryParam("processor", ProcessorConfiguration.STATE_TRANSPORT) + .queryParam("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR) .queryParam("action", "reprocess") .patch(MailRepositoriesRoutes.MAIL_REPOSITORIES + "/" + CUSTOM_REPOSITORY.getPath().urlEncoded() @@ -145,7 +145,7 @@ public class ToRepositoryTest { with() .spec(webAdminAPI) - .queryParam("processor", ProcessorConfiguration.STATE_TRANSPORT) + .queryParam("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR) .queryParam("action", "reprocess") .patch(MailRepositoriesRoutes.MAIL_REPOSITORIES + "/" + CUSTOM_REPOSITORY.getPath().urlEncoded() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
