Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix #381] Fixing null pointer #382

Merged
merged 3 commits into from
Dec 10, 2024
Merged

[Fix #381] Fixing null pointer #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2160301
[Fix #381] Fixing null pointer
fjtirado Nov 26, 2024
b4be882
[Fix #381] Fixing null pointer (alternate approach)
fjtirado Nov 27, 2024
11e82d9
Revert "[Fix #381] Fixing null pointer (alternate approach)"
fjtirado Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...main/java/net/thisptr/jackson/jq/internal/tree/binaryop/assignment/ComplexAssignment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.List;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.NullNode;

import net.thisptr.jackson.jq.Expression;
import net.thisptr.jackson.jq.PathOutput;
Expand Down Expand Up @@ -38,7 +39,7 @@ public void apply(final Scope scope, final JsonNode in, final Path ipath, final
}, true);
JsonNode out = in;
for (final Path lpath : lpaths)
out = lpath.mutate(out, (lval) -> operator.apply(scope.getObjectMapper(), lval, rval));
out = lpath.mutate(out, (lval) -> operator.apply(scope.getObjectMapper(), lval == null ? NullNode.getInstance() : lval, rval));
output.emit(out, null);
});
}
Expand Down
36 changes: 36 additions & 0 deletions jackson-jq/src/test/java/net/thisptr/jackson/jq/internal/NullLHSFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package net.thisptr.jackson.jq.internal;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import javax.management.ObjectName;

import org.junit.jupiter.api.Test;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.IntNode;
import com.fasterxml.jackson.databind.node.NullNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

import net.thisptr.jackson.jq.BuiltinFunctionLoader;
import net.thisptr.jackson.jq.JsonQuery;
import net.thisptr.jackson.jq.Scope;
import net.thisptr.jackson.jq.Versions;
import net.thisptr.jackson.jq.exception.JsonQueryException;
import net.thisptr.jackson.jq.internal.javacc.ExpressionParser;

public class NullLHSFunctionTest {
@Test
public void test() throws IOException {
final ObjectMapper mapper = new ObjectMapper();
final Scope scope = Scope.newEmptyScope();
BuiltinFunctionLoader.getInstance().loadFunctions(Versions.JQ_1_5, scope);
ObjectNode input = mapper.createObjectNode().set("input", mapper.createArrayNode().add(1));
assertEquals(Arrays.asList(input.deepCopy().set("output", mapper.createArrayNode().add(2))), JsonQueryFunctionTest.eval(scope, ".output+=[.input[0]+1]", input));
}
}