Skip to content

Commit fa6b96c

Browse files
jhannesjhannes
committed
Optimize imports
1 parent 6ae5ca9 commit fa6b96c

12 files changed

+102
-99
lines changed

‎src/main/java/org/jsonbuddy/parse/JsonHttpException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.jsonbuddy.parse;
22

3+
import org.jsonbuddy.JsonObject;
4+
35
import java.io.IOException;
46
import java.io.InputStream;
57
import java.io.InputStreamReader;
68
import java.io.Reader;
79
import java.net.HttpURLConnection;
810

9-
import org.jsonbuddy.JsonObject;
10-
1111
/**
1212
* Signals that the HTTP endpoint returned a 4xx error code for a URL.
1313
* The exception contains the body of the HTTP response, parsed

‎src/main/java/org/jsonbuddy/parse/JsonParser.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
package org.jsonbuddy.parse;
22

3+
import org.jsonbuddy.JsonArray;
4+
import org.jsonbuddy.JsonBoolean;
5+
import org.jsonbuddy.JsonFactory;
6+
import org.jsonbuddy.JsonNode;
7+
import org.jsonbuddy.JsonNull;
8+
import org.jsonbuddy.JsonNumber;
9+
import org.jsonbuddy.JsonObject;
10+
import org.jsonbuddy.JsonValue;
11+
312
import java.io.IOException;
413
import java.io.InputStream;
514
import java.io.InputStreamReader;
@@ -10,15 +19,6 @@
1019
import java.util.Base64;
1120
import java.util.List;
1221

13-
import org.jsonbuddy.JsonArray;
14-
import org.jsonbuddy.JsonBoolean;
15-
import org.jsonbuddy.JsonFactory;
16-
import org.jsonbuddy.JsonNode;
17-
import org.jsonbuddy.JsonNull;
18-
import org.jsonbuddy.JsonNumber;
19-
import org.jsonbuddy.JsonObject;
20-
import org.jsonbuddy.JsonValue;
21-
2222
/**
2323
* Create a JsonNode from an input Reader. Use {@link #parse} to parse any
2424
* primitive or complex JsonNode, {@link #parseToArray(Reader)} to parse a JsonArray
@@ -221,7 +221,7 @@ private void expectValue(String value) throws IOException {
221221
readNext();
222222
}
223223
if (!res.toString().equals(value)) {
224-
throw new JsonParseException(String.format("Unexpected value %s",res.toString()));
224+
throw new JsonParseException(String.format("Unexpected value %s", res));
225225
}
226226
}
227227

‎src/main/java/org/jsonbuddy/pojo/DynamicInterfaceMapper.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111

1212
import java.lang.reflect.InvocationTargetException;
1313
import java.lang.reflect.Method;
14-
import java.util.*;
14+
import java.util.Arrays;
15+
import java.util.HashMap;
16+
import java.util.Map;
17+
import java.util.Optional;
18+
import java.util.Set;
1519

1620

1721
/**

‎src/main/java/org/jsonbuddy/pojo/JsonGenerator.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
package org.jsonbuddy.pojo;
22

3+
import org.jsonbuddy.JsonArray;
4+
import org.jsonbuddy.JsonBoolean;
5+
import org.jsonbuddy.JsonFactory;
6+
import org.jsonbuddy.JsonNode;
7+
import org.jsonbuddy.JsonNull;
8+
import org.jsonbuddy.JsonNumber;
9+
import org.jsonbuddy.JsonObject;
10+
import org.jsonbuddy.JsonString;
11+
312
import java.lang.reflect.Field;
413
import java.lang.reflect.InvocationTargetException;
514
import java.lang.reflect.Method;
@@ -20,17 +29,6 @@
2029
import java.util.stream.Collectors;
2130
import java.util.stream.Stream;
2231

23-
import org.jsonbuddy.JsonArray;
24-
import org.jsonbuddy.JsonBoolean;
25-
import org.jsonbuddy.JsonFactory;
26-
import org.jsonbuddy.JsonNode;
27-
import org.jsonbuddy.JsonNull;
28-
import org.jsonbuddy.JsonNumber;
29-
import org.jsonbuddy.JsonObject;
30-
import org.jsonbuddy.JsonString;
31-
32-
import javax.swing.text.html.Option;
33-
3432
/**
3533
* Convert an object to JSON by mapping fields for any object
3634
* provided.
@@ -103,7 +101,7 @@ public static JsonNode generateWithSpecifyingClass(Object object, Class<?> class
103101
addConverter(URI.class, o -> new JsonString(o.toString()));
104102
addConverter(InetAddress.class, o -> new JsonString(o.getHostName()));
105103
addConverter(Temporal.class, o -> new JsonString(o.toString()));
106-
addConverter(Optional.class, o -> (JsonNode) o.map(v -> generateNode(v)).orElse(new JsonNull()));
104+
addConverter(Optional.class, o -> (JsonNode) o.map(this::generateNode).orElse(new JsonNull()));
107105
}
108106

109107
public <T> void addConverter(Class<T> sourceClass, Function<T, JsonNode> converter) {

‎src/test/java/org/jsonbuddy/FeatureShowcaseTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.jsonbuddy;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
3+
import org.junit.Test;
44

55
import java.net.MalformedURLException;
66
import java.net.URL;
77
import java.time.Instant;
88
import java.util.List;
99
import java.util.UUID;
1010

11-
import org.junit.Test;
11+
import static org.assertj.core.api.Assertions.assertThat;
1212

1313
public class FeatureShowcaseTest {
1414
private static class Customer {

‎src/test/java/org/jsonbuddy/JsonArrayTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void shouldHandleArraysOfArrays() {
7878

7979
assertThat(array.arrays()).isEqualTo(Arrays.asList(subArray1, subArray2, subArray3));
8080
assertThat(array.arrayStream())
81-
.isEqualTo(Arrays.asList(subArray1, subArray2, subArray3));
81+
.containsExactly(subArray1, subArray2, subArray3);
8282
}
8383

8484
@Test

‎src/test/java/org/jsonbuddy/JsonBuildTest.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,39 @@
99
import java.util.Optional;
1010
import java.util.stream.Collectors;
1111

12-
import static org.assertj.core.api.Assertions.*;
12+
import static org.assertj.core.api.Assertions.assertThat;
13+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
14+
import static org.assertj.core.api.Assertions.fail;
1315

1416
public class JsonBuildTest {
1517

1618
@Test
17-
public void shouldCreateValue() throws Exception {
19+
public void shouldCreateValue() {
1820
JsonValue jsonValue = new JsonString("Darth Vader");
1921
assertThat(jsonValue.stringValue()).isEqualTo("Darth Vader");
2022

2123
}
2224

2325
@Test
24-
public void shouldCreateObjectWithValue() throws Exception {
26+
public void shouldCreateObjectWithValue() {
2527
JsonObject jsonObject = new JsonObject()
2628
.put("name", new JsonString("Darth Vader"));
2729

28-
assertThat(jsonObject.stringValue("name").get()).isEqualTo("Darth Vader");
29-
assertThat(jsonObject.stringValue("xxx").isPresent()).isFalse();
30+
assertThat(jsonObject.stringValue("name")).get().isEqualTo("Darth Vader");
31+
assertThat(jsonObject.stringValue("xxx")).isEmpty();
3032

3133
}
3234

3335
@Test
34-
public void shouldCreateJsonArray() throws Exception {
36+
public void shouldCreateJsonArray() {
3537
JsonArray jsonArray = new JsonArray()
3638
.add("Darth")
3739
.add("Luke");
3840
assertThat(jsonArray.strings()).containsExactly("Darth","Luke");
3941
}
4042

4143
@Test
42-
public void shouldThrowExceptionIfRequiredValueIsNotPresent() throws Exception {
44+
public void shouldThrowExceptionIfRequiredValueIsNotPresent() {
4345
try {
4446
JsonFactory.jsonObject().requiredString("cake");
4547
fail("Expected exception");
@@ -49,13 +51,13 @@ public void shouldThrowExceptionIfRequiredValueIsNotPresent() throws Exception {
4951
}
5052

5153
@Test
52-
public void shouldHandleTextValue() throws Exception {
54+
public void shouldHandleTextValue() {
5355
JsonArray array = new JsonArray().add("one").add("two");
5456
assertThat(array.strings()).containsExactly("one","two");
5557
}
5658

5759
@Test
58-
public void shouldHandleDates() throws Exception {
60+
public void shouldHandleDates() {
5961
Instant instant = LocalDateTime.of(2015, 8, 30, 13, 21, 12,314000000).atOffset(ZoneOffset.ofHours(2)).toInstant();
6062
JsonObject jsonObject = JsonFactory.jsonObject().put("time", instant);
6163

@@ -65,7 +67,7 @@ public void shouldHandleDates() throws Exception {
6567
}
6668

6769
@Test
68-
public void shouldClone() throws Exception {
70+
public void shouldClone() {
6971
JsonObject orig = JsonFactory.jsonObject()
7072
.put("name", "Darth Vader")
7173
.put("properties", JsonFactory.jsonObject().put("religion", "sith"))
@@ -89,7 +91,7 @@ public void shouldClone() throws Exception {
8991
}
9092

9193
@Test
92-
public void shouldHandleNullAsStringValue() throws Exception {
94+
public void shouldHandleNullAsStringValue() {
9395
JsonObject jsonObject = JsonFactory.jsonObject().put("nullValue", new JsonNull());
9496

9597
assertThat(jsonObject.value("nullValue")).isPresent();
@@ -98,7 +100,7 @@ public void shouldHandleNullAsStringValue() throws Exception {
98100
}
99101

100102
@Test
101-
public void shouldGiveStringFormattetAsInstantAsInstant() throws Exception {
103+
public void shouldGiveStringFormattetAsInstantAsInstant() {
102104
Instant now = Instant.now();
103105
JsonObject jsonObject = JsonFactory.jsonObject().put("now", JsonFactory.jsonString(now.toString()));
104106
assertThat(jsonObject.requiredInstant("now")).isEqualTo(now);

‎src/test/java/org/jsonbuddy/JsonObjectTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.jsonbuddy;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
3+
import org.junit.Test;
4+
55
import java.math.BigDecimal;
66
import java.time.Instant;
77
import java.util.Arrays;
88
import java.util.Base64;
99

10-
import org.jsonbuddy.parse.JsonParser;
11-
import org.junit.Test;
10+
import static org.assertj.core.api.Assertions.assertThat;
11+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1212

1313
public class JsonObjectTest {
1414

‎src/test/java/org/jsonbuddy/JsonValueTest.java

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
package org.jsonbuddy;
2-
3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
5-
6-
import org.junit.Test;
7-
8-
public class JsonValueTest {
9-
10-
@Test
11-
public void shouldNotAcceptNullNumbers() throws Exception {
12-
assertThatThrownBy(() -> new JsonNumber(null))
13-
.hasMessageContaining("Use JsonNull with null");
14-
}
15-
16-
@Test
17-
public void shouldEqualSameNumber() throws Exception {
18-
JsonNumber number = new JsonNumber(123.0);
19-
20-
assertThat(number)
21-
.isEqualTo(number)
22-
.isEqualTo(number.deepClone())
23-
.isNotEqualTo(new JsonNumber(123))
24-
.isNotEqualTo(123.0);
25-
}
26-
27-
@Test
28-
public void shouldSupport() throws Exception {
29-
JsonBoolean b = new JsonBoolean(false);
30-
31-
assertThat(b).isEqualTo(b).isEqualTo(b.deepClone())
32-
.isNotEqualTo(false).isNotEqualTo(new JsonBoolean(true));
33-
}
34-
35-
36-
}
1+
package org.jsonbuddy;
2+
3+
import org.junit.Test;
4+
5+
import static org.assertj.core.api.Assertions.assertThat;
6+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
7+
8+
public class JsonValueTest {
9+
10+
@Test
11+
public void shouldNotAcceptNullNumbers() {
12+
assertThatThrownBy(() -> new JsonNumber(null))
13+
.hasMessageContaining("Use JsonNull with null");
14+
}
15+
16+
@Test
17+
public void shouldEqualSameNumber() {
18+
JsonNumber number = new JsonNumber(123.0);
19+
20+
assertThat(number)
21+
.isEqualTo(number)
22+
.isEqualTo(number.deepClone())
23+
.isNotEqualTo(new JsonNumber(123))
24+
.isNotEqualTo(123.0);
25+
}
26+
27+
@Test
28+
public void shouldSupport() {
29+
JsonBoolean b = new JsonBoolean(false);
30+
31+
assertThat(b).isEqualTo(b).isEqualTo(b.deepClone())
32+
.isNotEqualTo(false).isNotEqualTo(new JsonBoolean(true));
33+
}
34+
35+
36+
}

‎src/test/java/org/jsonbuddy/ToJsonTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.jsonbuddy;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
53
import org.junit.Test;
64

5+
import static org.assertj.core.api.Assertions.assertThat;
6+
77
public class ToJsonTest {
88
@Test
99
public void shouldConvertObject() {

‎src/test/java/org/jsonbuddy/pojo/JsonGeneratorTest.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
package org.jsonbuddy.pojo;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
5-
import java.lang.reflect.Type;
6-
import java.math.BigDecimal;
7-
import java.math.BigInteger;
8-
import java.time.OffsetDateTime;
9-
import java.time.ZoneOffset;
10-
import java.util.ArrayList;
11-
import java.util.Arrays;
12-
import java.util.HashMap;
13-
import java.util.List;
14-
import java.util.Map;
15-
import java.util.Optional;
16-
import java.util.stream.Collectors;
17-
import java.util.stream.Stream;
18-
193
import org.jsonbuddy.JsonArray;
204
import org.jsonbuddy.JsonFactory;
215
import org.jsonbuddy.JsonNode;
@@ -41,6 +25,22 @@
4125
import org.jsonbuddy.pojo.testclasses.SimpleWithNameGetter;
4226
import org.junit.Test;
4327

28+
import java.lang.reflect.Type;
29+
import java.math.BigDecimal;
30+
import java.math.BigInteger;
31+
import java.time.OffsetDateTime;
32+
import java.time.ZoneOffset;
33+
import java.util.ArrayList;
34+
import java.util.Arrays;
35+
import java.util.HashMap;
36+
import java.util.List;
37+
import java.util.Map;
38+
import java.util.Optional;
39+
import java.util.stream.Collectors;
40+
import java.util.stream.Stream;
41+
42+
import static org.assertj.core.api.Assertions.assertThat;
43+
4444
public class JsonGeneratorTest {
4545

4646
@Test

‎src/test/java/org/jsonbuddy/pojo/PojoMapperTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.jsonbuddy.pojo.testclasses.SimpleWithNameGetter;
4343
import org.junit.Test;
4444

45-
import javax.swing.text.html.Option;
4645
import java.lang.reflect.Type;
4746
import java.math.BigDecimal;
4847
import java.math.BigInteger;

0 commit comments

Comments
 (0)