You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2014/11/13 12:49:58 UTC
[31/50] incubator-lens git commit: 1. Removed setter for session
handle in LensConnection 2. Removed unnecessary config from lens-server's
test site.xml
1. Removed setter for session handle in LensConnection
2. Removed unnecessary config from lens-server's test site.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/c2a704c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/c2a704c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/c2a704c1
Branch: refs/heads/toapache
Commit: c2a704c1e6b246a068dbf1627f576248ba9435a1
Parents: acb2618
Author: jdhok <ja...@inmobi.com>
Authored: Wed Nov 12 12:57:07 2014 +0530
Committer: jdhok <ja...@inmobi.com>
Committed: Wed Nov 12 12:57:07 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/lens/client/LensConnection.java | 12 +++++++++++-
.../main/java/org/apache/lens/client/LensMLClient.java | 2 +-
.../org/apache/lens/client/LensMLJerseyClient.java | 1 -
lens-server/src/test/resources/lens-site.xml | 13 -------------
4 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/c2a704c1/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensConnection.java b/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
index bf63ee7..bc07e68 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
@@ -60,7 +60,6 @@ public class LensConnection {
/** The session handle. */
@Getter
- @Setter
private LensSessionHandle sessionHandle;
/**
@@ -74,6 +73,17 @@ public class LensConnection {
}
/**
+ * Construct a connection to lens server specified by connection parameters with an already established session
+ *
+ * @param params
+ * parameters to be used for creating a connection
+ */
+ public LensConnection(LensConnectionParams params, LensSessionHandle sessionHandle) {
+ this.params = params;
+ this.sessionHandle = sessionHandle;
+ }
+
+ /**
* Check if the connection is opened. Please note that,lens connections are persistent connections. But a session
* mapped by ID running on the lens server.
*
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/c2a704c1/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
index f880ead..5c5bc65 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
@@ -71,7 +71,7 @@ public class LensMLClient implements LensML, Closeable {
* the client conf
*/
public LensMLClient(LensConnectionParams clientConf, LensSessionHandle sessionHandle) {
- client = new LensMLJerseyClient(new LensConnection(clientConf), sessionHandle);
+ client = new LensMLJerseyClient(new LensConnection(clientConf, sessionHandle), sessionHandle);
LOG.info("Client created with existing session");
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/c2a704c1/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
index 3e41f52..0cc1824 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
@@ -80,7 +80,6 @@ public class LensMLJerseyClient {
public LensMLJerseyClient(LensConnection connection, LensSessionHandle sessionHandle) {
this.connection = connection;
this.sessionHandle = sessionHandle;
- connection.setSessionHandle(sessionHandle);
}
protected WebTarget getMLWebTarget() {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/c2a704c1/lens-server/src/test/resources/lens-site.xml
----------------------------------------------------------------------
diff --git a/lens-server/src/test/resources/lens-site.xml b/lens-server/src/test/resources/lens-site.xml
index 1dfb0b6..ebf4ddb 100644
--- a/lens-server/src/test/resources/lens-site.xml
+++ b/lens-server/src/test/resources/lens-site.xml
@@ -136,17 +136,4 @@
<value>org.apache.lens.server.MockNonLensService</value>
<description>Implementation class for session service</description>
</property>
-
-<property>
- <name>lens.server.ws.resourcenames</name>
- <value>session,metastore,query,quota,scheduler,index,ml</value>
- <description>These JAX-RS resources would be started in the specified order when lens-server starts up</description>
-</property>
-
-<property>
- <name>lens.server.ml.ws.resource.impl</name>
- <value>org.apache.lens.server.ml.MLServiceResource</value>
- <description>Implementation class for Session Resource</description>
-</property>
-
</configuration>