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 89791f0f38f32ba2fd90576e2aaaea5d29c74cd6 Author: Gautier DI FOLCO <[email protected]> AuthorDate: Tue Feb 18 10:10:07 2020 +0100 JAMES-3066 Refactor Alias related parts --- .../org/apache/james/webadmin/routes/UserRoutes.java | 6 +++--- .../org/apache/james/webadmin/service/UserService.java | 2 +- .../org/apache/james/webadmin/routes/UserRoutesTest.java | 16 +++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java index d0b78ee..cd8699d 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java @@ -219,12 +219,12 @@ public class UserRoutes implements Routes { Username username = extractUsername(request); try { - if (!userService.existUser(username)) { - LOGGER.info("allowed From headers on an unknown user: '{}", username.asString()); + if (!userService.userExists(username)) { + LOGGER.info("Allowed FROM headers requested for an unknown user: '{}", username.asString()); throw ErrorResponder.builder() .statusCode(HttpStatus.NOT_FOUND_404) .type(ErrorType.INVALID_ARGUMENT) - .message("user '" + username.asString() + "' does not exist") + .message(String.format("user '%s' does not exist", username.asString())) .haltError(); } diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/service/UserService.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/service/UserService.java index cd36afb..a263234 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/service/UserService.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/service/UserService.java @@ -66,7 +66,7 @@ public class UserService { upsert(user, username, password); } - public boolean existUser(Username username) throws UsersRepositoryException { + public boolean userExists(Username username) throws UsersRepositoryException { try { return usersRepository.contains(usersRepository.getUser(username.asMailAddress())); } catch (AddressException e) { diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UserRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UserRoutesTest.java index db1dba9..7936d4f 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UserRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UserRoutesTest.java @@ -122,23 +122,21 @@ class UserRoutesTest { @Override public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException { - return parameterContext.getParameter() - .getType() - .isAssignableFrom(UsersRepository.class) - || parameterContext.getParameter() - .getType() - .isAssignableFrom(RecipientRewriteTable.class); + Class<?> parameterType = parameterContext.getParameter().getType(); + return parameterType.isAssignableFrom(UsersRepository.class) + || parameterType.isAssignableFrom(RecipientRewriteTable.class); } @Override public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException { - if (parameterContext.getParameter().getType().isAssignableFrom(UsersRepository.class)) { + Class<?> parameterType = parameterContext.getParameter().getType(); + if (parameterType.isAssignableFrom(UsersRepository.class)) { return usersRepository; } - if (parameterContext.getParameter().getType().isAssignableFrom(RecipientRewriteTable.class)) { + if (parameterType.isAssignableFrom(RecipientRewriteTable.class)) { return recipientRewriteTable; } - throw new RuntimeException("Unknown parameter type: " + parameterContext.getParameter().getType()); + throw new RuntimeException("Unknown parameter type: " + parameterType); } private WebAdminServer startServer(UsersRepository usersRepository) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
