Repository: ranger Updated Branches: refs/heads/master a98dc785a -> 6014e64a0
RANGER-1838: Refactor Jisql dependencies Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/6014e64a Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/6014e64a Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/6014e64a Branch: refs/heads/master Commit: 6014e64a0fcfe957f4a0ee7e52cc29139b63ac92 Parents: a98dc78 Author: pradeep <[email protected]> Authored: Mon Oct 16 09:28:55 2017 +0530 Committer: pradeep <[email protected]> Committed: Mon Oct 16 18:45:47 2017 +0530 ---------------------------------------------------------------------- jisql/pom.xml | 5 ---- .../util/outputformatter/CSVFormatter.java | 29 ++------------------ .../main/java/org/apache/util/sql/Jisql.java | 4 +-- src/main/assembly/admin-web.xml | 1 - src/main/assembly/kms.xml | 1 - 5 files changed, 3 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/6014e64a/jisql/pom.xml ---------------------------------------------------------------------- diff --git a/jisql/pom.xml b/jisql/pom.xml index efb1dff..3c560eb 100644 --- a/jisql/pom.xml +++ b/jisql/pom.xml @@ -29,11 +29,6 @@ </parent> <dependencies> <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - <version>2.0</version> - </dependency> - <dependency> <groupId>net.sf.jopt-simple</groupId> <artifactId>jopt-simple</artifactId> <version>3.2</version> http://git-wip-us.apache.org/repos/asf/ranger/blob/6014e64a/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java ---------------------------------------------------------------------- diff --git a/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java b/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java index 158e25c..d55ecbc 100644 --- a/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java +++ b/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java @@ -22,15 +22,9 @@ package org.apache.util.outputformatter; import java.io.PrintStream; import java.sql.ResultSet; import java.sql.ResultSetMetaData; - -import java.nio.charset.Charset; - import joptsimple.OptionParser; import joptsimple.OptionSet; -import com.csvreader.CsvWriter; - - /** * This is the default formatter for Jisql. It outputs data in a "normal" * format that is similar to most other database command line formatters. @@ -117,8 +111,7 @@ public class CSVFormatter implements JisqlFormatter { /** - * Called to output the data. This class uses a third party library to output - * the CSV data. The library escapes the data as needed. + * Called to output the data. * * @param out the PrintStream to output data to. * @param resultSet the ResultSet for the row. @@ -126,25 +119,7 @@ public class CSVFormatter implements JisqlFormatter { * * */ - public void formatData( PrintStream out, ResultSet resultSet, ResultSetMetaData metaData ) throws Exception { - - CsvWriter csvWriter = new CsvWriter( out, delimiter, Charset.forName( "us-ascii" ) ); - - while( resultSet.next() ) { - int numColumns = metaData.getColumnCount(); - - for (int i = 1; i <= numColumns; i++) { - String result = resultSet.getString(i); - if( !resultSet.wasNull() ) - csvWriter.write( result ); - else - csvWriter.write( "" ); - } - - csvWriter.endRecord(); - } - - csvWriter.flush(); + public void formatData( PrintStream out, ResultSet resultSet, ResultSetMetaData metaData ) throws Exception{ } http://git-wip-us.apache.org/repos/asf/ranger/blob/6014e64a/jisql/src/main/java/org/apache/util/sql/Jisql.java ---------------------------------------------------------------------- diff --git a/jisql/src/main/java/org/apache/util/sql/Jisql.java b/jisql/src/main/java/org/apache/util/sql/Jisql.java index cf5f2c4..53a6ca4 100644 --- a/jisql/src/main/java/org/apache/util/sql/Jisql.java +++ b/jisql/src/main/java/org/apache/util/sql/Jisql.java @@ -62,9 +62,7 @@ import org.apache.util.outputformatter.JisqlFormatter; * default is the term "go" on a single line like Sybase's isql or MS/SQL's * isql/osql. Note that there is a dependency on <a * href="http://jopt-simple.sourceforge.net/";>JOpt Simple</a> in for the base - * configuration. Additionally, if you are using the CSVFormatter then it is - * dependent on <a href="http://sourceforge.net/projects/javacsv/";>Java CSV</a>. - * <p> + * configuration. * * * Options: http://git-wip-us.apache.org/repos/asf/ranger/blob/6014e64a/src/main/assembly/admin-web.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml index 0e97818..4dc52fd 100644 --- a/src/main/assembly/admin-web.xml +++ b/src/main/assembly/admin-web.xml @@ -266,7 +266,6 @@ <outputDirectory>/jisql/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>net.sourceforge.javacsv:javacsv</include> <include>net.sf.jopt-simple:jopt-simple</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/ranger/blob/6014e64a/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 1d7116a..7c40ce4 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -165,7 +165,6 @@ <outputDirectory>/jisql/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>net.sourceforge.javacsv:javacsv</include> <include>net.sf.jopt-simple:jopt-simple</include> </includes> </dependencySet>
