You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/06/03 19:06:45 UTC
[29/50] guacamole-client git commit: GUACAMOLE-38: REST class only
needs directory, not entire userContext object.
GUACAMOLE-38: REST class only needs directory, not entire userContext object.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/d9751f20
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/d9751f20
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/d9751f20
Branch: refs/heads/master
Commit: d9751f20d0427379e247af803311081f0dcc27cd
Parents: 963593e
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Apr 19 06:29:06 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Jun 1 13:40:52 2018 -0400
----------------------------------------------------------------------
.../auth/quickconnect/QuickConnectUserContext.java | 2 +-
.../auth/quickconnect/rest/QuickConnectREST.java | 15 ++++-----------
2 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d9751f20/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 4382659..d2315e5 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
@@ -114,7 +114,7 @@ public class QuickConnectUserContext extends AbstractUserContext {
@Override
public Object getResource() throws GuacamoleException {
- return new QuickConnectREST(this);
+ return new QuickConnectREST(connectionDirectory);
}
@Override
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d9751f20/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 48dec4c..4b0b9fd 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
@@ -26,7 +26,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.quickconnect.QuickConnectDirectory;
-import org.apache.guacamole.auth.quickconnect.QuickConnectUserContext;
import org.apache.guacamole.auth.quickconnect.utility.QCParser;
/**
@@ -42,25 +41,19 @@ public class QuickConnectREST {
private QuickConnectDirectory directory;
/**
- * The UserContext object for this REST endpoint.
- */
- private QuickConnectUserContext userContext;
-
- /**
* Construct a new QuickConnectREST class, taking in the UserContext
* object that calls this constructor.
*
- * @param userContext
- * The UserContext object associated with this REST endpoint
+ * @param directory
+ * The ConnectionDirectory object associated with this REST endpoint
*
* @throws GuacamoleException
* If the UserContext is unavailable or the directory object
* cannot be retrieved.
*/
- public QuickConnectREST(QuickConnectUserContext userContext)
+ public QuickConnectREST(QuickConnectDirectory directory)
throws GuacamoleException {
- this.userContext = userContext;
- this.directory = this.userContext.getConnectionDirectory();
+ this.directory = directory;
}
/**