GUACAMOLE-197: Clean up imports in various classes.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/440a74e7 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/440a74e7 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/440a74e7 Branch: refs/heads/master Commit: 440a74e71a272adfe615a3eee87f5c41fd50b277 Parents: aba9d83 Author: Nick Couchman <vn...@apache.org> Authored: Mon Jan 15 10:42:46 2018 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Mon Jan 29 17:08:12 2018 -0500 ---------------------------------------------------------------------- .../auth/radius/AuthenticationProviderService.java | 10 ---------- .../guacamole/auth/radius/ConfigurationService.java | 2 -- .../guacamole/auth/radius/RadiusConnectionService.java | 9 +++++---- .../guacamole/auth/radius/form/RadiusStateField.java | 3 --- 4 files changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/440a74e7/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/AuthenticationProviderService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/AuthenticationProviderService.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/AuthenticationProviderService.java index eafdf83..ae9f6bf 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/AuthenticationProviderService.java @@ -36,14 +36,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.jradius.dictionary.Attr_State; import net.jradius.dictionary.Attr_ReplyMessage; -import net.jradius.exception.UnknownAttributeException; import net.jradius.packet.RadiusPacket; import net.jradius.packet.AccessAccept; import net.jradius.packet.AccessChallenge; import net.jradius.packet.AccessReject; -import net.jradius.packet.AccessRequest; -import net.jradius.packet.AccessResponse; -import net.jradius.packet.attribute.AttributeList; import net.jradius.packet.attribute.RadiusAttribute; /** @@ -64,12 +60,6 @@ public class AuthenticationProviderService { private RadiusConnectionService radiusService; /** - * Service for retrieving RADIUS server configuration information. - */ - @Inject - private ConfigurationService confService; - - /** * Provider for AuthenticatedUser objects. */ @Inject http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/440a74e7/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java index 0cfe26b..73241ea 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java @@ -20,8 +20,6 @@ package org.apache.guacamole.auth.radius; import com.google.inject.Inject; -import java.util.Collections; -import java.util.List; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/440a74e7/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java index 345a03d..52e735e 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java @@ -22,22 +22,23 @@ package org.apache.guacamole.auth.radius; import com.google.inject.Inject; import java.io.File; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.net.UnknownHostException; import java.security.NoSuchAlgorithmException; import org.apache.guacamole.GuacamoleException; -import org.apache.guacamole.GuacamoleUnsupportedException; import org.apache.guacamole.environment.LocalEnvironment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.jradius.client.RadiusClient; +import net.jradius.dictionary.Attr_CleartextPassword; +import net.jradius.dictionary.Attr_ReplyMessage; +import net.jradius.dictionary.Attr_State; +import net.jradius.dictionary.Attr_UserName; +import net.jradius.dictionary.Attr_UserPassword; import net.jradius.exception.RadiusException; import net.jradius.packet.RadiusPacket; import net.jradius.packet.AccessRequest; -import net.jradius.dictionary.*; import net.jradius.packet.attribute.AttributeList; -import net.jradius.packet.attribute.RadiusAttribute; import net.jradius.client.auth.EAPTLSAuthenticator; import net.jradius.client.auth.EAPTTLSAuthenticator; import net.jradius.client.auth.RadiusAuthenticator; http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/440a74e7/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/form/RadiusStateField.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/form/RadiusStateField.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/form/RadiusStateField.java index 51d57fe..c7c06c4 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/form/RadiusStateField.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/form/RadiusStateField.java @@ -20,9 +20,6 @@ package org.apache.guacamole.auth.radius.form; import org.apache.guacamole.form.Field; -import org.codehaus.jackson.annotate.JsonProperty; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The invisible field that stores the state of the RADIUS