Skip to content

Commit 4509dc9

Browse files
committed
Sonar fixes
1 parent 33bdcb5 commit 4509dc9

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

src/main/java/dev/vepo/jsonata/functions/ObjectBuilderJSONataFunction.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ public record ObjectBuilderJSONataFunction(List<FieldContent> contents) implemen
1919
public Data map(Data original, Data current) {
2020
if (current.isObject()) {
2121
var builder = objectBuilder();
22-
contents.forEach(content -> {
23-
builder.set(content.name().map(original, current).toJson().asText(),
24-
content.value().map(original, current));
25-
});
22+
contents.forEach(content -> builder.set(content.name().map(original, current).toJson().asText(),
23+
content.value().map(original, current)));
2624
return builder.build();
2725
} else if (current.isArray() || current.isList()) {
2826
var builder = objectBuilder(true);

src/main/java/dev/vepo/jsonata/functions/ObjectMapperJSONataFunction.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,16 @@ public record ObjectMapperJSONataFunction(List<FieldContent> contents) implement
1717
public Data map(Data original, Data current) {
1818
if (current.isObject()) {
1919
var builder = JsonFactory.objectBuilder();
20-
contents.forEach(content -> {
21-
builder.set(content.name().map(original, current).toJson().asText(),
22-
content.value().map(original, current));
23-
});
20+
contents.forEach(content -> builder.set(content.name().map(original, current).toJson().asText(),
21+
content.value().map(original, current)));
2422
return builder.build();
2523
} else if (current.isArray() || current.isList()) {
2624
var newContents = new ArrayList<JsonNode>();
2725
range(0, current.length()).forEach(i -> {
2826
var builder = JsonFactory.objectBuilder();
29-
contents.forEach(content -> {
30-
builder.set(content.name().map(current, current.at(i)).toJson().asText(),
31-
content.value().map(current, current.at(i)),
32-
content.merge());
33-
});
27+
contents.forEach(content -> builder.set(content.name().map(current, current.at(i)).toJson().asText(),
28+
content.value().map(current, current.at(i)),
29+
content.merge()));
3430
newContents.add(builder.root());
3531
});
3632
return new ArrayData(JsonFactory.arrayNode(newContents));

src/test/java/dev/vepo/jsonata/JSONataTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ void sumTest() {
301301
assertThat(jsonata("$sum(Numbers)").evaluate(NUMBERS).asInt()).isEqualTo(67);
302302
assertThat(jsonata("$sum(Numbers)").evaluate("{}").isEmpty()).isTrue();
303303
assertThat(jsonata("$sum(Numbers)").evaluate("{\"Numbers\": []}").asInt()).isZero();
304+
assertThat(jsonata("$sum(Account.Order.Product.Price)").evaluate(INVOICE).asDouble()).isEqualTo(198.56);
305+
assertThat(jsonata("$sum(Account.Order.Product.(Price*Quantity))").evaluate(INVOICE).asDouble()).isEqualTo(336.36);
304306
}
305307
}
306308

0 commit comments

Comments
 (0)