Skip to content

Commit e75ccc6

Browse files
actions-useractions-user
committed
a reformat code
1 parent 2b2102b commit e75ccc6

File tree

13 files changed

+133
-113
lines changed

13 files changed

+133
-113
lines changed

‎approvaltests-tests/src/test/java/org/approvaltests/StoryBoardTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void gameOfLifeWithDescription()
4242
Approvals.verify(storyboard);
4343
}
4444
@Test
45-
// @UseReporter(QuietReporter.class)
45+
// @UseReporter(QuietReporter.class)
4646
void gameOfLifeInMarkdown()
4747
{
4848
GameOfLife gameOfLife = new GameOfLife((x, y) -> y == 2 && 1 <= x && x <= 3);

‎approvaltests-tests/src/test/java/org/approvaltests/TableTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ public class TableTest
1010
void abilityModifier()
1111
{
1212
Integer[] inputs = Range.get(1, 20);
13-
VerifiableMarkdownTable table = VerifiableMarkdownTable.create(inputs, a -> getModifier(a), "Score", "Modifier");
13+
VerifiableMarkdownTable table = VerifiableMarkdownTable.create(inputs, a -> getModifier(a), "Score",
14+
"Modifier");
1415
Approvals.verify(table);
1516
}
1617
@Test
1718
void differentCases()
1819
{
1920
// begin-snippet: markdown_table_example
2021
String[] inputs = {"verify json", "verify all", "verify parameters", "verify as json"};
21-
VerifiableMarkdownTable table = VerifiableMarkdownTable.withHeaders("Input", "Camel Case", "Snake Case", "Kebab Case");
22+
VerifiableMarkdownTable table = VerifiableMarkdownTable.withHeaders("Input", "Camel Case", "Snake Case",
23+
"Kebab Case");
2224
table.addRowsForInputs(inputs, this::toCamelCase, this::toSnakeCase, this::toKebabCase);
2325
Approvals.verify(table);
2426
// end-snippet

‎approvaltests-util-tests/src/test/java/com/spun/util/DateUtilsTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616

1717
public class DateUtilsTest
1818
{
19-
private StartAndEndUseCases[] getStartAndEndUseCases() {
20-
return new StartAndEndUseCases[] {new StartAndEndUseCases(Calendar.YEAR,
21-
"2003.05.03 15:20:20:123", "2003.01.01 00:00:00:000", "2003.12.31 23:59:59:999")};
19+
private StartAndEndUseCases[] getStartAndEndUseCases()
20+
{
21+
return new StartAndEndUseCases[]{new StartAndEndUseCases(Calendar.YEAR, "2003.05.03 15:20:20:123",
22+
"2003.01.01 00:00:00:000", "2003.12.31 23:59:59:999")};
2223
}
2324
@Test
2425
public void testToDate()
@@ -51,8 +52,8 @@ public void testStartAndEndUseCases()
5152
}
5253
private void assertStartAndEnd(StartAndEndUseCases useCase)
5354
{
54-
assertEquals(useCase.start, DateUtils.getStartOf(useCase.unit, useCase.date), "Start date ");
55-
assertEquals(useCase.end, DateUtils.getEndOf(useCase.unit, useCase.date), "End date ");
55+
assertEquals(useCase.start, DateUtils.getStartOf(useCase.unit, useCase.date), "Start date ");
56+
assertEquals(useCase.end, DateUtils.getEndOf(useCase.unit, useCase.date), "End date ");
5657
}
5758
@Test
5859
public void testNextAndLast()

‎approvaltests-util/src/main/java/com/spun/util/MarkdownTable.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
public class MarkdownTable implements MarkdownCompatible
77
{
8-
public Queryable<MarkdownTableElement> markdown = new Queryable<MarkdownTableElement>(MarkdownTableElement.class);
9-
private boolean fixedWidth = true;
10-
11-
public void setColumnsConsistentWidth(boolean setting) {
8+
public Queryable<MarkdownTableElement> markdown = new Queryable<MarkdownTableElement>(
9+
MarkdownTableElement.class);
10+
private boolean fixedWidth = true;
11+
public void setColumnsConsistentWidth(boolean setting)
12+
{
1213
fixedWidth = setting;
1314
}
1415
public static <I, O> MarkdownTable create(I[] inputs, Function1<I, O> o, String column1, String column2)
@@ -56,31 +57,32 @@ public String toMarkdown()
5657
handleFixedWidth();
5758
return render(markdown);
5859
}
59-
60-
private void handleFixedWidth() {
61-
if (!fixedWidth) { return; }
60+
private void handleFixedWidth()
61+
{
62+
if (!fixedWidth)
63+
{ return; }
6264
Queryable<Queryable<MarkdownTableElement>> rows = markdown.split(e -> e == MarkdownTableElement.NEWLINE);
63-
for (int column = 0; column < rows.get(0).size(); column++) {
65+
for (int column = 0; column < rows.get(0).size(); column++)
66+
{
6467
int col = column;
65-
if (rows.get(0).get(column) instanceof MarkdownTableContents) {
66-
Queryable<Resizable> select = rows
67-
.select(e -> e.get(col))
68-
.where(e -> e instanceof Resizable)
69-
.select(e -> (Resizable) e);
70-
int length = select.max(e -> e.getLength()).getLength();
71-
select.forEach(e -> e.setPadding(length));
68+
if (rows.get(0).get(column) instanceof MarkdownTableContents)
69+
{
70+
Queryable<Resizable> select = rows.select(e -> e.get(col)).where(e -> e instanceof Resizable)
71+
.select(e -> (Resizable) e);
72+
int length = select.max(e -> e.getLength()).getLength();
73+
select.forEach(e -> e.setPadding(length));
7274
}
7375
}
7476
}
75-
7677
public static String printColumnHeaders(String... headers)
7778
{
7879
return render(constructColumnHeaders(headers));
7980
}
8081
public static Queryable<MarkdownTableElement> constructColumnHeaders(String... headers)
8182
{
8283
Queryable<MarkdownTableElement> row = constructRow(headers);
83-
for (int i = 0; i < headers.length; i++) {
84+
for (int i = 0; i < headers.length; i++)
85+
{
8486
row.add(MarkdownTableElement.DELIMITER);
8587
row.add(new MarkdownTableHeader());
8688
}
@@ -92,11 +94,10 @@ public static String printRow(Object... columns)
9294
{
9395
return render(constructRow(columns));
9496
}
95-
96-
private static String render(Queryable<MarkdownTableElement> table) {
97+
private static String render(Queryable<MarkdownTableElement> table)
98+
{
9799
return table.join("");
98100
}
99-
100101
public static Queryable<MarkdownTableElement> constructRow(Object... columns)
101102
{
102103
Queryable row = new Queryable(MarkdownTableElement.class);

‎approvaltests-util/src/main/java/com/spun/util/MarkdownTableContents.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
package com.spun.util;
22

3-
public class MarkdownTableContents implements MarkdownTableElement, Resizable {
4-
private String contents;
5-
private int padUntil;
6-
7-
public MarkdownTableContents(String contents) {
8-
this.contents = contents;
9-
}
10-
11-
@Override
12-
public String toString() {
13-
return " " + StringUtils.pad(contents, padUntil) + " ";
14-
}
15-
16-
public int getLength() {
17-
return contents.length();
18-
}
19-
20-
public void setPadding(int length) {
21-
padUntil = length;
22-
}
3+
public class MarkdownTableContents implements MarkdownTableElement, Resizable
4+
{
5+
private String contents;
6+
private int padUntil;
7+
public MarkdownTableContents(String contents)
8+
{
9+
this.contents = contents;
10+
}
11+
@Override
12+
public String toString()
13+
{
14+
return " " + StringUtils.pad(contents, padUntil) + " ";
15+
}
16+
public int getLength()
17+
{
18+
return contents.length();
19+
}
20+
public void setPadding(int length)
21+
{
22+
padUntil = length;
23+
}
2324
}

‎approvaltests-util/src/main/java/com/spun/util/MarkdownTableElement.java‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
package com.spun.util;
22

3-
public interface MarkdownTableElement {
4-
MarkdownTableElement DELIMITER = new MarkdownTableElement() {
5-
@Override
6-
public String toString() {
7-
return "|";
8-
}
9-
};
10-
MarkdownTableElement NEWLINE = new MarkdownTableElement() {
11-
@Override
12-
public String toString() {
13-
return "\n";
14-
}
15-
};
3+
public interface MarkdownTableElement
4+
{
5+
MarkdownTableElement DELIMITER = new MarkdownTableElement()
6+
{
7+
@Override
8+
public String toString()
9+
{
10+
return "|";
11+
}
12+
};
13+
MarkdownTableElement NEWLINE = new MarkdownTableElement()
14+
{
15+
@Override
16+
public String toString()
17+
{
18+
return "\n";
19+
}
20+
};
1621
}

‎approvaltests-util/src/main/java/com/spun/util/MarkdownTableHeader.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
package com.spun.util;
22

3-
public class MarkdownTableHeader implements MarkdownTableElement, Resizable {
4-
private int padUntil = 1;
5-
6-
public MarkdownTableHeader() {
7-
}
8-
9-
@Override
10-
public String toString() {
11-
int dashes = padUntil + 2; // Math.max(3, padUntil + 2);
12-
return "----------------------------------".substring(0, dashes);
13-
}
14-
15-
public int getLength() {
16-
return 1;
17-
}
18-
19-
public void setPadding(int length) {
20-
padUntil = length;
21-
}
3+
public class MarkdownTableHeader implements MarkdownTableElement, Resizable
4+
{
5+
private int padUntil = 1;
6+
public MarkdownTableHeader()
7+
{
8+
}
9+
@Override
10+
public String toString()
11+
{
12+
int dashes = padUntil + 2; // Math.max(3, padUntil + 2);
13+
return "----------------------------------".substring(0, dashes);
14+
}
15+
public int getLength()
16+
{
17+
return 1;
18+
}
19+
public void setPadding(int length)
20+
{
21+
padUntil = length;
22+
}
2223
}

‎approvaltests-util/src/main/java/com/spun/util/Resizable.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.spun.util;
22

3-
public interface Resizable {
4-
public int getLength();
5-
public void setPadding(int length);
3+
public interface Resizable
4+
{
5+
public int getLength();
6+
public void setPadding(int length);
67
}

‎approvaltests-util/src/main/java/com/spun/util/StringUtils.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,11 +603,13 @@ public static String replaceAll(String input, Pattern pattern, Function1<String,
603603
}
604604
return input;
605605
}
606-
607-
public static String pad(String contents, int targetLength) {
608-
while(contents.length() < targetLength) {
606+
public static String pad(String contents, int targetLength)
607+
{
608+
while (contents.length() < targetLength)
609+
{
609610
contents += " ";
610-
if (contents.length() < targetLength) {
611+
if (contents.length() < targetLength)
612+
{
611613
contents = " " + contents;
612614
}
613615
}

‎approvaltests-util/src/main/java/org/lambda/query/Queryable.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,19 @@ public <Out> String join(String joinCharacter, Function1<In, Out> transformer)
173173
{
174174
return String.join(joinCharacter, this.select(t -> "" + transformer.call(t)));
175175
}
176-
177-
public Queryable<Queryable<In>> split(Function1<In, Boolean> function) {
176+
public Queryable<Queryable<In>> split(Function1<In, Boolean> function)
177+
{
178178
Queryable<Queryable<In>> results = new Queryable<>();
179179
Queryable<In> part = new Queryable<>();
180-
for (In in : this) {
181-
if (function.call(in)) {
180+
for (In in : this)
181+
{
182+
if (function.call(in))
183+
{
182184
results.add(part);
183185
part = new Queryable<>();
184186
}
185-
else {
187+
else
188+
{
186189
part.add(in);
187190
}
188191
}

0 commit comments

Comments
 (0)