GUACAMOLE-524: Fixed up code style and comments

Also added Override tag in AbstractAuthenticatedUser on getAttributes
and setAttributes.

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java

@@ -197,7 +197,8 @@ public class AuthenticationProviderService {
 
     /**
      * Returns an AuthenticatedUser representing the user authenticated by the
-     * given credentials. Also adds custom LDAP attributes to credentials object.
+     * given credentials. Also adds custom LDAP attributes to the
+     * AuthenticatedUser.
      *
      * @param credentials
      *     The credentials to use for authentication.
@@ -233,7 +234,7 @@ public class AuthenticationProviderService {
             AuthenticatedUser authenticatedUser = authenticatedUserProvider.get();
             authenticatedUser.init(credentials);
 
-            //set attributes
+            // Set attributes
             String username = credentials.getUsername();
             Map<String, String> attrs = getLDAPAttributes(ldapConnection, username);
             authenticatedUser.setAttributes(attrs);
@@ -293,9 +294,7 @@ public class AuthenticationProviderService {
             // Add each attribute into Map
             for (Object attrObj : attrSet) {
                 LDAPAttribute attr = (LDAPAttribute)attrObj;
-                String attrName = attr.getName();
+                attrMap.put(attr.getName(), attr.getStringValue());
-                String attrValue = attr.getStringValue();
-                attrMap.put(attrName, attrValue);
             }
         }
         catch (LDAPException e) {

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java

@@ -348,8 +348,7 @@ public class ConfigurationService {
      * Returns names for custom LDAP user attributes.
      *
      * @return
-     *     LDAP user attributes as defined in the guacamole.properties file
+     *     Custom LDAP user attributes as configured in guacamole.properties.
-     *     as ldap-user-attributes: ''
      *
      * @throws GuacamoleException
      *     If guacamole.properties cannot be parsed.

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java

@@ -61,24 +61,11 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
         setIdentifier(credentials.getUsername());
     }
 
-    /**
-     * Get a map of attributes associated with this AuthenticatedUser.
-     *
-     * @return
-     *     The Map of arbitrary attributes associated with this
-     *     AuthenticatedUser object.
-     */
     @Override
     public Map<String, String> getAttributes() {
         return attributes;
     }
 
-    /**
-     * Sets a map of attributes associated with this AuthenticatedUser.
-     *
-     * @param attributes
-     *      A map of attribute key/value pairs to add to this AuthenticatedUser.
-     */
     @Override
     public void setAttributes(Map<String, String> attributes) {
         this.attributes = attributes;

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java

@@ -42,10 +42,12 @@ public abstract class AbstractAuthenticatedUser extends AbstractIdentifiable
         // Nothing to invalidate
     }
 
+    @Override
     public Map<String, String> getAttributes() {
         return Collections.<String, String>emptyMap();
     }
 
+    @Override
     public void setAttributes(Map<String, String> attributes) {
         //do nothing
     }

guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java

@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.guacamole.net.auth.AuthenticatedUser;
 import org.apache.guacamole.net.auth.Credentials;
+
 /**
  * Utility class which provides access to standardized token names, as well as
  * facilities for generating those tokens from common objects.