Skip to content

Commit 671568f

Browse files
committed
feat: implement getType in UnsupportedJsonValueImpl
1 parent bf548d9 commit 671568f

File tree

7 files changed

+37
-6
lines changed

7 files changed

+37
-6
lines changed

src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalArrayNode.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package com.flowingcode.vaadin.jsonmigration;
2121

2222
import elemental.json.JsonArray;
23+
import elemental.json.JsonType;
2324
import java.util.ArrayList;
2425
import java.util.Collections;
2526
import java.util.List;
@@ -49,5 +50,10 @@ private static List<JsonNode> children(JsonArray a) {
4950
}
5051
}
5152

53+
@Override
54+
public JsonType getType() {
55+
return JsonType.ARRAY;
56+
}
57+
5258
}
5359

src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalBooleanNode.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package com.flowingcode.vaadin.jsonmigration;
2121

22+
import elemental.json.JsonType;
2223
import tools.jackson.databind.node.BooleanNode;
2324

2425
@SuppressWarnings("serial")
@@ -28,6 +29,11 @@ public ElementalBooleanNode(boolean value) {
2829
super(value);
2930
}
3031

32+
@Override
33+
public JsonType getType() {
34+
return JsonType.BOOLEAN;
35+
}
36+
3137
}
3238

3339

src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNullNode.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package com.flowingcode.vaadin.jsonmigration;
2121

22+
import elemental.json.JsonType;
2223
import tools.jackson.databind.node.NullNode;
2324

2425
@SuppressWarnings("serial")
@@ -33,5 +34,10 @@ public String toJson() {
3334
return null;
3435
}
3536

37+
@Override
38+
public JsonType getType() {
39+
return JsonType.NULL;
40+
}
41+
3642
}
3743

src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNumberNode.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package com.flowingcode.vaadin.jsonmigration;
2121

22+
import elemental.json.JsonType;
2223
import tools.jackson.databind.node.DoubleNode;
2324

2425
@SuppressWarnings("serial")
@@ -37,5 +38,11 @@ public String toJson() {
3738
return UnsupportedJsonValueImpl.super.toJson();
3839
}
3940
}
41+
42+
@Override
43+
public JsonType getType() {
44+
return JsonType.NUMBER;
45+
}
46+
4047
}
4148

src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalObjectNode.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import static com.flowingcode.vaadin.jsonmigration.JsonMigrationHelper25.convertToJsonNode;
2323
import elemental.json.JsonObject;
24+
import elemental.json.JsonType;
2425
import java.util.Collections;
2526
import java.util.LinkedHashMap;
2627
import java.util.Map;
@@ -51,6 +52,11 @@ private static Map<String, JsonNode> children(JsonObject o) {
5152
}
5253
}
5354

55+
@Override
56+
public JsonType getType() {
57+
return JsonType.OBJECT;
58+
}
59+
5460
}
5561

5662

src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalStringNode.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package com.flowingcode.vaadin.jsonmigration;
2121

22+
import elemental.json.JsonType;
2223
import tools.jackson.databind.node.StringNode;
2324

2425
@SuppressWarnings("serial")
@@ -28,4 +29,9 @@ public ElementalStringNode(String value) {
2829
super(value);
2930
}
3031

32+
@Override
33+
public JsonType getType() {
34+
return JsonType.STRING;
35+
}
36+
3137
}

src/main/java/com/flowingcode/vaadin/jsonmigration/UnsupportedJsonValueImpl.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
package com.flowingcode.vaadin.jsonmigration;
2121

22-
import elemental.json.JsonType;
2322
import elemental.json.JsonValue;
2423
import tools.jackson.databind.JsonNode;
2524

@@ -40,11 +39,6 @@ default String asString() {
4039
throw new UnsupportedOperationException();
4140
}
4241

43-
@Override
44-
default JsonType getType() {
45-
throw new UnsupportedOperationException();
46-
}
47-
4842
@Override
4943
default String toJson() {
5044
return ((JsonNode) this).toString();

0 commit comments

Comments
 (0)