Repository: incubator-lens
Updated Branches:
refs/heads/master 51c52eb3e -> b33e4c577
LENS-391 : Fix static instance and logger in lens-client (Rajat Khandelwal via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/b33e4c57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/b33e4c57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/b33e4c57
Branch: refs/heads/master
Commit: b33e4c577949e7cc2b9e5dfb09494a8222f440bf
Parents: 51c52eb
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Mon Mar 16 18:02:13 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Mar 16 18:02:13 2015 +0530
----------------------------------------------------------------------
.../org/apache/lens/cli/commands/BaseLensCommand.java | 2 +-
.../lens/client/LensClientSingletonWrapper.java | 14 ++++++++++----
.../apache/lens/examples/PopulateSampleMetastore.java | 4 ++--
.../org/apache/lens/examples/SampleMetastore.java | 4 ++--
.../java/org/apache/lens/examples/SampleQueries.java | 6 +++---
5 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b33e4c57/lens-cli/src/main/java/org/apache/lens/cli/commands/BaseLensCommand.java
----------------------------------------------------------------------
diff --git a/lens-cli/src/main/java/org/apache/lens/cli/commands/BaseLensCommand.java b/lens-cli/src/main/java/org/apache/lens/cli/commands/BaseLensCommand.java
index 4721d2a..cdfdbe8 100644
--- a/lens-cli/src/main/java/org/apache/lens/cli/commands/BaseLensCommand.java
+++ b/lens-cli/src/main/java/org/apache/lens/cli/commands/BaseLensCommand.java
@@ -102,7 +102,7 @@ public class BaseLensCommand {
}
public static LensClientSingletonWrapper getClientWrapper() {
- return LensClientSingletonWrapper.INSTANCE;
+ return LensClientSingletonWrapper.instance();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b33e4c57/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java b/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
index 2969062..165d41d 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
@@ -26,10 +26,16 @@ import org.apache.commons.logging.LogFactory;
/**
* The Enum LensClientSingletonWrapper.
*/
-public enum LensClientSingletonWrapper {
+public class LensClientSingletonWrapper {
/** The instance. */
- INSTANCE;
+ public static class InstanceHolder {
+ public static final LensClientSingletonWrapper INSTANCE = new LensClientSingletonWrapper();
+ }
+
+ public static LensClientSingletonWrapper instance() {
+ return InstanceHolder.INSTANCE;
+ }
/** The log. */
private static final Log LOG = LogFactory.getLog(LensClientSingletonWrapper.class);
@@ -72,7 +78,7 @@ public enum LensClientSingletonWrapper {
* @param e the e
*/
public void explainFailedAttempt(LensClientServerConnectionException e) {
-// LOG.error("failed login attempt", e);
+ LOG.error("failed login attempt", e);
switch (e.getErrorCode()) {
case 401:
System.console().printf("username/password combination incorrect.\n");
@@ -81,7 +87,7 @@ public enum LensClientSingletonWrapper {
System.console().printf("server unresponsive, Returned error code 500\n");
break;
default:
- System.console().printf("Unknown error in authenticating with the server. Error code = %d\n", e.getErrorCode());
+ System.console().printf("ERROR: " + e.getMessage() + "\n");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b33e4c57/lens-examples/src/main/java/org/apache/lens/examples/PopulateSampleMetastore.java
----------------------------------------------------------------------
diff --git a/lens-examples/src/main/java/org/apache/lens/examples/PopulateSampleMetastore.java b/lens-examples/src/main/java/org/apache/lens/examples/PopulateSampleMetastore.java
index bbbc38e..6604553 100644
--- a/lens-examples/src/main/java/org/apache/lens/examples/PopulateSampleMetastore.java
+++ b/lens-examples/src/main/java/org/apache/lens/examples/PopulateSampleMetastore.java
@@ -34,11 +34,11 @@ public class PopulateSampleMetastore {
private int retCode = 0;
public PopulateSampleMetastore() throws JAXBException {
- metaClient = new LensMetadataClient(LensClientSingletonWrapper.INSTANCE.getClient().getConnection());
+ metaClient = new LensMetadataClient(LensClientSingletonWrapper.instance().getClient().getConnection());
}
public void close() {
- LensClientSingletonWrapper.INSTANCE.getClient().closeConnection();
+ LensClientSingletonWrapper.instance().getClient().closeConnection();
}
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b33e4c57/lens-examples/src/main/java/org/apache/lens/examples/SampleMetastore.java
----------------------------------------------------------------------
diff --git a/lens-examples/src/main/java/org/apache/lens/examples/SampleMetastore.java b/lens-examples/src/main/java/org/apache/lens/examples/SampleMetastore.java
index 713acf3..09be3f2 100644
--- a/lens-examples/src/main/java/org/apache/lens/examples/SampleMetastore.java
+++ b/lens-examples/src/main/java/org/apache/lens/examples/SampleMetastore.java
@@ -56,11 +56,11 @@ public class SampleMetastore {
}
public SampleMetastore() throws JAXBException {
- metaClient = new LensMetadataClient(LensClientSingletonWrapper.INSTANCE.getClient().getConnection());
+ metaClient = new LensMetadataClient(LensClientSingletonWrapper.instance().getClient().getConnection());
}
public void close() {
- LensClientSingletonWrapper.INSTANCE.getClient().closeConnection();
+ LensClientSingletonWrapper.instance().getClient().closeConnection();
}
public void createCube() throws JAXBException, IOException {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b33e4c57/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
----------------------------------------------------------------------
diff --git a/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java b/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
index fa9418c..eac0e0b 100644
--- a/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
+++ b/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
@@ -52,15 +52,15 @@ public class SampleQueries {
* @throws JAXBException the JAXB exception
*/
public SampleQueries() throws JAXBException {
- metaClient = new LensMetadataClient(LensClientSingletonWrapper.INSTANCE.getClient().getConnection());
- queryClient = new LensStatement(LensClientSingletonWrapper.INSTANCE.getClient().getConnection());
+ metaClient = new LensMetadataClient(LensClientSingletonWrapper.instance().getClient().getConnection());
+ queryClient = new LensStatement(LensClientSingletonWrapper.instance().getClient().getConnection());
}
/**
* Close.
*/
public void close() {
- LensClientSingletonWrapper.INSTANCE.getClient().closeConnection();
+ LensClientSingletonWrapper.instance().getClient().closeConnection();
}
/**