Skip to content

Commit 59631a5

Browse files
authored
Merge pull request #146 from avaje/feature/module-info-generator
Feature/module info generator
2 parents 9914cde + 90c4da5 commit 59631a5

File tree

8 files changed

+66
-15
lines changed

8 files changed

+66
-15
lines changed

blackbox-test/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-jsonb-parent</artifactId>
7-
<version>1.7-SNAPSHOT</version>
7+
<version>1.7-RC1</version>
88
</parent>
99

1010
<artifactId>blackbox-test</artifactId>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>io.avaje</groupId>
3030
<artifactId>avaje-jsonb</artifactId>
31-
<version>1.7-SNAPSHOT</version>
31+
<version>1.7-RC1</version>
3232
</dependency>
3333

3434
<!-- <dependency>-->
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>io.avaje</groupId>
4242
<artifactId>avaje-jsonb-generator</artifactId>
43-
<version>1.7-SNAPSHOT</version>
43+
<version>1.7-RC1</version>
4444
<scope>provided</scope>
4545
</dependency>
4646

blackbox-test/src/test/java/org/example/other/ObjectAdapterTest.java

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,65 @@ class ObjectAdapterTest {
2020

2121
JsonType<Object> objectType = jsonb.type(Object.class);
2222

23+
@Test
24+
void nullJson() {
25+
Object val = objectType.fromJson("null");
26+
assertThat(val).isNull();
27+
28+
String asJson = objectType.toJson(null);
29+
assertThat(asJson).isEqualTo("");
30+
}
31+
32+
@Test
33+
void booleanTrue() {
34+
String asJson = objectType.toJson(true);
35+
assertThat(asJson).isEqualTo("true");
36+
37+
Object val = objectType.fromJson("true");
38+
assertThat(val).isEqualTo(true);
39+
}
40+
41+
@Test
42+
void booleanFalse() {
43+
String asJson = objectType.toJson(false);
44+
assertThat(asJson).isEqualTo("false");
45+
46+
Object val = objectType.fromJson("false");
47+
assertThat(val).isEqualTo(false);
48+
}
49+
50+
@SuppressWarnings("raw")
51+
@Test
52+
void booleanArray() {
53+
String asJson = objectType.toJson(List.of(false, true, true, false, true));
54+
assertThat(asJson).isEqualTo("[false,true,true,false,true]");
55+
56+
Object val = objectType.fromJson("[false,true,true,false,true]");
57+
assertThat(val).isInstanceOf(List.class);
58+
List list = (List) val;
59+
assertThat(list).isEqualTo(List.of(false, true, true, false, true));
60+
}
61+
62+
@SuppressWarnings("raw")
63+
@Test
64+
void mixedArray() {
65+
String asJson = objectType.toJson(List.of(42, false, true, "hi", true));
66+
assertThat(asJson).isEqualTo("[42,false,true,\"hi\",true]");
67+
68+
Object val = objectType.fromJson("[42,false,true,\"hi\",true]");
69+
assertThat(val).isInstanceOf(List.class);
70+
List list = (List) val;
71+
assertThat(list).isEqualTo(List.of(42.0, false, true, "hi", true));
72+
}
73+
2374
@SuppressWarnings("unchecked")
2475
@Test
2576
void fromJson_readingMap() {
2677

2778
Object value = objectAdapter.fromJson(jsonb.reader("{\"id\":42,\"name\":\"rob\"}"));
2879

2980
assertThat(value).isInstanceOf(Map.class);
30-
Map<String,Object> asMap = (Map<String, Object>) value;
81+
Map<String, Object> asMap = (Map<String, Object>) value;
3182
assertThat(asMap.get("id")).isEqualTo(42D);
3283
assertThat(asMap.get("name")).isEqualTo("rob");
3384

@@ -43,7 +94,7 @@ void fromJson_readingListOfMap() {
4394

4495
assertThat(value).isInstanceOf(List.class);
4596

46-
List<Map<String,Object>> asListOfMap = (List<Map<String,Object>>) value;
97+
List<Map<String, Object>> asListOfMap = (List<Map<String, Object>>) value;
4798
assertThat(asListOfMap).hasSize(2);
4899
assertThat(asListOfMap.get(0).get("id")).isEqualTo(42D);
49100
assertThat(asListOfMap.get(0).get("name")).isEqualTo("rob");
@@ -70,13 +121,13 @@ void readingNested() {
70121
Object result = type.fromJson("{\"errors\":[{\"path\":42,\"property\":\"foo\",\"message\":\"must not be blank\"}]}");
71122
assertThat(result).isInstanceOf(Map.class);
72123

73-
var map = (Map<String,Object>)result;
124+
var map = (Map<String, Object>) result;
74125
assertThat(map).hasSize(1);
75126
Object errors = map.get("errors");
76127
assertThat(errors).isInstanceOf(List.class);
77-
var list = (List<?>)errors;
128+
var list = (List<?>) errors;
78129
assertThat(list).hasSize(1);
79-
var entry = (Map<String,Object>)list.get(0);
130+
var entry = (Map<String, Object>) list.get(0);
80131

81132
assertThat(entry).hasSize(3);
82133
assertThat(entry.get("path")).isEqualTo(42.0D);

jsonb-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-jsonb-parent</artifactId>
7-
<version>1.7-SNAPSHOT</version>
7+
<version>1.7-RC1</version>
88
</parent>
99

1010
<artifactId>avaje-jsonb-generator</artifactId>

jsonb-inject-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>avaje-jsonb-parent</artifactId>
88
<groupId>io.avaje</groupId>
9-
<version>1.7-SNAPSHOT</version>
9+
<version>1.7-RC1</version>
1010
</parent>
1111

1212
<artifactId>avaje-jsonb-inject-plugin</artifactId>

jsonb-jackson/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>avaje-jsonb-parent</artifactId>
66
<groupId>io.avaje</groupId>
7-
<version>1.7-SNAPSHOT</version>
7+
<version>1.7-RC1</version>
88
</parent>
99

1010
<artifactId>avaje-jsonb-jackson</artifactId>
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>io.avaje</groupId>
2323
<artifactId>avaje-jsonb</artifactId>
24-
<version>1.7-SNAPSHOT</version>
24+
<version>1.7-RC1</version>
2525
</dependency>
2626

2727
<dependency>

jsonb-spring-adapter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>avaje-jsonb-parent</artifactId>
88
<groupId>io.avaje</groupId>
9-
<version>1.7-SNAPSHOT</version>
9+
<version>1.7-RC1</version>
1010
</parent>
1111

1212
<artifactId>avaje-jsonb-spring-starter</artifactId>

jsonb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-jsonb-parent</artifactId>
7-
<version>1.7-SNAPSHOT</version>
7+
<version>1.7-RC1</version>
88
</parent>
99

1010
<artifactId>avaje-jsonb</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<groupId>io.avaje</groupId>
1111
<artifactId>avaje-jsonb-parent</artifactId>
12-
<version>1.7-SNAPSHOT</version>
12+
<version>1.7-RC1</version>
1313

1414
<packaging>pom</packaging>
1515
<name>jsonb parent</name>

0 commit comments

Comments
 (0)