JAMES-2292 Bind MailQueueRoutes
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a5abe355 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a5abe355 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a5abe355 Branch: refs/heads/master Commit: a5abe3554d7c53f1ea83a195e1d8236171b811cc Parents: d45cf81 Author: Antoine Duprat <[email protected]> Authored: Thu Jan 25 11:54:16 2018 +0100 Committer: benwa <[email protected]> Committed: Fri Jan 26 08:12:21 2018 +0700 ---------------------------------------------------------------------- pom.xml | 5 ++ server/container/guice/cassandra-guice/pom.xml | 4 ++ .../apache/james/CassandraJamesServerMain.java | 2 + server/container/guice/jpa-guice/pom.xml | 4 ++ .../org/apache/james/JPAJamesServerMain.java | 2 + server/container/guice/memory-guice/pom.xml | 4 ++ .../org/apache/james/MemoryJamesServerMain.java | 2 + server/container/guice/pom.xml | 8 ++- .../guice/protocols/webadmin-mailqueue/pom.xml | 71 ++++++++++++++++++++ .../modules/server/MailQueueRoutesModule.java | 34 ++++++++++ .../WebAdminServerIntegrationTest.java | 9 +++ .../james/webadmin/routes/MailQueueRoutes.java | 7 +- 12 files changed, 148 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3294ff4..3411bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -1425,6 +1425,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-webadmin-mailqueue</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-webadmin-mailrepository</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/cassandra-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 7babc31..a0e6b14 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -170,6 +170,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-guice-webadmin-mailqueue</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-webadmin-mailrepository</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java index 063ff7c..d117d9b 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java @@ -43,6 +43,7 @@ import org.apache.james.modules.server.CassandraRoutesModule; import org.apache.james.modules.server.DataRoutesModules; import org.apache.james.modules.server.ElasticSearchMetricReporterModule; import org.apache.james.modules.server.JMXServerModule; +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.SwaggerRoutesModule; @@ -57,6 +58,7 @@ public class CassandraJamesServerMain { new CassandraRoutesModule(), new DataRoutesModules(), new MailboxRoutesModule(), + new MailQueueRoutesModule(), new MailRepositoriesRoutesModule(), new SwaggerRoutesModule(), new WebAdminServerModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/jpa-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index 1cd7261..26f8f20 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -113,6 +113,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-guice-webadmin-mailqueue</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-webadmin-mailrepository</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java index d3e3e15..fbf4d13 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -36,6 +36,7 @@ import org.apache.james.modules.server.DataRoutesModules; import org.apache.james.modules.server.DefaultProcessorsConfigurationProviderModule; import org.apache.james.modules.server.ElasticSearchMetricReporterModule; import org.apache.james.modules.server.JMXServerModule; +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.NoJwtModule; @@ -52,6 +53,7 @@ public class JPAJamesServerMain { new WebAdminServerModule(), new DataRoutesModules(), new MailboxRoutesModule(), + new MailQueueRoutesModule(), new MailRepositoriesRoutesModule(), new SwaggerRoutesModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/memory-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index c9658e2..b3f4c83 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -112,6 +112,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-guice-webadmin-mailqueue</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-webadmin-mailrepository</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java index 0e6108e..3170cf4 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -34,6 +34,7 @@ import org.apache.james.modules.protocols.SMTPServerModule; import org.apache.james.modules.server.CamelMailetContainerModule; import org.apache.james.modules.server.DataRoutesModules; import org.apache.james.modules.server.JMXServerModule; +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.MemoryMailQueueModule; @@ -50,6 +51,7 @@ public class MemoryJamesServerMain { new WebAdminServerModule(), new DataRoutesModules(), new MailboxRoutesModule(), + new MailQueueRoutesModule(), new MailRepositoriesRoutesModule(), new SwaggerRoutesModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index ad8784d..61efd7b 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -57,6 +57,7 @@ <module>protocols/webadmin-cassandra</module> <module>protocols/webadmin-data</module> <module>protocols/webadmin-mailbox</module> + <module>protocols/webadmin-mailqueue</module> <module>protocols/webadmin-mailrepository</module> <module>protocols/webadmin-swagger</module> </modules> @@ -146,6 +147,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-guice-webadmin-mailqueue</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-webadmin-mailrepository</artifactId> <version>${project.version}</version> </dependency> @@ -173,4 +179,4 @@ </dependencies> </dependencyManagement> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/protocols/webadmin-mailqueue/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml new file mode 100644 index 0000000..287f197 --- /dev/null +++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>james-server-guice</artifactId> + <groupId>org.apache.james</groupId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <artifactId>james-server-guice-webadmin-mailqueue</artifactId> + + <name>Apache James :: Server :: Guice :: Webadmin :: MailQueue</name> + <description>Webadmin mailqueue modules for Guice implementation of James server</description> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-guice-configuration</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-webadmin-core</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-webadmin-mailqueue</artifactId> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueRoutesModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueRoutesModule.java b/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueRoutesModule.java new file mode 100644 index 0000000..127c53a --- /dev/null +++ b/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueRoutesModule.java @@ -0,0 +1,34 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.modules.server; + +import org.apache.james.webadmin.Routes; +import org.apache.james.webadmin.routes.MailQueueRoutes; + +import com.google.inject.AbstractModule; +import com.google.inject.multibindings.Multibinder; + +public class MailQueueRoutesModule extends AbstractModule { + @Override + protected void configure() { + Multibinder<Routes> routesMultibinder = Multibinder.newSetBinder(binder(), Routes.class); + routesMultibinder.addBinding().to(MailQueueRoutes.class); + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java index eb8236e..f2d0d7f 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java @@ -41,6 +41,7 @@ import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.WebAdminGuiceProbe; import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.routes.DomainsRoutes; +import org.apache.james.webadmin.routes.MailQueueRoutes; import org.apache.james.webadmin.routes.MailRepositoriesRoutes; import org.apache.james.webadmin.routes.UserMailboxesRoutes; import org.apache.james.webadmin.routes.UserRoutes; @@ -105,6 +106,14 @@ public class WebAdminServerIntegrationTest { } @Test + public void mailQueueRoutesShouldBeExposed() throws Exception { + when() + .get(MailQueueRoutes.BASE_URL) + .then() + .statusCode(HttpStatus.OK_200); + } + + @Test public void mailRepositoriesRoutesShouldBeExposed() throws Exception { when() .get(MailRepositoriesRoutes.MAIL_REPOSITORIES) http://git-wip-us.apache.org/repos/asf/james-project/blob/a5abe355/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java index 6e67340..58a5576 100644 --- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java +++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java @@ -62,7 +62,7 @@ import spark.Service; @Produces("application/json") public class MailQueueRoutes implements Routes { - @VisibleForTesting static final String BASE_URL = "/mailQueues"; + public static final String BASE_URL = "/mailQueues"; @VisibleForTesting static final String MAIL_QUEUE_NAME = ":mailQueueName"; @VisibleForTesting static final String MAILS = "/mails"; @@ -74,8 +74,9 @@ public class MailQueueRoutes implements Routes { private final JsonTransformer jsonTransformer; @Inject - @VisibleForTesting MailQueueRoutes(MailQueueFactory<ManageableMailQueue> mailQueueFactory, JsonTransformer jsonTransformer) { - this.mailQueueFactory = mailQueueFactory; + @SuppressWarnings("unchecked") + @VisibleForTesting MailQueueRoutes(MailQueueFactory<?> mailQueueFactory, JsonTransformer jsonTransformer) { + this.mailQueueFactory = (MailQueueFactory<ManageableMailQueue>) mailQueueFactory; this.jsonTransformer = jsonTransformer; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
