Skip to content

Commit cc1637d

Browse files
committed
a reformat code
1 parent 126c8fd commit cc1637d

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed
Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package org.approvaltests;
22

3-
public class Circular {
4-
Circular parent;
5-
String label;
6-
7-
public Circular(Circular parent, String label) {
8-
this.parent = parent;
9-
this.label = label;
10-
}
11-
12-
public static Circular getIndirectCircularReference() {
13-
Circular level1 = new Circular(null, "middle");
14-
Circular level2 = new Circular(level1, "child");
15-
level1.parent = level2;
16-
return level1;
17-
}
3+
public class Circular
4+
{
5+
Circular parent;
6+
String label;
7+
public Circular(Circular parent, String label)
8+
{
9+
this.parent = parent;
10+
this.label = label;
11+
}
12+
public static Circular getIndirectCircularReference()
13+
{
14+
Circular level1 = new Circular(null, "middle");
15+
Circular level2 = new Circular(level1, "child");
16+
level1.parent = level2;
17+
return level1;
18+
}
1819
}

approvaltests-tests/src/test/java/org/approvaltests/JsonFormattingTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public void testGsonCircular()
1414
JsonApprovals.verifyAsJson(Circular.getIndirectCircularReference());
1515
});
1616
}
17-
1817
@Test
1918
public void testBasicFormatting()
2019
{

approvaltests-tests/src/test/java/org/approvaltests/JsonXstreamApprovalTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ public void testBasicFormatting()
1717
c.parent = c;
1818
JsonXstreamApprovals.verifyAsJson(c);
1919
}
20-
2120
}

approvaltests-util/src/main/java/com/spun/util/JsonUtils.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,18 @@ public static <T> String asJsonWithBuilder(Object o, Function1<T, T> gsonBuilder
4141
}
4242
public static <T> String asJson(Object o, Function1<GsonBuilder, GsonBuilder> gsonBuilder)
4343
{
44-
try {
44+
try
45+
{
4546
GsonBuilder builder = new GsonBuilder().setPrettyPrinting();
4647
builder = addHandlingForDateObjects(builder);
4748
Gson gson = gsonBuilder.call(builder).create();
4849
return gson.toJson(o);
49-
} catch (StackOverflowError e) {
50-
throw new RuntimeException("Circular reference found.\nGson does not handle circular references.\nConsider:\n 1. Using XStream (JsonXstreamApprovals)\n 2. Remove the circular reference.", e);
50+
}
51+
catch (StackOverflowError e)
52+
{
53+
throw new RuntimeException(
54+
"Circular reference found.\nGson does not handle circular references.\nConsider:\n 1. Using XStream (JsonXstreamApprovals)\n 2. Remove the circular reference.",
55+
e);
5156
}
5257
}
5358
private static GsonBuilder addHandlingForDateObjects(GsonBuilder builder)

approvaltests/src/main/java/org/approvaltests/JsonApprovals.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static void verifyAsJson(Object o, Function1<GsonBuilder, GsonBuilder> gs
2929
}
3030
public static void verifyAsJson(Object o, Function1<GsonBuilder, GsonBuilder> gsonBuilder, Options options)
3131
{
32-
Approvals.verify(JsonUtils.asJson(o, gsonBuilder), options.forFile().withExtension(".json"));
32+
Approvals.verify(JsonUtils.asJson(o, gsonBuilder), options.forFile().withExtension(".json"));
3333
}
3434
// begin-snippet: verify_as_json
3535
public static void verifyAsJson(Object o, Options options)

approvaltests/src/main/java/org/approvaltests/JsonXstreamApprovals.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void verifyAsJson(Object o, Options options)
2121
}
2222
public static String asJson(Object o)
2323
{
24-
XStream xstream = new XStream(new JsonHierarchicalStreamDriver());
24+
XStream xstream = new XStream(new JsonHierarchicalStreamDriver());
2525
return xstream.toXML(o);
2626
}
2727
}

0 commit comments

Comments
 (0)