GUACAMOLE-38: Clean up minor code issues. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/aaada49d Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/aaada49d Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/aaada49d
Branch: refs/heads/master Commit: aaada49dfefdb7aab794ebc6054976686fc57970 Parents: 27f4ad0 Author: Nick Couchman <vn...@apache.org> Authored: Mon May 14 14:00:50 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Fri Jun 1 13:40:53 2018 -0400 ---------------------------------------------------------------------- .../auth/quickconnect/QuickConnectDirectory.java | 2 +- .../auth/quickconnect/QuickConnectUserContext.java | 2 -- .../guacamole/auth/quickconnect/QuickConnectionGroup.java | 2 +- .../auth/quickconnect/rest/QuickConnectREST.java | 2 +- .../guacamole/auth/quickconnect/utility/QCParserTest.java | 10 +++++++++- 5 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/aaada49d/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java index ceb8c80..8841944 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java @@ -50,7 +50,7 @@ public class QuickConnectDirectory extends SimpleDirectory<Connection> { /** * The internal counter for connection IDs. */ - private AtomicInteger connectionId; + private final AtomicInteger connectionId; /** * Creates a new QuickConnectDirectory with the default http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/aaada49d/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java index aa98db7..36a5a8f 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java @@ -25,9 +25,7 @@ import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.auth.AbstractUserContext; import org.apache.guacamole.net.auth.AuthenticationProvider; import org.apache.guacamole.net.auth.ConnectionGroup; -import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.User; -import org.apache.guacamole.net.auth.simple.SimpleDirectory; import org.apache.guacamole.net.auth.simple.SimpleUser; /** http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/aaada49d/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectionGroup.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectionGroup.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectionGroup.java index b087c35..dfb60d1 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectionGroup.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectionGroup.java @@ -39,7 +39,7 @@ public class QuickConnectionGroup extends AbstractConnectionGroup { /** * A set that will store the Connection identifiers for this group. */ - private Set<String> connectionIdentifiers = + private final Set<String> connectionIdentifiers = new HashSet<String>(Collections.<String>emptyList()); /** http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/aaada49d/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java index 559335b..cee7591 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java @@ -38,7 +38,7 @@ public class QuickConnectREST { /** * The connection directory for this REST endpoint. */ - private QuickConnectDirectory directory; + private final QuickConnectDirectory directory; /** * Construct a new QuickConnectREST class, taking in a http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/aaada49d/extensions/guacamole-auth-quickconnect/src/test/java/org/apache/guacamole/auth/quickconnect/utility/QCParserTest.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/test/java/org/apache/guacamole/auth/quickconnect/utility/QCParserTest.java b/extensions/guacamole-auth-quickconnect/src/test/java/org/apache/guacamole/auth/quickconnect/utility/QCParserTest.java index 8a4ed1b..d63a521 100644 --- a/extensions/guacamole-auth-quickconnect/src/test/java/org/apache/guacamole/auth/quickconnect/utility/QCParserTest.java +++ b/extensions/guacamole-auth-quickconnect/src/test/java/org/apache/guacamole/auth/quickconnect/utility/QCParserTest.java @@ -20,7 +20,6 @@ package org.apache.guacamole.auth.quickconnect.utility; import java.io.UnsupportedEncodingException; -import java.util.HashMap; import java.util.Map; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.protocol.GuacamoleConfiguration; @@ -35,6 +34,9 @@ public class QCParserTest { /** * Verify that the parseQueryString() method functions as designed. + * + * @throws UnsupportedEncodingException + * If Java lacks UTF-8 support. */ @Test public void testParseQueryString() throws UnsupportedEncodingException { @@ -51,6 +53,9 @@ public class QCParserTest { /** * Verify that the parseUserInfo() method functions as designed. + * + * @throws UnsupportedEncodingException + * If Java lacks UTF-8 support. */ @Test public void testParseUserInfo() throws UnsupportedEncodingException { @@ -79,6 +84,9 @@ public class QCParserTest { /** * Verify that the getConfiguration() method returns the expected * GuacamoleConfiguration object. + * + * @throws GuacamoleException + * If the configuration cannot be parsed from the given URI. */ @Test public void testGetConfiguration() throws GuacamoleException {
