Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 752ecdb

Browse files
Code cleanup according to merge request comments.
1 parent 8c0e904 commit 752ecdb

File tree

1 file changed

+13
-23
lines changed

1 file changed

+13
-23
lines changed

jmespath-jakarta-jsonp/src/main/java/io/burt/jmespath/jakarta/jsonp/JsonpRuntime.java

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ public List<JsonValue> toList(JsonValue value) {
7474
if (valueType == ARRAY) {
7575
return new JsonArrayListWrapper((JsonArray) value);
7676
} else if (valueType == OBJECT) {
77-
JsonObject obj = (JsonObject)value;
77+
JsonObject obj = (JsonObject) value;
7878
if (!obj.isEmpty()) {
7979
List<JsonValue> elements = new ArrayList<>(obj.size());
8080
for (JsonValue v : obj.values()) {
81-
elements.add(useJsonNull(v));
81+
elements.add(nodeOrNullNode(v));
8282
}
8383
return elements;
8484
}
@@ -89,15 +89,15 @@ public List<JsonValue> toList(JsonValue value) {
8989
@Override
9090
public String toString(JsonValue str) {
9191
if (str.getValueType() == STRING) {
92-
return ((JsonString)str).getString();
92+
return ((JsonString) str).getString();
9393
} else {
9494
return str.toString();
9595
}
9696
}
9797

9898
@Override
9999
public Number toNumber(JsonValue n) {
100-
return (n.getValueType() == NUMBER) ? ((JsonNumber)n).numberValue() : null;
100+
return (n.getValueType() == NUMBER) ? ((JsonNumber) n).numberValue() : null;
101101
}
102102

103103
@Override
@@ -110,11 +110,11 @@ public boolean isTruthy(JsonValue value) {
110110
case TRUE:
111111
return true;
112112
case ARRAY:
113-
return ((JsonArray)value).size() > 0;
113+
return ((JsonArray) value).size() > 0;
114114
case OBJECT:
115-
return ((JsonObject)value).size() > 0;
115+
return ((JsonObject) value).size() > 0;
116116
case STRING:
117-
return ((JsonString)value).getString().length() > 0;
117+
return ((JsonString) value).getString().length() > 0;
118118
default:
119119
throw new IllegalStateException(String.format("Unknown node type encountered: %s", value.getValueType()));
120120
}
@@ -144,7 +144,7 @@ public JmesPathType typeOf(JsonValue value) {
144144
@Override
145145
public JsonValue getProperty(JsonValue value, JsonValue name) {
146146
if (value.getValueType() == OBJECT) {
147-
return nodeOrNullNode(((JsonObject)value).get(textOnStringOrNull(name)));
147+
return nodeOrNullNode(((JsonObject) value).get(toString(name)));
148148
} else {
149149
return JsonValue.NULL;
150150
}
@@ -153,7 +153,7 @@ public JsonValue getProperty(JsonValue value, JsonValue name) {
153153
@Override
154154
public Collection<JsonValue> getPropertyNames(JsonValue value) {
155155
if (value.getValueType() == OBJECT) {
156-
Set<String> nameSet = ((JsonObject)value).keySet();
156+
Set<String> nameSet = ((JsonObject) value).keySet();
157157
List<JsonValue> names = new ArrayList<>(nameSet.size());
158158
for(String n : nameSet) {
159159
names.add(createString(n));
@@ -173,14 +173,14 @@ public JsonValue createNull() {
173173
public JsonValue createArray(Collection<JsonValue> elements) {
174174
JsonArrayBuilder builder = Json.createArrayBuilder();
175175
for(JsonValue element : elements) {
176-
builder.add(useJsonNull(element));
176+
builder.add(nodeOrNullNode(element));
177177
}
178178
return builder.build();
179179
}
180180

181181
@Override
182182
public JsonValue createString(String str) {
183-
return useJsonNull(Json.createValue(str));
183+
return nodeOrNullNode(Json.createValue(str));
184184
}
185185

186186
@Override
@@ -192,9 +192,9 @@ public JsonValue createBoolean(boolean b) {
192192
public JsonValue createObject(Map<JsonValue, JsonValue> obj) {
193193
JsonObjectBuilder builder = Json.createObjectBuilder();
194194
for (Map.Entry<JsonValue, JsonValue> entry : obj.entrySet()) {
195-
String key = textOnStringOrNull(entry.getKey());
195+
String key = toString(entry.getKey());
196196
if (key != null) {
197-
builder.add(key, useJsonNull(entry.getValue()));
197+
builder.add(key, nodeOrNullNode(entry.getValue()));
198198
}
199199
}
200200
return builder.build();
@@ -210,21 +210,11 @@ public JsonValue createNumber(long n) {
210210
return Json.createValue(n);
211211
}
212212

213-
private JsonValue useJsonNull(JsonValue value) { return (value == null) ? JsonValue.NULL : value; }
214-
215213
private JsonValue nodeOrNullNode(JsonValue node) {
216214
if (node == null) {
217215
return JsonValue.NULL;
218216
} else {
219217
return node;
220218
}
221219
}
222-
223-
private String textOnStringOrNull(JsonValue value) {
224-
if (value.getValueType() == STRING) {
225-
return ((JsonString)value).getString();
226-
} else {
227-
return null;
228-
}
229-
}
230220
}

0 commit comments

Comments
 (0)