james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [james-project] 08/15: JAMES-2344 Quota routes never return 409
Date Fri, 06 Sep 2019 02:19:53 GMT
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 1a38f3e5dae1c8e803f4f31b1fee35eb9d1d8443
Author: Benoit Tellier <btellier@linagora.com>
AuthorDate: Thu Sep 5 12:08:02 2019 +0700

    JAMES-2344 Quota routes never return 409
---
 .../org/apache/james/webadmin/routes/DomainQuotaRoutes.java |  3 ---
 .../org/apache/james/webadmin/routes/UserQuotaRoutes.java   |  3 ---
 src/site/markdown/server/manage-webadmin.md                 | 13 -------------
 3 files changed, 19 deletions(-)

diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
index c8da44f..7b21366 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
@@ -126,7 +126,6 @@ public class DomainQuotaRoutes implements Routes {
             @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "The body is not a
positive integer or not unlimited value (-1)."),
             @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The requested domain
can not be found."),
             @ApiResponse(code = HttpStatus.METHOD_NOT_ALLOWED_405, message = "Domain Quota
configuration not supported when virtual hosting is desactivated."),
-            @ApiResponse(code = HttpStatus.CONFLICT_409, message = "The requested restriction
can't be enforced right now."),
             @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal
server error - Something went bad on the server side.")
     })
     public void defineUpdateQuota() {
@@ -184,7 +183,6 @@ public class DomainQuotaRoutes implements Routes {
             @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "The body is not a
positive integer."),
             @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The requested domain
can not be found."),
             @ApiResponse(code = HttpStatus.METHOD_NOT_ALLOWED_405, message = "Domain Quota
configuration not supported when virtual hosting is desactivated."),
-            @ApiResponse(code = HttpStatus.CONFLICT_409, message = "The requested restriction
can't be enforced right now."),
             @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal
server error - Something went bad on the server side.")
     })
     public void defineUpdateQuotaSize() {
@@ -245,7 +243,6 @@ public class DomainQuotaRoutes implements Routes {
             @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "The body is not a
positive integer."),
             @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The requested domain
can not be found."),
             @ApiResponse(code = HttpStatus.METHOD_NOT_ALLOWED_405, message = "Domain Quota
configuration not supported when virtual hosting is desactivated."),
-            @ApiResponse(code = HttpStatus.CONFLICT_409, message = "The requested restriction
can't be enforced right now."),
             @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal
server error - Something went bad on the server side.")
     })
     public void defineUpdateQuotaCount() {
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
index 7b1d201..e14a270 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
@@ -127,7 +127,6 @@ public class UserQuotaRoutes implements Routes {
             @ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. The value has been
updated."),
             @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "The body is not a
positive integer or not unlimited value (-1)."),
             @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The user name does not
exist."),
-            @ApiResponse(code = HttpStatus.CONFLICT_409, message = "The requested restriction
can't be enforced right now."),
             @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal
server error - Something went bad on the server side.")
     })
     public void defineUpdateQuota() {
@@ -264,7 +263,6 @@ public class UserQuotaRoutes implements Routes {
             @ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. The value has been
updated."),
             @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "The body is not a
positive integer nor -1."),
             @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The user name does not
exist."),
-            @ApiResponse(code = HttpStatus.CONFLICT_409, message = "The requested restriction
can't be enforced right now."),
             @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal
server error - Something went bad on the server side.")
     })
     public void defineUpdateQuotaSize() {
@@ -322,7 +320,6 @@ public class UserQuotaRoutes implements Routes {
             @ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. The value has been
updated."),
             @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "The body is not a
positive integer nor -1."),
             @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The user name does not
exist."),
-            @ApiResponse(code = HttpStatus.CONFLICT_409, message = "The requested restriction
can't be enforced right now."),
             @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal
server error - Something went bad on the server side.")
     })
     public void defineUpdateQuotaCount() {
diff --git a/src/site/markdown/server/manage-webadmin.md b/src/site/markdown/server/manage-webadmin.md
index fb564a2..6204abd 100644
--- a/src/site/markdown/server/manage-webadmin.md
+++ b/src/site/markdown/server/manage-webadmin.md
@@ -523,7 +523,6 @@ Response codes:
  - 204: The quota has been updated
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The user does not exist
- - 409: The requested restriction can’t be enforced right now.
 
 ### Getting the quota count for a user
 
@@ -564,7 +563,6 @@ Response codes:
  - 204: The quota has been updated
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The user does not exist
- - 409: The requested restriction can’t be enforced right now.
 
 ### Deleting the quota count for a user
 
@@ -579,7 +577,6 @@ Response codes:
  - 204: The quota has been updated to unlimited value.
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The user does not exist
- - 409: The requested restriction can’t be enforced right now.
 
 ### Getting the quota size for a user
 
@@ -620,7 +617,6 @@ Response codes:
  - 204: The quota has been updated
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The user does not exist
- - 409: The requested restriction can’t be enforced right now.
 
 ### Deleting the quota size for a user
 
@@ -635,7 +631,6 @@ Response codes:
  - 204: The quota has been updated to unlimited value.
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The user does not exist
- - 409: The requested restriction can’t be enforced right now.
 
 ### Searching user by quota ratio
 
@@ -784,7 +779,6 @@ Response codes:
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The domain does not exist
  - 405: Domain Quota configuration not supported when virtual hosting is desactivated.
- - 409: The requested restriction can’t be enforced right now.
 
 ### Getting the quota count for a domain
 
@@ -828,7 +822,6 @@ Response codes:
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The domain does not exist
  - 405: Domain Quota configuration not supported when virtual hosting is desactivated.
- - 409: The requested restriction can’t be enforced right now.
 
 ### Deleting the quota count for a domain
 
@@ -844,7 +837,6 @@ Response codes:
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The domain does not exist
  - 405: Domain Quota configuration not supported when virtual hosting is desactivated.
- - 409: The requested restriction can’t be enforced right now.
  - 500: Internal server error - Something went bad on the server side.
 
 ### Getting the quota size for a domain
@@ -888,7 +880,6 @@ Response codes:
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The domain does not exist
  - 405: Domain Quota configuration not supported when virtual hosting is desactivated.
- - 409: The requested restriction can’t be enforced right now.
  - 500: Internal server error - Something went bad on the server side.
 
 ### Deleting the quota size for a domain
@@ -904,7 +895,6 @@ Response codes:
  - 204: The quota has been updated to unlimited value.
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The domain does not exist
- - 409: The requested restriction can’t be enforced right now.
  - 500: Internal server error - Something went bad on the server side.
 
 ## Administrating global quotas
@@ -1018,7 +1008,6 @@ Response codes:
  - 204: The quota has been updated to unlimited value.
  - 400: The body is not a positive integer neither an unlimited value (-1).
  - 404: The user does not exist
- - 409: The requested restriction can’t be enforced right now.
 
 ### Getting the global quota size
 
@@ -1054,7 +1043,6 @@ Response codes:
 
  - 204: The quota has been updated
  - 400: The body is not a positive integer neither an unlimited value (-1).
- - 409: The requested restriction can’t be enforced right now.
 
 ### Deleting the global quota size
 
@@ -1066,7 +1054,6 @@ Response codes:
 
  - 204: The quota has been updated to unlimited value.
  - 400: The body is not a positive integer neither an unlimited value (-1).
- - 409: The requested restriction can’t be enforced right now.
 
 ## Cassandra Schema upgrades
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message