JAMES-1759 Extract emptyBody
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2e672ff8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2e672ff8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2e672ff8 Branch: refs/heads/master Commit: 2e672ff8186927466fb14eceff4ca80d548fc650 Parents: 89ca3b8 Author: Benoit Tellier <[email protected]> Authored: Wed Jun 22 11:52:07 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Jun 23 16:31:27 2016 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/james/webadmin/Constants.java | 1 + .../org/apache/james/webadmin/routes/DomainRoutes.java | 8 ++++---- .../java/org/apache/james/webadmin/routes/UserRoutes.java | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2e672ff8/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/Constants.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/Constants.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/Constants.java index b07ea14..1031a86 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/Constants.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/Constants.java @@ -22,5 +22,6 @@ package org.apache.james.webadmin; public interface Constants { String SEPARATOR = "/"; + String EMPTY_BODY = ""; } http://git-wip-us.apache.org/repos/asf/james-project/blob/2e672ff8/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/DomainRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/DomainRoutes.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/DomainRoutes.java index bbfa522..2008278 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/DomainRoutes.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/DomainRoutes.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; +import org.apache.james.webadmin.Constants; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.utils.JsonTransformer; import org.slf4j.Logger; @@ -40,7 +41,6 @@ import spark.Service; public class DomainRoutes implements Routes { private static final String DOMAIN_NAME = ":domainName"; - private static final String EMPTY_BODY = ""; private static final Logger LOGGER = LoggerFactory.getLogger(DomainRoutes.class); public static final String DOMAINS = "/domains"; @@ -78,7 +78,7 @@ public class DomainRoutes implements Routes { LOGGER.info("{} did not exists", request.params(DOMAIN_NAME)); } response.status(204); - return EMPTY_BODY; + return Constants.EMPTY_BODY; } private void removeDomain(String domain) throws DomainListException { @@ -97,7 +97,7 @@ public class DomainRoutes implements Routes { LOGGER.info("Invalid request for domain creation"); response.status(400); } - return EMPTY_BODY; + return Constants.EMPTY_BODY; } private void addDomain(String domain) throws DomainListException { @@ -113,6 +113,6 @@ public class DomainRoutes implements Routes { } else { response.status(204); } - return EMPTY_BODY; + return Constants.EMPTY_BODY; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/2e672ff8/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java index d9f577f..7acda3c 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java @@ -24,6 +24,7 @@ import static org.apache.james.webadmin.Constants.SEPARATOR; import javax.inject.Inject; import org.apache.james.user.api.UsersRepositoryException; +import org.apache.james.webadmin.Constants; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.model.AddUserRequest; import org.apache.james.webadmin.service.UserService; @@ -40,7 +41,6 @@ import spark.Service; public class UserRoutes implements Routes { private static final String USER_NAME = ":userName"; - private static final String EMPTY_BODY = ""; private static final Logger LOGGER = LoggerFactory.getLogger(UserRoutes.class); public static final String USERS = "/users"; @@ -72,14 +72,14 @@ public class UserRoutes implements Routes { try { userService.removeUser(username); response.status(204); - return EMPTY_BODY; + return Constants.EMPTY_BODY; } catch (UsersRepositoryException e) { response.status(204); return "The user " + username + " does not exists"; } catch (IllegalArgumentException e) { LOGGER.info("Invalid user path", e); response.status(400); - return EMPTY_BODY; + return Constants.EMPTY_BODY; } } @@ -91,11 +91,11 @@ public class UserRoutes implements Routes { } catch (JsonExtractException e) { LOGGER.info("Error while deserializing addUser request", e); response.status(400); - return EMPTY_BODY; + return Constants.EMPTY_BODY; } catch (IllegalArgumentException e) { LOGGER.info("Invalid user path", e); response.status(400); - return EMPTY_BODY; + return Constants.EMPTY_BODY; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
