JAMES-2352 Deprecate method whose Javadoc says so.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5f74a300 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5f74a300 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5f74a300 Branch: refs/heads/master Commit: 5f74a30054112642d777ecd56b2c5bb6374108c1 Parents: 6f75e23 Author: benwa <btell...@linagora.com> Authored: Thu Mar 15 17:06:03 2018 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Fri Mar 16 11:14:17 2018 +0100 ---------------------------------------------------------------------- .../james/user/file/UsersFileRepository.java | 5 +---- .../user/ldap/ReadOnlyUsersLDAPRepository.java | 21 +++----------------- 2 files changed, 4 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/5f74a300/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java index 1d47ff2..98b65ae 100644 --- a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java @@ -198,10 +198,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { } } - /* - * This is not longer in the api (deprecated) - * @see org.apache.james.user.api.UsersRepository#containsCaseInsensitive(java.lang.String) - */ + @Deprecated private boolean containsCaseInsensitive(String name) { Iterator<String> it = list(); while (it.hasNext()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/5f74a300/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java index 8190c5b..c7e2764 100644 --- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java +++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java @@ -634,12 +634,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl return getUserByName(name) != null; } - /* - * TODO Should this be deprecated? At least the method isn't declared in the - * interface anymore - * - * @see UsersRepository#containsCaseInsensitive(java.lang.String) - */ + @Deprecated public boolean containsCaseInsensitive(String name) throws UsersRepositoryException { return getUserByNameCaseInsensitive(name) != null; } @@ -655,12 +650,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl } } - /* - * TODO Should this be deprecated? At least the method isn't declared in the - * interface anymore - * - * @see UsersRepository#getRealName(java.lang.String) - */ + @Deprecated public String getRealName(String name) throws UsersRepositoryException { User u = getUserByNameCaseInsensitive(name); if (u != null) { @@ -681,12 +671,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl } } - /* - * TODO Should this be deprecated? At least the method isn't declared in the - * interface anymore - * - * @see UsersRepository#getUserByNameCaseInsensitive(java.lang.String) - */ + @Deprecated public User getUserByNameCaseInsensitive(String name) throws UsersRepositoryException { try { for (ReadOnlyLDAPUser u : buildUserCollection(getValidUsers())) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org