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 2020/11/06 02:28:44 UTC
[james-project] 06/12: JAMES-3389 rename (receive -> transfer)
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 48fc4a42ec1c2765efc88802fbe3ec453b515f66
Author: Andreas Valdma <an...@nortal.com>
AuthorDate: Wed Nov 4 12:51:36 2020 +0200
JAMES-3389 rename (receive -> transfer)
---
.../james/modules/server/WebAdminMailOverWebModule.java | 4 ++--
...ReceiveMailOverWebRoutes.java => TransferEmailRoutes.java} | 8 +++-----
...ailOverWebRoutesTest.java => TransferEmailRoutesTest.java} | 11 ++++-------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/server/container/guice/protocols/webadmin-mail-over-web/src/main/java/org/apache/james/modules/server/WebAdminMailOverWebModule.java b/server/container/guice/protocols/webadmin-mail-over-web/src/main/java/org/apache/james/modules/server/WebAdminMailOverWebModule.java
index 7c376ec..352a16f 100644
--- a/server/container/guice/protocols/webadmin-mail-over-web/src/main/java/org/apache/james/modules/server/WebAdminMailOverWebModule.java
+++ b/server/container/guice/protocols/webadmin-mail-over-web/src/main/java/org/apache/james/modules/server/WebAdminMailOverWebModule.java
@@ -1,7 +1,7 @@
package org.apache.james.modules.server;
import org.apache.james.webadmin.Routes;
-import org.apache.james.webadmin.routes.ReceiveMailOverWebRoutes;
+import org.apache.james.webadmin.routes.TransferEmailRoutes;
import com.google.inject.AbstractModule;
import com.google.inject.multibindings.Multibinder;
@@ -11,6 +11,6 @@ public class WebAdminMailOverWebModule extends AbstractModule {
@Override
protected void configure() {
Multibinder<Routes> routesMultibinder = Multibinder.newSetBinder(binder(), Routes.class);
- routesMultibinder.addBinding().to(ReceiveMailOverWebRoutes.class);
+ routesMultibinder.addBinding().to(TransferEmailRoutes.class);
}
}
diff --git a/server/protocols/webadmin/webadmin-mail-over-web/src/main/java/org/apache/james/webadmin/routes/ReceiveMailOverWebRoutes.java b/server/protocols/webadmin/webadmin-mail-over-web/src/main/java/org/apache/james/webadmin/routes/TransferEmailRoutes.java
similarity index 90%
rename from server/protocols/webadmin/webadmin-mail-over-web/src/main/java/org/apache/james/webadmin/routes/ReceiveMailOverWebRoutes.java
rename to server/protocols/webadmin/webadmin-mail-over-web/src/main/java/org/apache/james/webadmin/routes/TransferEmailRoutes.java
index b8e5a9c..b81cc04 100644
--- a/server/protocols/webadmin/webadmin-mail-over-web/src/main/java/org/apache/james/webadmin/routes/ReceiveMailOverWebRoutes.java
+++ b/server/protocols/webadmin/webadmin-mail-over-web/src/main/java/org/apache/james/webadmin/routes/TransferEmailRoutes.java
@@ -14,8 +14,6 @@ import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.server.core.MailImpl;
import org.apache.james.webadmin.Routes;
-import org.apache.james.webadmin.utils.ErrorResponder;
-import org.apache.james.webadmin.utils.JsonExtractor;
import org.eclipse.jetty.http.HttpStatus;
import io.swagger.annotations.Api;
@@ -27,9 +25,9 @@ import io.swagger.annotations.ApiResponses;
import spark.Service;
@Api(tags = "OverWebMailReceiver")
-@Path(ReceiveMailOverWebRoutes.BASE_URL)
+@Path(TransferEmailRoutes.BASE_URL)
@Produces("application/json")
-public class ReceiveMailOverWebRoutes implements Routes {
+public class TransferEmailRoutes implements Routes {
public static final String BASE_URL = "/mail-transfer-service";
@@ -41,7 +39,7 @@ public class ReceiveMailOverWebRoutes implements Routes {
}
@Inject
- public ReceiveMailOverWebRoutes(MailQueueFactory<?> queueFactory) {
+ public TransferEmailRoutes(MailQueueFactory<?> queueFactory) {
queue = queueFactory.createQueue(MailQueueFactory.SPOOL);
}
diff --git a/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/ReceiveMailOverWebRoutesTest.java b/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/TransferEmailRoutesTest.java
similarity index 86%
rename from server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/ReceiveMailOverWebRoutesTest.java
rename to server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/TransferEmailRoutesTest.java
index 10e9c7e..0c634a8 100644
--- a/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/ReceiveMailOverWebRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/TransferEmailRoutesTest.java
@@ -1,20 +1,17 @@
package org.apache.james.routes;
import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.when;
import static io.restassured.config.EncoderConfig.encoderConfig;
import static io.restassured.config.RestAssuredConfig.newConfig;
import java.nio.charset.StandardCharsets;
-import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory;
import org.apache.james.queue.memory.MemoryMailQueueFactory;
import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
-import org.apache.james.webadmin.routes.ReceiveMailOverWebRoutes;
-import org.hamcrest.Matchers;
+import org.apache.james.webadmin.routes.TransferEmailRoutes;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -24,13 +21,13 @@ import io.restassured.builder.RequestSpecBuilder;
import io.restassured.http.ContentType;
import io.restassured.specification.RequestSpecification;
-public class ReceiveMailOverWebRoutesTest {
+public class TransferEmailRoutesTest {
private WebAdminServer webAdminServer;
private WebAdminServer createServer() {
MemoryMailQueueFactory memoryMailQueueFactory = new MemoryMailQueueFactory(new RawMailQueueItemDecoratorFactory());
- return WebAdminUtils.createWebAdminServer(new ReceiveMailOverWebRoutes(memoryMailQueueFactory)).start();
+ return WebAdminUtils.createWebAdminServer(new TransferEmailRoutes(memoryMailQueueFactory)).start();
}
@BeforeEach
@@ -49,7 +46,7 @@ public class ReceiveMailOverWebRoutesTest {
return new RequestSpecBuilder()
.setContentType(ContentType.JSON)
.setAccept(ContentType.JSON)
- .setBasePath(ReceiveMailOverWebRoutes.BASE_URL)
+ .setBasePath(TransferEmailRoutes.BASE_URL)
.setPort(server.getPort().getValue())
.setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org