You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/03/08 08:30:38 UTC
[03/17] james-project git commit: JAMES-2344 don't rely on
implementation constants for route paths
JAMES-2344 don't rely on implementation constants for route paths
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/90fa81a0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/90fa81a0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/90fa81a0
Branch: refs/heads/master
Commit: 90fa81a0f93478d98a531d31f2789d70051f6e21
Parents: 7eaed64
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Feb 28 18:03:33 2018 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Wed Mar 7 11:27:22 2018 +0100
----------------------------------------------------------------------
.../webadmin/routes/GlobalQuotaRoutes.java | 6 +--
.../webadmin/routes/GlobalQuotaRoutesTest.java | 46 ++++++++++----------
2 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/90fa81a0/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
index 4c59504..d036606 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
@@ -52,9 +52,9 @@ import spark.Service;
@Produces("application/json")
public class GlobalQuotaRoutes implements Routes {
- public static final String QUOTA_ENDPOINT = "/quota";
- public static final String COUNT_ENDPOINT = QUOTA_ENDPOINT + "/count";
- public static final String SIZE_ENDPOINT = QUOTA_ENDPOINT + "/size";
+ /* for @Path annotation */ static final String QUOTA_ENDPOINT = "/quota";
+ private static final String COUNT_ENDPOINT = QUOTA_ENDPOINT + "/count";
+ private static final String SIZE_ENDPOINT = QUOTA_ENDPOINT + "/size";
private final JsonTransformer jsonTransformer;
private final JsonExtractor<QuotaDTO> jsonExtractor;
http://git-wip-us.apache.org/repos/asf/james-project/blob/90fa81a0/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
index e626fd6..cb8f745 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
@@ -68,7 +68,7 @@ public class GlobalQuotaRoutesTest {
public void getCountQuotaCountShouldReturnUnlimitedByDefault() {
long quota =
given()
- .get(GlobalQuotaRoutes.COUNT_ENDPOINT)
+ .get("/quota/count")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -85,7 +85,7 @@ public class GlobalQuotaRoutesTest {
Long actual =
given()
- .get(GlobalQuotaRoutes.COUNT_ENDPOINT)
+ .get("/quota/count")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -96,10 +96,10 @@ public class GlobalQuotaRoutesTest {
}
@Test
- public void putCountShouldRejectInvalid() throws Exception {
+ public void putCountShouldRejectInvalid() {
Map<String, Object> errors = given()
.body("invalid")
- .put(GlobalQuotaRoutes.COUNT_ENDPOINT)
+ .put("/quota/count")
.then()
.statusCode(HttpStatus.BAD_REQUEST_400)
.contentType(ContentType.JSON)
@@ -116,10 +116,10 @@ public class GlobalQuotaRoutesTest {
}
@Test
- public void putCountShouldRejectNegative() throws Exception {
+ public void putCountShouldRejectNegative() {
Map<String, Object> errors = given()
.body("-1")
- .put(GlobalQuotaRoutes.COUNT_ENDPOINT)
+ .put("/quota/count")
.then()
.statusCode(HttpStatus.BAD_REQUEST_400)
.contentType(ContentType.JSON)
@@ -138,7 +138,7 @@ public class GlobalQuotaRoutesTest {
public void putCountShouldAcceptValidValue() throws Exception {
given()
.body("42")
- .put(GlobalQuotaRoutes.COUNT_ENDPOINT)
+ .put("/quota/count")
.then()
.statusCode(HttpStatus.NO_CONTENT_204);
@@ -150,7 +150,7 @@ public class GlobalQuotaRoutesTest {
maxQuotaManager.setDefaultMaxMessage(42);
given()
- .delete(GlobalQuotaRoutes.COUNT_ENDPOINT)
+ .delete("/quota/count")
.then()
.statusCode(HttpStatus.NO_CONTENT_204);
@@ -161,7 +161,7 @@ public class GlobalQuotaRoutesTest {
public void getSizeQuotaCountShouldReturnUnlimitedByDefault() {
long quota =
given()
- .get(GlobalQuotaRoutes.SIZE_ENDPOINT)
+ .get("/quota/size")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -179,7 +179,7 @@ public class GlobalQuotaRoutesTest {
long quota =
given()
- .get(GlobalQuotaRoutes.SIZE_ENDPOINT)
+ .get("/quota/size")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -190,10 +190,10 @@ public class GlobalQuotaRoutesTest {
}
@Test
- public void putSizeShouldRejectInvalid() throws Exception {
+ public void putSizeShouldRejectInvalid() {
Map<String, Object> errors = given()
.body("invalid")
- .put(GlobalQuotaRoutes.SIZE_ENDPOINT)
+ .put("/quota/size")
.then()
.statusCode(HttpStatus.BAD_REQUEST_400)
.contentType(ContentType.JSON)
@@ -210,10 +210,10 @@ public class GlobalQuotaRoutesTest {
}
@Test
- public void putSizeShouldRejectNegative() throws Exception {
+ public void putSizeShouldRejectNegative() {
Map<String, Object> errors = given()
.body("-1")
- .put(GlobalQuotaRoutes.SIZE_ENDPOINT)
+ .put("/quota/size")
.then()
.statusCode(HttpStatus.BAD_REQUEST_400)
.contentType(ContentType.JSON)
@@ -232,7 +232,7 @@ public class GlobalQuotaRoutesTest {
public void putSizeShouldAcceptValidValue() throws Exception {
given()
.body("42")
- .put(GlobalQuotaRoutes.SIZE_ENDPOINT)
+ .put("/quota/size")
.then()
.statusCode(HttpStatus.NO_CONTENT_204);
@@ -244,7 +244,7 @@ public class GlobalQuotaRoutesTest {
maxQuotaManager.setDefaultMaxStorage(42);
given()
- .delete(GlobalQuotaRoutes.COUNT_ENDPOINT)
+ .delete("/quota/count")
.then()
.statusCode(HttpStatus.NO_CONTENT_204);
@@ -260,7 +260,7 @@ public class GlobalQuotaRoutesTest {
JsonPath jsonPath =
given()
- .get(GlobalQuotaRoutes.QUOTA_ENDPOINT)
+ .get("/quota")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -272,10 +272,10 @@ public class GlobalQuotaRoutesTest {
}
@Test
- public void getQuotaShouldReturnBothDefaultValues() throws Exception {
+ public void getQuotaShouldReturnBothDefaultValues() {
JsonPath jsonPath =
given()
- .get(GlobalQuotaRoutes.QUOTA_ENDPOINT)
+ .get("/quota")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -293,7 +293,7 @@ public class GlobalQuotaRoutesTest {
JsonPath jsonPath =
given()
- .get(GlobalQuotaRoutes.QUOTA_ENDPOINT)
+ .get("/quota")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -312,7 +312,7 @@ public class GlobalQuotaRoutesTest {
JsonPath jsonPath =
given()
- .get(GlobalQuotaRoutes.QUOTA_ENDPOINT)
+ .get("/quota")
.then()
.statusCode(HttpStatus.OK_200)
.contentType(ContentType.JSON)
@@ -327,7 +327,7 @@ public class GlobalQuotaRoutesTest {
public void putQuotaShouldUpdateBothQuota() throws Exception {
given()
.body("{\"count\":52,\"size\":42}")
- .put(GlobalQuotaRoutes.QUOTA_ENDPOINT)
+ .put("/quota")
.then()
.statusCode(HttpStatus.NO_CONTENT_204);
@@ -339,7 +339,7 @@ public class GlobalQuotaRoutesTest {
public void putQuotaShouldBeAbleToRemoveBothQuota() throws Exception {
given()
.body("{\"count\":-1,\"size\":-1}")
- .put(GlobalQuotaRoutes.QUOTA_ENDPOINT)
+ .put("/quota")
.then()
.statusCode(HttpStatus.NO_CONTENT_204);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org