You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/11/09 04:45:10 UTC
[james-project] branch master updated: JAMES-3400 Add domain exist
command
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
The following commit(s) were added to refs/heads/master by this push:
new 8103df2 JAMES-3400 Add domain exist command
8103df2 is described below
commit 8103df2bb8907af32c9b228ae7031c09266defcd
Author: quanth <hq...@linagora.com>
AuthorDate: Wed Nov 4 15:09:17 2020 +0700
JAMES-3400 Add domain exist command
---
.../org/apache/james/cli/domain/DomainCommand.java | 3 +-
...{DomainCommand.java => DomainExistCommand.java} | 52 +++++++++++++---------
.../org/apache/james/httpclient/DomainClient.java | 3 ++
.../org/apache/james/cli/DomainManageTest.java | 36 +++++++++++++++
4 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
index 9d990af..209fb95 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
@@ -32,7 +32,8 @@ import picocli.CommandLine;
subcommands = {
DomainListCommand.class,
DomainCreateCommand.class,
- DomainDeleteCommand.class
+ DomainDeleteCommand.class,
+ DomainExistCommand.class
})
public class DomainCommand implements Callable<Integer> {
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
similarity index 53%
copy from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
copy to server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
index 9d990af..be39c31 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
@@ -19,36 +19,46 @@
package org.apache.james.cli.domain;
-import java.io.PrintStream;
import java.util.concurrent.Callable;
import org.apache.james.cli.WebAdminCli;
+import org.apache.james.httpclient.DomainClient;
+import feign.Feign;
+import feign.Response;
import picocli.CommandLine;
@CommandLine.Command(
- name = "domain",
- description = "Manage Domains",
- subcommands = {
- DomainListCommand.class,
- DomainCreateCommand.class,
- DomainDeleteCommand.class
- })
-public class DomainCommand implements Callable<Integer> {
-
- protected final WebAdminCli webAdminCli;
- protected final PrintStream out;
- protected final PrintStream err;
-
- public DomainCommand(PrintStream out, WebAdminCli webAdminCli, PrintStream err) {
- this.out = out;
- this.webAdminCli = webAdminCli;
- this.err = err;
- }
+ name = "exist",
+ description = "Check if a domain is exist")
+public class DomainExistCommand implements Callable<Integer> {
+
+ public static final int EXISTED_CODE = 204;
+ public static final int NOT_EXISTED_CODE = 404;
+
+ @CommandLine.ParentCommand DomainCommand domainCommand;
+
+ @CommandLine.Parameters
+ String domainName;
@Override
public Integer call() {
- return WebAdminCli.CLI_FINISHED_SUCCEED;
+ try {
+ DomainClient domainClient = Feign.builder()
+ .target(DomainClient.class, domainCommand.webAdminCli.jamesUrl + "/domains");
+ Response rs = domainClient.doesExist(domainName);
+ if (rs.status() == EXISTED_CODE) {
+ domainCommand.out.println(domainName + " exists");
+ return WebAdminCli.CLI_FINISHED_SUCCEED;
+ } else if (rs.status() == NOT_EXISTED_CODE) {
+ domainCommand.out.println(domainName + " does not exist");
+ return WebAdminCli.CLI_FINISHED_SUCCEED;
+ }
+ return WebAdminCli.CLI_FINISHED_FAILED;
+ } catch (Exception e) {
+ e.printStackTrace(domainCommand.err);
+ return WebAdminCli.CLI_FINISHED_FAILED;
+ }
}
-}
\ No newline at end of file
+}
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java
index 1d03221..d195b79 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java
@@ -36,4 +36,7 @@ public interface DomainClient {
@RequestLine("DELETE /{domainToBeDeleted}")
Response deleteADomain(@Param("domainToBeDeleted") String domainName);
+ @RequestLine("GET /{domainName}")
+ Response doesExist(@Param("domainName") String domainName);
+
}
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java b/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java
index 5a5720a..a219812 100644
--- a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java
+++ b/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java
@@ -121,4 +121,40 @@ public class DomainManageTest {
assertThat(exitCode).isEqualTo(1);
}
+ @Test
+ void domainExistCommandWithDefaultDomainShouldExist(GuiceJamesServer server) {
+ Port port = server.getProbe(WebAdminGuiceProbe.class).getWebAdminPort();
+
+ int exitCode = WebAdminCli.executeFluent(new PrintStream(outputStreamCaptor), new PrintStream(errorStreamCaptor),
+ "--url", "http://127.0.0.1:" + port.getValue(), "domain", "exist", "localhost");
+
+ assertThat(exitCode).isEqualTo(0);
+ assertThat(outputStreamCaptor.toString().trim()).isEqualTo("localhost exists");
+ }
+
+ @Test
+ void domainExistCommandWithNonExistingDomainShouldFail(GuiceJamesServer server) {
+ Port port = server.getProbe(WebAdminGuiceProbe.class).getWebAdminPort();
+
+ int exitCode = WebAdminCli.executeFluent(new PrintStream(outputStreamCaptor), new PrintStream(errorStreamCaptor),
+ "--url", "http://127.0.0.1:" + port.getValue(), "domain", "exist", "linagora.com");
+
+ assertThat(exitCode).isEqualTo(0);
+ assertThat(outputStreamCaptor.toString().trim()).isEqualTo("linagora.com does not exist");
+ }
+
+ @Test
+ void domainExistCommandWithAddedDomainShouldSucceed(GuiceJamesServer server) {
+ Port port = server.getProbe(WebAdminGuiceProbe.class).getWebAdminPort();
+
+ WebAdminCli.executeFluent(new PrintStream(outputStreamCaptor), new PrintStream(errorStreamCaptor),
+ "--url", "http://127.0.0.1:" + port.getValue(), "domain", "create", "linagora.com");
+
+ int exitCode = WebAdminCli.executeFluent(new PrintStream(outputStreamCaptor), new PrintStream(errorStreamCaptor),
+ "--url", "http://127.0.0.1:" + port.getValue(), "domain", "exist", "linagora.com");
+
+ assertThat(exitCode).isEqualTo(0);
+ assertThat(outputStreamCaptor.toString().trim()).isEqualTo("linagora.com exists");
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org