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 b95aab64f8fe73cf059b4726598b501616a1119e Author: Benoit Tellier <[email protected]> AuthorDate: Mon Jan 31 10:15:29 2022 +0700 [REFACTORING] ReadOnlyLDAPUsersDAO: null -> Optional refactoring Minimal reach as it was a private method, but better be safe... --- .../org/apache/james/user/ldap/ReadOnlyLDAPUsersDAO.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUsersDAO.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUsersDAO.java index 79a35ad..1bdcbe3 100644 --- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUsersDAO.java +++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUsersDAO.java @@ -222,7 +222,7 @@ public class ReadOnlyLDAPUsersDAO implements UsersDAO, Configurable { return results; } - private ReadOnlyLDAPUser searchAndBuildUser(Username name) throws LDAPException { + private Optional<ReadOnlyLDAPUser> searchAndBuildUser(Username name) throws LDAPException { SearchResult searchResult = ldapConnectionPool.search(ldapConfiguration.getUserBase(), SearchScope.SUB, createFilter(name.asString()), @@ -233,15 +233,15 @@ public class ReadOnlyLDAPUsersDAO implements UsersDAO, Configurable { .findFirst() .orElse(null); if (result == null) { - return null; + return Optional.empty(); } if (!ldapConfiguration.getRestriction().isActivated() || userInGroupsMembershipList(result.getParsedDN(), ldapConfiguration.getRestriction().getGroupMembershipLists(ldapConnectionPool))) { - return new ReadOnlyLDAPUser(name, result.getParsedDN(), ldapConnectionPool); + return Optional.of(new ReadOnlyLDAPUser(name, result.getParsedDN(), ldapConnectionPool)); } - return null; + return Optional.empty(); } private Optional<ReadOnlyLDAPUser> buildUser(DN userDN) throws LDAPException { @@ -278,9 +278,9 @@ public class ReadOnlyLDAPUsersDAO implements UsersDAO, Configurable { } @Override - public Optional<User> getUserByName(Username name) throws UsersRepositoryException { + public Optional<ReadOnlyLDAPUser> getUserByName(Username name) throws UsersRepositoryException { try { - return Optional.ofNullable(searchAndBuildUser(name)); + return searchAndBuildUser(name); } catch (Exception e) { throw new UsersRepositoryException("Unable check user existence from ldap", e); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
