GUACAMOLE-524: Fixed Javadoc and removed unnecessary methods
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/58c8f3e1 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/58c8f3e1 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/58c8f3e1 Branch: refs/heads/master Commit: 58c8f3e111325575fce70788278c6fe73375025e Parents: 4791ada Author: Jared Frees <[email protected]> Authored: Wed Jun 13 10:34:41 2018 -0400 Committer: Jared Frees <[email protected]> Committed: Wed Jun 13 10:34:41 2018 -0400 ---------------------------------------------------------------------- .../ldap/AuthenticationProviderService.java | 2 +- .../auth/ldap/user/AuthenticatedUser.java | 43 -------------------- 2 files changed, 1 insertion(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/58c8f3e1/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java index fa7ed93..834dbb9 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java @@ -269,7 +269,7 @@ public class AuthenticationProviderService { * If an error occurs while searching for the user attributes. * * @throws GuacamoleException - * If an error occurs retrieving the user DN. + * If an error occurs retrieving the user DN or the attributes. */ private Map<String, String> getLDAPAttributes(LDAPConnection ldapConnection, String username) throws GuacamoleException { http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/58c8f3e1/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java index 5b3115a..914d4cd 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java @@ -71,49 +71,6 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser { this.attributes = attributes; } - /** - * Add the Map of attributes to the current set, without completely - * replacing the existing set. However, if duplicate keys exist the new - * values will replace any existing ones. - * - * @param attributes - * A Map of attributes to add to the existing attributes, without - * completely overwriting them. - */ - public void addAttributes(Map<String, String> attributes) { - this.attributes.putAll(attributes); - } - - /** - * Retrieve a single attribute value from the map of arbitrary attributes - * stored in this AuthenticatedUser object. - * - * @param key - * The key of the attribute to retrieve. - * - * @return - * The value of the attribute with the specified key. - */ - public String getAttribute(String key) { - return attributes.get(key); - } - - /** - * Set the attribute of the given key to the given value, either adding - * a new value if the specified key does not exist, or replacing an existing - * value. - * - * @param key - * The key name of the attribute to set (or overwrite, if it - * already exists). - * - * @param value - * The value of the attribute to set or overwrite. - */ - public void setAttribute(String key, String value) { - attributes.put(key, value); - } - @Override public AuthenticationProvider getAuthenticationProvider() { return authProvider;
