1
0

Replace Non-Compliant dnl.utils package with Apache 2.0 licensed alternative

This commit is contained in:
Balaji Varadarajan
2019-06-06 17:15:45 -07:00
committed by Balaji Varadarajan
parent a0391b7c01
commit 5ae34db764
2 changed files with 17 additions and 24 deletions

View File

@@ -153,13 +153,10 @@
<artifactId>spark-sql_2.11</artifactId> <artifactId>spark-sql_2.11</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dnl.utils</groupId> <groupId>com.jakewharton.fliptables</groupId>
<artifactId>textutils</artifactId> <artifactId>fliptables</artifactId>
<version>0.3.3</version> <version>1.0.2</version>
<scope>system</scope>
<systemPath>${basedir}/lib/dnl/utils/textutils/0.3.3/textutils-0.3.3.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -16,10 +16,7 @@
package com.uber.hoodie.cli; package com.uber.hoodie.cli;
import dnl.utils.text.table.TextTable; import com.jakewharton.fliptables.FlipTable;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.nio.charset.Charset;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@@ -32,19 +29,20 @@ public class HoodiePrintHelper {
/** /**
* Print header and raw rows * Print header and raw rows
*
* @param header Header * @param header Header
* @param rows Raw Rows * @param rows Raw Rows
* @return output * @return output
*/ */
public static String print(String[] header, String[][] rows) { public static String print(String[] header, String[][] rows) {
TextTable textTable = new TextTable(header, rows); return printTextTable(header, rows);
return printTextTable(textTable);
} }
/** /**
* Serialize Table to printable string * Serialize Table to printable string
*
* @param rowHeader Row Header * @param rowHeader Row Header
* @param fieldNameToConverterMap Field Specific Converters * @param fieldNameToConverterMap Field Specific Converters
* @param sortByField Sorting field * @param sortByField Sorting field
* @param isDescending Order * @param isDescending Order
* @param limit Limit * @param limit Limit
@@ -71,6 +69,7 @@ public class HoodiePrintHelper {
/** /**
* Render rows in Table * Render rows in Table
*
* @param buffer Table * @param buffer Table
* @return output * @return output
*/ */
@@ -81,31 +80,28 @@ public class HoodiePrintHelper {
String[][] rows = buffer.getRenderRows().stream() String[][] rows = buffer.getRenderRows().stream()
.map(l -> l.stream().toArray(String[]::new)) .map(l -> l.stream().toArray(String[]::new))
.toArray(String[][]::new); .toArray(String[][]::new);
TextTable textTable = new TextTable(header, rows); return printTextTable(header, rows);
return printTextTable(textTable);
} }
/** /**
* Render only header of the table * Render only header of the table
*
* @param header Table Header * @param header Table Header
* @return output * @return output
*/ */
private static String print(TableHeader header) { private static String print(TableHeader header) {
String[] head = new String[header.getFieldNames().size()]; String[] head = new String[header.getFieldNames().size()];
header.getFieldNames().toArray(head); header.getFieldNames().toArray(head);
TextTable textTable = new TextTable(head, new String[][]{}); return printTextTable(head, new String[][]{});
return printTextTable(textTable);
} }
/** /**
* Print Text table * Print Text table
* @param textTable Text table to be printed *
* @return * @param headers Headers
* @param data Table
*/ */
private static String printTextTable(TextTable textTable) { private static String printTextTable(String[] headers, String[][] data) {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); return FlipTable.of(headers, data);
PrintStream ps = new PrintStream(baos);
textTable.printTable(ps, 4);
return new String(baos.toByteArray(), Charset.forName("utf-8"));
} }
} }