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 8afb45e9321869cf197aa586b1385dc563899fd7 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Dec 13 05:24:00 2019 +0100 JAMES-3006 Improve TaskFactory error message upon invalid query parameter --- .../james/webadmin/routes/CassandraMappingsRoutesTest.java | 2 +- .../java/org/apache/james/webadmin/tasks/TaskFactory.java | 2 +- .../org/apache/james/webadmin/tasks/TaskFactoryTest.java | 6 +++--- .../vault/routes/DeletedMessagesVaultRoutesTest.java | 4 ++-- .../james/webadmin/routes/EventDeadLettersRoutesTest.java | 6 +++--- .../apache/james/webadmin/routes/ReindexingRoutesTest.java | 14 +++++++------- .../james/webadmin/routes/MailRepositoriesRoutesTest.java | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java index 8215091..5c42462 100644 --- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java @@ -140,7 +140,7 @@ class CassandraMappingsRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'action': invalid-action. Supported values are [SolveInconsistencies]")); + .body("details", is("Invalid value supplied for query parameter 'action': invalid-action. Supported values are [SolveInconsistencies]")); } @Test diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java index a46c6c9..dcacc2f 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java @@ -123,7 +123,7 @@ public class TaskFactory implements TaskGenerator { TaskRegistrationKey registrationKey = parseRegistrationKey(request); return Optional.ofNullable(taskGenerators.get(registrationKey)) .map(Throwing.<TaskGenerator, Task>function(taskGenerator -> taskGenerator.generate(request)).sneakyThrow()) - .orElseThrow(() -> new IllegalArgumentException("Invalid value supplied for '" + taskParameterName + "': " + registrationKey.asString() + .orElseThrow(() -> new IllegalArgumentException("Invalid value supplied for query parameter '" + taskParameterName + "': " + registrationKey.asString() + ". " + supportedValueMessage())); } diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java index 18b947f..d4a7707 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java @@ -81,7 +81,7 @@ class TaskFactoryTest { assertThatThrownBy(() -> taskFactory.generate(request)) .isInstanceOf(IllegalArgumentException.class) - .hasMessage("Invalid value supplied for 'custom': unknown. Supported values are [task1]"); + .hasMessage("Invalid value supplied for query parameter 'custom': unknown. Supported values are [task1]"); } @Test @@ -104,7 +104,7 @@ class TaskFactoryTest { assertThatThrownBy(() -> taskFactory.generate(request)) .isInstanceOf(IllegalArgumentException.class) - .hasMessage("Invalid value supplied for 'action': unknown. Supported values are [task1, task2]"); + .hasMessage("Invalid value supplied for query parameter 'action': unknown. Supported values are [task1, task2]"); } @Test @@ -113,7 +113,7 @@ class TaskFactoryTest { assertThatThrownBy(() -> singleTaskFactory.generate(request)) .isInstanceOf(IllegalArgumentException.class) - .hasMessage("Invalid value supplied for 'action': unknown. Supported values are [task1]"); + .hasMessage("Invalid value supplied for query parameter 'action': unknown. Supported values are [task1]"); } @Test diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java index 02528fd..6f43b0e 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java @@ -332,7 +332,7 @@ class DeletedMessagesVaultRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", startsWith("Invalid value supplied for 'scope': invalid action. Supported values are [expired]")); + .body("details", startsWith("Invalid value supplied for query parameter 'scope': invalid action. Supported values are [expired]")); } @Test @@ -346,7 +346,7 @@ class DeletedMessagesVaultRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'scope': EXPIRED. Supported values are [expired]")); + .body("details", is("Invalid value supplied for query parameter 'scope': EXPIRED. Supported values are [expired]")); } @ParameterizedTest diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java index 9c56056..8db4d2c 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java @@ -533,7 +533,7 @@ class EventDeadLettersRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'action': invalid-action. Supported values are [reDeliver]")); + .body("details", is("Invalid value supplied for query parameter 'action': invalid-action. Supported values are [reDeliver]")); } @Test @@ -721,7 +721,7 @@ class EventDeadLettersRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'action': invalid-action. Supported values are [reDeliver]")); + .body("details", is("Invalid value supplied for query parameter 'action': invalid-action. Supported values are [reDeliver]")); } @Test @@ -900,7 +900,7 @@ class EventDeadLettersRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'action': invalid-action. Supported values are [reDeliver]")); + .body("details", is("Invalid value supplied for query parameter 'action': invalid-action. Supported values are [reDeliver]")); } @Test diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java index f7b94e3..40ab5de 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java @@ -143,7 +143,7 @@ class ReindexingRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'task': bad. Supported values are [reIndex]")); + .body("details", is("Invalid value supplied for query parameter 'task': bad. Supported values are [reIndex]")); } } @@ -304,7 +304,7 @@ class ReindexingRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'task': bad. Supported values are [reIndex]")); + .body("details", is("Invalid value supplied for query parameter 'task': bad. Supported values are [reIndex]")); } @Test @@ -494,7 +494,7 @@ class ReindexingRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'task': bad. Supported values are [reIndex]")); + .body("details", is("Invalid value supplied for query parameter 'task': bad. Supported values are [reIndex]")); } @Test @@ -684,7 +684,7 @@ class ReindexingRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'task': bad. Supported values are [reIndex]")); + .body("details", is("Invalid value supplied for query parameter 'task': bad. Supported values are [reIndex]")); } @Test @@ -842,7 +842,7 @@ class ReindexingRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'task': bad. Supported values are [reIndex]")); + .body("details", is("Invalid value supplied for query parameter 'task': bad. Supported values are [reIndex]")); } @Test @@ -1019,7 +1019,7 @@ class ReindexingRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'task': bad. Supported values are [reIndex]")); + .body("details", is("Invalid value supplied for query parameter 'task': bad. Supported values are [reIndex]")); } @Test @@ -1035,7 +1035,7 @@ class ReindexingRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'task': bad. Supported values are [reIndex]")); + .body("details", is("Invalid value supplied for query parameter 'task': bad. Supported values are [reIndex]")); } } diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java index 2568146..eb6998a 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java @@ -1076,7 +1076,7 @@ public class MailRepositoriesRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'action': invalid. Supported values are [reprocess]")); + .body("details", is("Invalid value supplied for query parameter 'action': invalid. Supported values are [reprocess]")); } @Test @@ -1436,7 +1436,7 @@ public class MailRepositoriesRoutesTest { .body("statusCode", is(400)) .body("type", is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType())) .body("message", is("Invalid arguments supplied in the user request")) - .body("details", is("Invalid value supplied for 'action': invalid. Supported values are [reprocess]")); + .body("details", is("Invalid value supplied for query parameter 'action': invalid. Supported values are [reprocess]")); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
