You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pr...@apache.org on 2015/08/11 14:20:43 UTC
[20/50] [abbrv] incubator-lens git commit: LENS-680 : Remove commons
logging dependency
LENS-680 : Remove commons logging dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/03444ba6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/03444ba6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/03444ba6
Branch: refs/heads/current-release-line
Commit: 03444ba6ac1c1742536991c0e8d9ca31429873e7
Parents: 11593f4
Author: Amareshwari Sriramadasu <am...@gmail.com>
Authored: Wed Jul 29 10:28:38 2015 +0530
Committer: Raju Bairishetti <ra...@apache.org>
Committed: Wed Jul 29 10:28:38 2015 +0530
----------------------------------------------------------------------
lens-client/pom.xml | 8 --------
.../java/org/apache/lens/client/LensClient.java | 8 ++++----
.../org/apache/lens/client/LensStatement.java | 14 +++++++-------
lens-dist/pom.xml | 4 ++++
lens-ml-lib/pom.xml | 4 ----
.../lens/lib/query/FilePersistentFormatter.java | 12 ++++--------
.../lens/lib/query/WrappedFileFormatter.java | 7 -------
pom.xml | 18 ++++++++++++------
8 files changed, 31 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index c7ddc7a..d83f830 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -39,10 +39,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.lens</groupId>
<artifactId>lens-server</artifactId>
<version>${project.version}</version>
@@ -138,9 +134,5 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/lens-client/src/main/java/org/apache/lens/client/LensClient.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensClient.java b/lens-client/src/main/java/org/apache/lens/client/LensClient.java
index 9ff2124..57c672c 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensClient.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensClient.java
@@ -34,8 +34,8 @@ import org.apache.lens.client.model.BriefError;
import org.apache.lens.client.model.IdBriefErrorTemplate;
import org.apache.lens.client.model.IdBriefErrorTemplateKey;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
@@ -57,8 +57,8 @@ public class LensClient {
Maps.newHashMap();
private final LensStatement statement;
- public static Log getCliLooger() {
- return LogFactory.getLog(CLILOGGER);
+ public static Logger getCliLooger() {
+ return LoggerFactory.getLogger(CLILOGGER);
}
public LensClient() {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensStatement.java b/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
index 1ecf145..4612f6a 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
@@ -193,27 +193,27 @@ public class LensStatement {
* @param handle the handle
*/
public void waitForQueryToComplete(QueryHandle handle) {
- LensClient.getCliLooger().info("Query handle: " + handle);
+ LensClient.getCliLooger().info("Query handle: {}", handle);
query = getQuery(handle);
while (query.queued()) {
query = getQuery(handle);
- LensClient.getCliLooger().debug("Query " + handle + " status: " + query.getStatus());
+ LensClient.getCliLooger().debug("Query {} status: {}", handle, query.getStatus());
try {
Thread.sleep(connection.getLensConnectionParams().getQueryPollInterval());
} catch (InterruptedException e) {
throw new IllegalStateException(e);
}
}
- LensClient.getCliLooger().info("User query: '" + query.getUserQuery()
- + "' was submitted to " + query.getSelectedDriverClassName());
+ LensClient.getCliLooger().info("User query: '{}' was submitted to {}", query.getUserQuery(),
+ query.getSelectedDriverClassName());
if (query.getDriverQuery() != null) {
- LensClient.getCliLooger().info(" Driver query: '" + query.getDriverQuery()
- + "' and Driver handle: " + query.getDriverOpHandle());
+ LensClient.getCliLooger().info(" Driver query: '{}' and Driver handle: {}", query.getDriverQuery(),
+ query.getDriverOpHandle());
}
while (!query.getStatus().finished()
&& !(query.getStatus().toString().equals(Status.CLOSED.toString()))) {
query = getQuery(handle);
- LensClient.getCliLooger().info(query.getStatus());
+ LensClient.getCliLooger().info("Query Status:{} ", query.getStatus());
try {
Thread.sleep(connection.getLensConnectionParams().getQueryPollInterval());
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 15d62d3..cea9906 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -125,6 +125,10 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index a05d2dd..d348d3b 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -97,10 +97,6 @@
<artifactId>hive-hcatalog-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
----------------------------------------------------------------------
diff --git a/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java b/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
index c067365..b3e640f 100644
--- a/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
+++ b/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
@@ -29,25 +29,21 @@ import org.apache.lens.server.api.driver.LensResultSetMetadata;
import org.apache.lens.server.api.query.PersistedOutputFormatter;
import org.apache.lens.server.api.query.QueryContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
+import lombok.extern.slf4j.Slf4j;
+
/**
* File formatter for {@link PersistedOutputFormatter}
* <p></p>
* This is a {@link WrappedFileFormatter} which can wrap any {@link FileFormatter}.
*/
+@Slf4j
public class FilePersistentFormatter extends WrappedFileFormatter implements PersistedOutputFormatter {
- /**
- * The Constant LOG.
- */
- public static final Log LOG = LogFactory.getLog(FilePersistentFormatter.class);
-
/*
* (non-Javadoc)
*
@@ -123,7 +119,7 @@ public class FilePersistentFormatter extends WrappedFileFormatter implements Per
}
for (Map.Entry<PartFile, FileStatus> entry : partFileMap.entrySet()) {
- LOG.info("Processing file:" + entry.getValue().getPath());
+ log.info("Processing file:{}", entry.getValue().getPath());
BufferedReader in = null;
try {
// default encoding in hadoop filesystem is utf-8
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/lens-query-lib/src/main/java/org/apache/lens/lib/query/WrappedFileFormatter.java
----------------------------------------------------------------------
diff --git a/lens-query-lib/src/main/java/org/apache/lens/lib/query/WrappedFileFormatter.java b/lens-query-lib/src/main/java/org/apache/lens/lib/query/WrappedFileFormatter.java
index 270f0f0..aa66b7b 100644
--- a/lens-query-lib/src/main/java/org/apache/lens/lib/query/WrappedFileFormatter.java
+++ b/lens-query-lib/src/main/java/org/apache/lens/lib/query/WrappedFileFormatter.java
@@ -24,8 +24,6 @@ import org.apache.lens.server.api.driver.LensResultSetMetadata;
import org.apache.lens.server.api.query.QueryContext;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
/**
@@ -39,11 +37,6 @@ public abstract class WrappedFileFormatter extends AbstractOutputFormatter {
*/
private AbstractFileFormatter formatter;
- /**
- * The Constant LOG.
- */
- public static final Log LOG = LogFactory.getLog(FilePersistentFormatter.class);
-
/*
* (non-Javadoc)
*
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/03444ba6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 15ac998..b395658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
<hive.version>0.13.3-inm</hive.version>
<!-- common library/framework versions -->
- <commons.logging.version>1.1.1</commons.logging.version>
<slf4j.version>1.7.6</slf4j.version>
<log4j.version>1.2.16</log4j.version>
<commons.lang.version>2.4</commons.lang.version>
@@ -721,11 +720,6 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons.lang.version}</version>
@@ -819,6 +813,10 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -895,6 +893,10 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -929,6 +931,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>