From 6c71f4ddb3b7863864f1081b178acccbb7e9fe0d Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Sat, 24 Mar 2018 20:37:19 -0400
Subject: [PATCH] GUACAMOLE-38: Brush up comments and removed some extra code.

---
 extensions/guacamole-auth-quickconnect/pom.xml        |  7 ++++---
 .../QuickConnectAuthenticationProvider.java           |  4 ----
 .../guacamole/auth/quickconnect/utility/QCParser.java | 11 ++++++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml
index 87ee7bd7a..717f42c96 100644
--- a/extensions/guacamole-auth-quickconnect/pom.xml
+++ b/extensions/guacamole-auth-quickconnect/pom.xml
@@ -187,9 +187,10 @@
 
         <!-- Jersey - JAX-RS Implementation -->
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>1.17.1</version>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Guice -->
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java
index f725bdfce..c8097094a 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java
@@ -63,10 +63,6 @@ public class QuickConnectAuthenticationProvider extends SimpleAuthenticationProv
     public AuthenticatedUser authenticateUser(Credentials credentials)
         throws GuacamoleException {
 
-        String username = credentials.getUsername();
-        if (username == null || username.isEmpty())
-            throw new GuacamoleInvalidCredentialsException("You must login.", CredentialsInfo.USERNAME_PASSWORD);
-
         return null;
 
     }
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
index 05b892fcc..3de9e80c4 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
@@ -27,10 +27,15 @@ import org.apache.guacamole.GuacamoleClientException;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
+/**
+ * A utility class to parse out a URI into the settings necessary
+ * to create and establish a Guacamole connection.
+ */
 public class QCParser {
 
     /**
-     * The default protocol to parse to if one is undefined.
+     * The default protocol to parse to if one is provided in
+     * the incoming URI..
      */
     public static final String DEFAULT_URI_PROTOCOL = "ssh";
 
@@ -71,7 +76,7 @@ public class QCParser {
         }
         String protocol = qcUri.getScheme();
         String host = qcUri.getHost();
-        Integer port = qcUri.getPort();
+        int port = qcUri.getPort();
         String userInfo = qcUri.getUserInfo();
         String query = qcUri.getQuery();
         String username = null;
@@ -101,7 +106,7 @@ public class QCParser {
         GuacamoleConfiguration qcConfig = new GuacamoleConfiguration();
         qcConfig.setProtocol(protocol);
         qcConfig.setParameter("hostname",host);
-        qcConfig.setParameter("port", port.toString());
+        qcConfig.setParameter("port", Integer.toString(port));
 
         if (username != null)
             qcConfig.setParameter("username", username);