Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Freva-Ascii-Table-Issue-10 Added utility methods to return rows in ta… #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Freva-Ascii-Table-Issue-10 Added utility methods to return rows in ta… #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 42 additions & 20 deletions src/main/java/com/github/freva/asciitable/AsciiTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;

public class AsciiTable {
public class AsciiTable
{
private static final int MIN_PADDING = 1;

public static final Character[] NO_BORDERS = new Character[29];
Expand All @@ -26,38 +27,53 @@ public class AsciiTable {
public static final Character[] BASIC_ASCII_NO_OUTSIDE_BORDER = {null, null, null, null, null, '|', null,
null, '-', '+', null, null, '|', null, null, '-', '+', null, null, '-', '+', null, null, '|', null, null, null, null, null};

public static final Character[] FANCY_ASCII = {'╔', '═', '╤', '╗', '║', '│', '║', '╠', '═',
public static final Character[] FANCY_ASCII = {'╔', '═', '╤', '╗', '║', '│', '║', '╠', '═',
'╪', '╣', '║', '│', '║', '╟', '─', '┼', '╢', '╠', '═', '╪', '╣', '║', '│', '║', '╚', '═', '╧', '╝'};


public static <T> String getTable(Collection<T> objects, List<ColumnData<T>> columns) {
public static <T> String getTable(Collection<T> objects, List<ColumnData<T>> columns)
{
return getTable(BASIC_ASCII, objects, columns);
}

public static <T> String getTable(Character[] borderChars, Collection<T> objects, List<ColumnData<T>> columns) {
public static <T> String getTable(Character[] borderChars, Collection<T> objects, List<ColumnData<T>> columns)
{
Column[] rawColumns = columns.toArray(new Column[columns.size()]);
String[][] data = objects.stream()
.map(object -> columns.stream()
.map(dataColumn -> dataColumn.getCellValue(object))
return getTable(borderChars, rawColumns, objectCollectionToObjectArray(objects, columns));
}

public static <T> List<String> getTableRows(Character[] borderChars, Collection<T> objects, List<ColumnData<T>> columns)
{
Column[] rawColumns = columns.toArray(new Column[columns.size()]);
return getTableRows(borderChars, rawColumns, objectCollectionToObjectArray(objects, columns));
}

private static <T> String[][] objectCollectionToObjectArray(Collection<T> objects, List<ColumnData<T>> columns)
{
return objects.stream()
.map(object -> columns.stream()
.map(dataColumn -> dataColumn.getCellValue(object))
.toArray(String[]::new))
.toArray(String[][]::new);

return getTable(borderChars, rawColumns, data);
}

public static String getTable(Object[][] data) {
public static String getTable(Object[][] data)
{
return getTable((String[]) null, data);
}

public static String getTable(String[] header, Object[][] data) {
public static String getTable(String[] header, Object[][] data)
{
return getTable(BASIC_ASCII, header, null, data);
}

public static String getTable(String[] header, String[] footer, Object[][] data) {
public static String getTable(String[] header, String[] footer, Object[][] data)
{
return getTable(BASIC_ASCII, header, footer, data);
}

public static String getTable(Character[] borderChars, String[] header, String[] footer, Object[][] data) {
public static String getTable(Character[] borderChars, String[] header, String[] footer, Object[][] data)
{
String[] nonNullHeader = header != null ? header : new String[0];
String[] nonNullFooter = footer != null ? footer : new String[0];

Expand All @@ -70,11 +86,21 @@ public static String getTable(Character[] borderChars, String[] header, String[]
return getTable(borderChars, headerCol, data);
}

public static String getTable(Column[] columns, Object[][] data) {
public static String getTable(Column[] columns, Object[][] data)
{
return getTable(BASIC_ASCII, columns, data);
}

public static String getTable(Character[] borderChars, Column[] rawColumns, Object[][] data) {
public static String getTable(Character[] borderChars, Column[] rawColumns, Object[][] data)
{
List<String> tableRows = getTableRows(borderChars, rawColumns, data);
return tableRows.stream()
.filter(line -> !line.isEmpty())
.collect(Collectors.joining(System.lineSeparator()));
}

public static List<String> getTableRows(Character[] borderChars, Column[] rawColumns, Object[][] data)
{
if (borderChars.length != NO_BORDERS.length)
throw new IllegalArgumentException("Border characters array must be exactly " + NO_BORDERS.length + " elements long");

Expand All @@ -92,11 +118,7 @@ public static String getTable(Character[] borderChars, Column[] rawColumns, Obje
String[] header = Arrays.stream(columns).map(Column::getHeader).toArray(String[]::new);
String[] footer = Arrays.stream(columns).map(Column::getFooter).toArray(String[]::new);

List<String> tableRows = getTableRows(colWidths, headerAligns, dataAligns, footerAligns, borderChars, header, stringData, footer);

return tableRows.stream()
.filter(line -> !line.isEmpty())
.collect(Collectors.joining(System.lineSeparator()));
return getTableRows(colWidths, headerAligns, dataAligns, footerAligns, borderChars, header, stringData, footer);
}

private static List<String> getTableRows(int[] colWidths, HorizontalAlign[] headerAligns,
Expand Down
32 changes: 32 additions & 0 deletions src/test/java/com/github/freva/asciitable/AsciiTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,38 @@ public void testJustify() {
assertJustify(string, string, CENTER, string.length(), 3);
}

@Test
public void testTableRows() {
String[] headers = {"", "Name", "Diameter", "Mass", "Atmosphere"};
String[][] data = {{"1", "Mercury", "0.382", "0.06", "minimal"},
{"2", "Venus", "0.949", "0.82", "Carbon dioxide, Nitrogen"},
{"3", "Earth", "1.000", "1.00", "Nitrogen, Oxygen, Argon"},
{"4", "Mars", "0.532", "0.11", "Carbon dioxide, Nitrogen, Argon"}};

String actualArray = AsciiTable.getTable(headers, null, data);
List<String> actualObjects = AsciiTable.getTableRows(AsciiTable.BASIC_ASCII, planets, Arrays.asList(
new Column().with(planet -> Integer.toString(planet.num)),
new Column().header("Name").with(planet -> planet.name),
new Column().header("Diameter").with(planet -> String.format(Locale.US, "%.03f", planet.diameter)),
new Column().header("Mass").with(planet -> String.format(Locale.US, "%.02f", planet.mass)),
new Column().header("Atmosphere").with(planet -> planet.atmosphere)));

String expected = String.join(System.lineSeparator(),
"+---+---------+----------+------+---------------------------------+",
"| | Name | Diameter | Mass | Atmosphere |",
"+---+---------+----------+------+---------------------------------+",
"| 1 | Mercury | 0.382 | 0.06 | minimal |",
"+---+---------+----------+------+---------------------------------+",
"| 2 | Venus | 0.949 | 0.82 | Carbon dioxide, Nitrogen |",
"+---+---------+----------+------+---------------------------------+",
"| 3 | Earth | 1.000 | 1.00 | Nitrogen, Oxygen, Argon |",
"+---+---------+----------+------+---------------------------------+",
"| 4 | Mars | 0.532 | 0.11 | Carbon dioxide, Nitrogen, Argon |",
"+---+---------+----------+------+---------------------------------+");
assertEquals(expected, actualArray);
assertEquals(expected, String.join(System.lineSeparator(), actualObjects));
}

private static void assertJustify(String expected, String str, HorizontalAlign align, int length, int minPadding) {
StringBuilder sb = new StringBuilder();
AsciiTable.appendJustified(sb, str, align, length, minPadding);
Expand Down