GUACAMOLE-38: Clean up unnecessary imports and tweak style issues.

This commit is contained in:
Nick Couchman
2017-08-11 20:45:39 -04:00
parent ee539597cd
commit 531725671b
5 changed files with 3 additions and 38 deletions

View File

@@ -19,10 +19,7 @@
package org.apache.guacamole.auth.quickconnect; package org.apache.guacamole.auth.quickconnect;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.net.auth.AuthenticatedUser; import org.apache.guacamole.net.auth.AuthenticatedUser;
@@ -32,10 +29,6 @@ import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsExce
import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider; import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider;
import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.UserContext;
import org.apache.guacamole.protocol.GuacamoleConfiguration; import org.apache.guacamole.protocol.GuacamoleConfiguration;
import org.apache.guacamole.token.StandardTokens;
import org.apache.guacamole.token.TokenFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Class providing the necessary hooks into the Guacamole Client authentication * Class providing the necessary hooks into the Guacamole Client authentication
@@ -44,11 +37,6 @@ import org.slf4j.LoggerFactory;
*/ */
public class QuickConnectAuthenticationProvider extends SimpleAuthenticationProvider { public class QuickConnectAuthenticationProvider extends SimpleAuthenticationProvider {
/**
* Logger for this class.
*/
private final Logger logger = LoggerFactory.getLogger(QuickConnectAuthenticationProvider.class);
/** /**
* userContext for this authentication provider. * userContext for this authentication provider.
*/ */

View File

@@ -19,7 +19,6 @@
package org.apache.guacamole.auth.quickconnect; package org.apache.guacamole.auth.quickconnect;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;

View File

@@ -19,17 +19,11 @@
package org.apache.guacamole.auth.quickconnect; package org.apache.guacamole.auth.quickconnect;
import com.google.inject.Inject;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Set;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.net.auth.ConnectionGroup; import org.apache.guacamole.net.auth.ConnectionGroup;
import org.apache.guacamole.net.auth.simple.SimpleConnection;
import org.apache.guacamole.net.auth.simple.SimpleConnectionDirectory; import org.apache.guacamole.net.auth.simple.SimpleConnectionDirectory;
import org.apache.guacamole.net.auth.Connection; import org.apache.guacamole.net.auth.Connection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Implementation of the Connection Directory, stored * Implementation of the Connection Directory, stored
@@ -37,11 +31,6 @@ import org.slf4j.LoggerFactory;
*/ */
public class QuickConnectDirectory extends SimpleConnectionDirectory { public class QuickConnectDirectory extends SimpleConnectionDirectory {
/**
* Logger for this class.
*/
private final Logger logger = LoggerFactory.getLogger(QuickConnectDirectory.class);
/** /**
* The unique identifier of the root connection group. * The unique identifier of the root connection group.
*/ */
@@ -64,6 +53,8 @@ public class QuickConnectDirectory extends SimpleConnectionDirectory {
* @param connections * @param connections
* A Collection of all connections that should be present in this * A Collection of all connections that should be present in this
* connection directory. * connection directory.
* @param rootGroup
* A group that should be at the base of this directory.
*/ */
public QuickConnectDirectory(Collection<Connection> connections, ConnectionGroup rootGroup) { public QuickConnectDirectory(Collection<Connection> connections, ConnectionGroup rootGroup) {
super(connections); super(connections);

View File

@@ -19,11 +19,8 @@
package org.apache.guacamole.auth.quickconnect; package org.apache.guacamole.auth.quickconnect;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map;
import java.util.UUID;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.form.Form; import org.apache.guacamole.form.Form;
import org.apache.guacamole.net.auth.ActiveConnection; import org.apache.guacamole.net.auth.ActiveConnection;
@@ -35,16 +32,11 @@ import org.apache.guacamole.net.auth.Directory;
import org.apache.guacamole.net.auth.SharingProfile; import org.apache.guacamole.net.auth.SharingProfile;
import org.apache.guacamole.net.auth.User; import org.apache.guacamole.net.auth.User;
import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.UserContext;
import org.apache.guacamole.net.auth.simple.SimpleConnection;
import org.apache.guacamole.net.auth.simple.SimpleConnectionGroup;
import org.apache.guacamole.net.auth.simple.SimpleConnectionGroupDirectory; import org.apache.guacamole.net.auth.simple.SimpleConnectionGroupDirectory;
import org.apache.guacamole.net.auth.simple.SimpleConnectionRecordSet; import org.apache.guacamole.net.auth.simple.SimpleConnectionRecordSet;
import org.apache.guacamole.net.auth.simple.SimpleDirectory; import org.apache.guacamole.net.auth.simple.SimpleDirectory;
import org.apache.guacamole.net.auth.simple.SimpleUser; import org.apache.guacamole.net.auth.simple.SimpleUser;
import org.apache.guacamole.net.auth.simple.SimpleUserDirectory; import org.apache.guacamole.net.auth.simple.SimpleUserDirectory;
import org.apache.guacamole.protocol.GuacamoleConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* A simple implementation of UserContext to support the QuickConnect * A simple implementation of UserContext to support the QuickConnect
@@ -53,11 +45,6 @@ import org.slf4j.LoggerFactory;
*/ */
public class QuickConnectUserContext implements UserContext { public class QuickConnectUserContext implements UserContext {
/**
* Logger for this class.
*/
private final Logger logger = LoggerFactory.getLogger(QuickConnectUserContext.class);
/** /**
* The unique identifier of the root connection group. * The unique identifier of the root connection group.
*/ */

View File

@@ -147,7 +147,7 @@ angular.module('guacQuickConnect').controller('quickconnectController', ['$scope
// Set up the name of the connection based on various parts of the URI // Set up the name of the connection based on various parts of the URI
var connName = urlArray[3] + '://'; var connName = urlArray[3] + '://';
if(!(typeof connParams['username'] === 'undefined')) if (!(typeof connParams['username'] === 'undefined'))
connName += connParams['username'] + '@'; connName += connParams['username'] + '@';
connName += connParams['hostname'] + ':' + connParams['port']; connName += connParams['hostname'] + ':' + connParams['port'];