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 2021/02/25 09:06:58 UTC
[james-project] 10/12: JAMES-3400 Move HTTP status codes to a
constant
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 83328cf2a057f3385954538340eab15e54c27aef
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Feb 17 12:31:59 2021 +0700
JAMES-3400 Move HTTP status codes to a constant
---
.../james/cli/domain/AddDomainAliasCommand.java | 7 ++--
.../james/cli/domain/DomainCreateCommand.java | 7 ++--
.../james/cli/domain/DomainDeleteCommand.java | 7 ++--
.../james/cli/domain/DomainExistCommand.java | 11 +++---
.../james/cli/domain/RemoveDomainAliasCommand.java | 7 ++--
.../cli/quota/DeleteGlobalQuotaCountCommand.java | 4 +-
.../cli/quota/DeleteGlobalQuotaSizeCommand.java | 4 +-
.../cli/quota/SetGlobalQuotaCountCommand.java | 4 +-
.../james/cli/quota/SetGlobalQuotaSizeCommand.java | 4 +-
.../Constants.java} | 43 +++-------------------
10 files changed, 30 insertions(+), 68 deletions(-)
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java
index d669dfd..d7bdbfd 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java
@@ -19,6 +19,8 @@
package org.apache.james.cli.domain;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
+
import java.nio.charset.StandardCharsets;
import java.util.concurrent.Callable;
@@ -33,9 +35,6 @@ import picocli.CommandLine;
name = "addAlias",
description = "Create a new domain alias")
public class AddDomainAliasCommand implements Callable<Integer> {
-
- public static final int CREATED_CODE = 204;
-
@CommandLine.ParentCommand DomainCommand domainCommand;
@CommandLine.Parameters(description = "Destination of the domain alias. This is the domain this alias belongs to.")
@@ -49,7 +48,7 @@ public class AddDomainAliasCommand implements Callable<Integer> {
try {
DomainClient domainClient = domainCommand.fullyQualifiedURL("/domains");
Response rs = domainClient.addADomainAlias(destinationDomain, sourceDomain);
- if (rs.status() == CREATED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
domainCommand.err.println(IOUtils.toString(rs.body().asInputStream(), StandardCharsets.UTF_8));
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java
index af0b074..b6502f0 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java
@@ -19,6 +19,8 @@
package org.apache.james.cli.domain;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
+
import java.util.concurrent.Callable;
import org.apache.james.cli.WebAdminCli;
@@ -31,9 +33,6 @@ import picocli.CommandLine;
name = "create",
description = "Create a new domain")
public class DomainCreateCommand implements Callable<Integer> {
-
- public static final int CREATED_CODE = 204;
-
@CommandLine.ParentCommand DomainCommand domainCommand;
@CommandLine.Parameters
@@ -44,7 +43,7 @@ public class DomainCreateCommand implements Callable<Integer> {
try {
DomainClient domainClient = domainCommand.fullyQualifiedURL("/domains");
Response rs = domainClient.createADomain(domainName);
- if (rs.status() == CREATED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
return WebAdminCli.CLI_FINISHED_FAILED;
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
index af2115e..64b0234 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
@@ -19,6 +19,8 @@
package org.apache.james.cli.domain;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
+
import java.util.concurrent.Callable;
import org.apache.james.cli.WebAdminCli;
@@ -31,9 +33,6 @@ import picocli.CommandLine;
name = "delete",
description = "Delete a domain")
public class DomainDeleteCommand implements Callable<Integer> {
-
- public static final int DELETED_CODE = 204;
-
@CommandLine.ParentCommand DomainCommand domainCommand;
@CommandLine.Parameters
@@ -44,7 +43,7 @@ public class DomainDeleteCommand implements Callable<Integer> {
try {
DomainClient domainClient = domainCommand.fullyQualifiedURL("/domains");
Response rs = domainClient.deleteADomain(domainName);
- if (rs.status() == DELETED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
return WebAdminCli.CLI_FINISHED_FAILED;
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
index 094c16b..948e1b5 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
@@ -19,6 +19,9 @@
package org.apache.james.cli.domain;
+import static org.apache.james.httpclient.Constants.NOT_FOUND;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
+
import java.util.concurrent.Callable;
import org.apache.james.cli.WebAdminCli;
@@ -31,10 +34,6 @@ import picocli.CommandLine;
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
@@ -45,10 +44,10 @@ public class DomainExistCommand implements Callable<Integer> {
try {
DomainClient domainClient = domainCommand.fullyQualifiedURL("/domains");
Response rs = domainClient.doesExist(domainName);
- if (rs.status() == EXISTED_CODE) {
+ if (rs.status() == NO_CONTENT) {
domainCommand.out.println(domainName + " exists");
return WebAdminCli.CLI_FINISHED_SUCCEED;
- } else if (rs.status() == NOT_EXISTED_CODE) {
+ } else if (rs.status() == NOT_FOUND) {
domainCommand.out.println(domainName + " does not exist");
return WebAdminCli.CLI_FINISHED_SUCCEED;
}
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java
index 5e715d3..eb5a2de 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java
@@ -19,6 +19,8 @@
package org.apache.james.cli.domain;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
+
import java.util.concurrent.Callable;
import org.apache.james.cli.WebAdminCli;
@@ -31,9 +33,6 @@ import picocli.CommandLine;
name = "removeAlias",
description = "Remove a domain alias")
public class RemoveDomainAliasCommand implements Callable<Integer> {
-
- public static final int CREATED_CODE = 204;
-
@CommandLine.ParentCommand DomainCommand domainCommand;
@CommandLine.Parameters(description = "Destination of the domain alias. This is the domain this alias belongs to.")
@@ -47,7 +46,7 @@ public class RemoveDomainAliasCommand implements Callable<Integer> {
try {
DomainClient domainClient = domainCommand.fullyQualifiedURL("/domains");
Response rs = domainClient.deleteADomainAlias(destinationDomain, sourceDomain);
- if (rs.status() == CREATED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
return WebAdminCli.CLI_FINISHED_FAILED;
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java
index 829d88a..4b48404 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java
@@ -19,7 +19,7 @@
package org.apache.james.cli.quota;
-import static org.apache.james.cli.domain.DomainDeleteCommand.DELETED_CODE;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
import java.util.concurrent.Callable;
@@ -41,7 +41,7 @@ public class DeleteGlobalQuotaCountCommand implements Callable<Integer> {
try {
QuotaClient quotaClient = parentCommand.parentCommand.quotaCommand.fullyQualifiedURL();
Response rs = quotaClient.deleteQuotaCount();
- if (rs.status() == DELETED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
return WebAdminCli.CLI_FINISHED_FAILED;
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java
index 1aecc73..d9012f7 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java
@@ -19,7 +19,7 @@
package org.apache.james.cli.quota;
-import static org.apache.james.cli.domain.DomainDeleteCommand.DELETED_CODE;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
import java.util.concurrent.Callable;
@@ -41,7 +41,7 @@ public class DeleteGlobalQuotaSizeCommand implements Callable<Integer> {
try {
QuotaClient quotaClient = parentCommand.parentCommand.quotaCommand.fullyQualifiedURL();
Response rs = quotaClient.deleteQuotaSize();
- if (rs.status() == DELETED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
return WebAdminCli.CLI_FINISHED_FAILED;
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java
index be4bbdc..be665a2 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java
@@ -19,7 +19,7 @@
package org.apache.james.cli.quota;
-import static org.apache.james.cli.domain.DomainDeleteCommand.DELETED_CODE;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
import java.util.concurrent.Callable;
@@ -44,7 +44,7 @@ public class SetGlobalQuotaCountCommand implements Callable<Integer> {
try {
QuotaClient quotaClient = parentCommand.parentCommand.quotaCommand.fullyQualifiedURL();
Response rs = quotaClient.setQuotaCount(count);
- if (rs.status() == DELETED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
return WebAdminCli.CLI_FINISHED_FAILED;
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java
index 9a5f42c..9c8b49b 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java
@@ -19,7 +19,7 @@
package org.apache.james.cli.quota;
-import static org.apache.james.cli.domain.DomainDeleteCommand.DELETED_CODE;
+import static org.apache.james.httpclient.Constants.NO_CONTENT;
import java.util.concurrent.Callable;
@@ -45,7 +45,7 @@ public class SetGlobalQuotaSizeCommand implements Callable<Integer> {
try {
QuotaClient quotaClient = parentCommand.parentCommand.quotaCommand.fullyQualifiedURL();
Response rs = quotaClient.setQuotaSize(Size.parse(size).asBytes());
- if (rs.status() == DELETED_CODE) {
+ if (rs.status() == NO_CONTENT) {
return WebAdminCli.CLI_FINISHED_SUCCEED;
} else {
return WebAdminCli.CLI_FINISHED_FAILED;
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/Constants.java
similarity index 53%
copy from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
copy to server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/Constants.java
index af2115e..74c49b7 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/Constants.java
@@ -17,42 +17,9 @@
* under the License. *
******************************************************************/
-package org.apache.james.cli.domain;
+package org.apache.james.httpclient;
-import java.util.concurrent.Callable;
-
-import org.apache.james.cli.WebAdminCli;
-import org.apache.james.httpclient.DomainClient;
-
-import feign.Response;
-import picocli.CommandLine;
-
-@CommandLine.Command(
- name = "delete",
- description = "Delete a domain")
-public class DomainDeleteCommand implements Callable<Integer> {
-
- public static final int DELETED_CODE = 204;
-
- @CommandLine.ParentCommand DomainCommand domainCommand;
-
- @CommandLine.Parameters
- String domainName;
-
- @Override
- public Integer call() {
- try {
- DomainClient domainClient = domainCommand.fullyQualifiedURL("/domains");
- Response rs = domainClient.deleteADomain(domainName);
- if (rs.status() == DELETED_CODE) {
- return WebAdminCli.CLI_FINISHED_SUCCEED;
- } else {
- return WebAdminCli.CLI_FINISHED_FAILED;
- }
- } catch (Exception e) {
- e.printStackTrace(domainCommand.err);
- return WebAdminCli.CLI_FINISHED_FAILED;
- }
- }
-
-}
\ No newline at end of file
+public interface Constants {
+ int NO_CONTENT = 204;
+ int NOT_FOUND = 404;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org