This is an automated email from the ASF dual-hosted git repository.
aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 123e6da5f139650f524e8f755cb0c390d7748723
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Fri Mar 8 11:47:08 2019 +0100
JAMES-2671 Move SmtpServerConnectedType to SmtpGuiceProbe
---
.../mpt/smtp/CassandraRabbitMQSwiftSmtpTestRule.java | 17 +----------------
.../apache/james/mpt/smtp/RabbitMQForwardSmtpTest.java | 2 +-
.../james/mpt/smtp/RabbitMQSmtpStarttlsCommandTest.java | 2 +-
.../apache/james/mpt/smtp/CassandraSmtpTestRule.java | 17 +----------------
.../apache/james/modules/protocols/SmtpGuiceProbe.java | 17 +++++++++++++++++
5 files changed, 21 insertions(+), 34 deletions(-)
diff --git
a/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQSwiftSmtpTestRule.java
b/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQSwiftSmtpTestRule.java
index 2f6c3a2..850ad68 100644
---
a/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQSwiftSmtpTestRule.java
+++
b/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQSwiftSmtpTestRule.java
@@ -19,7 +19,6 @@
package org.apache.james.mpt.smtp;
import java.util.Iterator;
-import java.util.function.Function;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.CassandraJamesServerMain;
@@ -35,6 +34,7 @@ import
org.apache.james.modules.blobstore.BlobStoreChoosingModule;
import org.apache.james.modules.protocols.ProtocolHandlerModule;
import org.apache.james.modules.protocols.SMTPServerModule;
import org.apache.james.modules.protocols.SmtpGuiceProbe;
+import
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType;
import org.apache.james.modules.rabbitmq.RabbitMQModule;
import org.apache.james.modules.server.CamelMailetContainerModule;
import org.apache.james.mpt.api.Continuation;
@@ -59,21 +59,6 @@ import com.google.inject.util.Modules;
public class CassandraRabbitMQSwiftSmtpTestRule implements TestRule,
SmtpHostSystem {
- enum SmtpServerConnectedType {
- SMTP_GLOBAL_SERVER(probe -> Port.of(probe.getSmtpPort())),
- SMTP_START_TLS_SERVER(probe -> Port.of(probe.getSmtpsPort()));
-
- private final Function<SmtpGuiceProbe, Port> portExtractor;
-
- SmtpServerConnectedType(Function<SmtpGuiceProbe, Port> portExtractor) {
- this.portExtractor = portExtractor;
- }
-
- public Function<SmtpGuiceProbe, Port> getPortExtractor() {
- return portExtractor;
- }
- }
-
private static final Module SMTP_PROTOCOL_MODULE = Modules.combine(
new ProtocolHandlerModule(),
new SMTPServerModule());
diff --git
a/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQForwardSmtpTest.java
b/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQForwardSmtpTest.java
index 6461a7c..17eb90e 100644
---
a/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQForwardSmtpTest.java
+++
b/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQForwardSmtpTest.java
@@ -19,7 +19,7 @@
package org.apache.james.mpt.smtp;
-import static
org.apache.james.mpt.smtp.CassandraRabbitMQSwiftSmtpTestRule.SmtpServerConnectedType.SMTP_GLOBAL_SERVER;
+import static
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_GLOBAL_SERVER;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.junit.After;
diff --git
a/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQSmtpStarttlsCommandTest.java
b/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQSmtpStarttlsCommandTest.java
index 52433da..34329e1 100644
---
a/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQSmtpStarttlsCommandTest.java
+++
b/mpt/impl/smtp/cassandra-rabbitmq-swift/src/test/java/org/apache/james/mpt/smtp/RabbitMQSmtpStarttlsCommandTest.java
@@ -19,7 +19,7 @@
package org.apache.james.mpt.smtp;
-import static
org.apache.james.mpt.smtp.CassandraRabbitMQSwiftSmtpTestRule.SmtpServerConnectedType.SMTP_START_TLS_SERVER;
+import static
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_START_TLS_SERVER;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.junit.After;
diff --git
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRule.java
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRule.java
index 6ec1107..25119e7 100644
---
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRule.java
+++
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRule.java
@@ -19,7 +19,6 @@
package org.apache.james.mpt.smtp;
import java.util.Iterator;
-import java.util.function.Function;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.CassandraJamesServerMain;
@@ -30,6 +29,7 @@ import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.modules.protocols.ProtocolHandlerModule;
import org.apache.james.modules.protocols.SMTPServerModule;
import org.apache.james.modules.protocols.SmtpGuiceProbe;
+import
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType;
import org.apache.james.modules.server.CamelMailetContainerModule;
import org.apache.james.mpt.api.Continuation;
import org.apache.james.mpt.api.Session;
@@ -53,21 +53,6 @@ import com.google.inject.util.Modules;
public class CassandraSmtpTestRule implements TestRule, SmtpHostSystem {
- enum SmtpServerConnectedType {
- SMTP_GLOBAL_SERVER(probe -> Port.of(probe.getSmtpPort())),
- SMTP_START_TLS_SERVER(probe -> Port.of(probe.getSmtpsPort()));
-
- private final Function<SmtpGuiceProbe, Port> portExtractor;
-
- private SmtpServerConnectedType(Function<SmtpGuiceProbe, Port>
portExtractor) {
- this.portExtractor = portExtractor;
- }
-
- public Function<SmtpGuiceProbe, Port> getPortExtractor() {
- return portExtractor;
- }
- }
-
private static final Module SMTP_PROTOCOL_MODULE = Modules.combine(
new ProtocolHandlerModule(),
new SMTPServerModule());
diff --git
a/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SmtpGuiceProbe.java
b/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SmtpGuiceProbe.java
index 1468820..670a24c 100644
---
a/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SmtpGuiceProbe.java
+++
b/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SmtpGuiceProbe.java
@@ -19,6 +19,7 @@
package org.apache.james.modules.protocols;
import java.net.InetSocketAddress;
+import java.util.function.Function;
import java.util.function.Predicate;
import javax.inject.Inject;
@@ -26,10 +27,26 @@ import javax.inject.Inject;
import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
import org.apache.james.smtpserver.netty.SMTPServer;
import org.apache.james.smtpserver.netty.SMTPServerFactory;
+import org.apache.james.util.Port;
import org.apache.james.utils.GuiceProbe;
public class SmtpGuiceProbe implements GuiceProbe {
+ public enum SmtpServerConnectedType {
+ SMTP_GLOBAL_SERVER(probe -> Port.of(probe.getSmtpPort())),
+ SMTP_START_TLS_SERVER(probe -> Port.of(probe.getSmtpsPort()));
+
+ private final Function<SmtpGuiceProbe, Port> portExtractor;
+
+ SmtpServerConnectedType(Function<SmtpGuiceProbe, Port> portExtractor) {
+ this.portExtractor = portExtractor;
+ }
+
+ public Function<SmtpGuiceProbe, Port> getPortExtractor() {
+ return portExtractor;
+ }
+ }
+
private final SMTPServerFactory smtpServerFactory;
@Inject
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
