Merge branch 'release/1.1.0' into master/1.x

README.md

@@ -12,13 +12,13 @@ Usage
 
 First, you need Java 8 or later.
 
-If you use Maven, add the following snippet to the `<dependencies>` section of your POM. For instructions for other build tools (Gradle, etc.), visit [jackson-jq](https://search.maven.org/artifact/net.thisptr/jackson-jq/1.0.1/jar) on search.maven.org.
+If you use Maven, add the following snippet to the `<dependencies>` section of your POM. For instructions for other build tools (Gradle, etc.), visit [jackson-jq](https://search.maven.org/artifact/net.thisptr/jackson-jq/1.1.0/jar) on search.maven.org.
 
 ```xml
 <dependency>
 	<groupId>net.thisptr</groupId>
 	<artifactId>jackson-jq</artifactId>
-	<version>1.0.1</version>
+	<version>1.1.0</version>
 </dependency>
 ```
 
@@ -32,29 +32,29 @@ To test a query quickly, we provide jackson-jq CLI.
 *Please note that jackson-jq is a Java library and the CLI is provided solely for debugging/testing purpose (and not for production). The command-line options might change without notice.*
 
 ```sh
-$ curl -LO https://repo1.maven.org/maven2/net/thisptr/jackson-jq-cli/1.0.1/jackson-jq-cli-1.0.1.jar
+$ curl -LO https://repo1.maven.org/maven2/net/thisptr/jackson-jq-cli/1.1.0/jackson-jq-cli-1.1.0.jar
 
-$ java -jar jackson-jq-cli-1.0.1.jar --help
+$ java -jar jackson-jq-cli-1.1.0.jar --help
 usage: jackson-jq [OPTIONS...] QUERY
  -c,--compact      compact instead of pretty-printed output
  -h,--help         print this message
     --jq <arg>     specify jq version
  -n,--null-input   use `null` as the single input value
  -r,--raw          output raw strings, not JSON texts
 
-$ java -jar jackson-jq-cli-1.0.1.jar '.foo'
+$ java -jar jackson-jq-cli-1.1.0.jar '.foo'
 {"foo": 42}
 42
 ```
 
 To test a query with a specific jq version,
 
 ```sh
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.5 'join("-")'
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.5 'join("-")'
 ["1", 2]
 jq: error: string ("-") and number (2) cannot be added
 
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.6 'join("-")' # jq-1.6 can join any values, not only strings
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.6 'join("-")' # jq-1.6 can join any values, not only strings
 ["1", 2]
 "1-2"
 ```
@@ -236,9 +236,9 @@ $ jq -n '1 + 3 as $a | ($a * 2)' # interpreted as 1 + (3 as $a | ($a * 2))
 whereas jackson-jq consistently interprets them as `(1 + 3)` whether `as $a` is used or not:
 
 ```console
-$ java -jar jackson-jq-cli-1.0.1.jar -n '1 + 3 | (. * 2)' # interpreted as (1 + 3) | (. * 2)
+$ java -jar jackson-jq-cli-1.1.0.jar -n '1 + 3 | (. * 2)' # interpreted as (1 + 3) | (. * 2)
 8
-$ java -jar jackson-jq-cli-1.0.1.jar -n '1 + 3 as $a | ($a * 2)' # interpreted as (1 + 3) as $a | ($a * 2)
+$ java -jar jackson-jq-cli-1.1.0.jar -n '1 + 3 as $a | ($a * 2)' # interpreted as (1 + 3) as $a | ($a * 2)
 8
 ```
 
@@ -247,7 +247,7 @@ $ java -jar jackson-jq-cli-1.0.1.jar -n '1 + 3 as $a | ($a * 2)' # interpreted a
 ```console
 $ jq -n '1 + 3 as $a | ($a * 2)' # interpreted as 1 + (3 as $a | ($a * 2))
 7
-$ java -jar jackson-jq-cli-1.0.1.jar -n '1 + 3 as $a | ($a * 2)' # interpreted as (1 + 3) as $a | ($a * 2)
+$ java -jar jackson-jq-cli-1.1.0.jar -n '1 + 3 as $a | ($a * 2)' # interpreted as (1 + 3) as $a | ($a * 2)
 8
 ```
 
@@ -274,7 +274,7 @@ If the function with the same is defined more than once at the same scope, jacks
 ```console
 $ jq -n 'def f: 1; def g: f; def f: 2; g'
 1
-$ java -jar jackson-jq-cli-1.0.1.jar -n 'def f: 1; def g: f; def f: 2; g'
+$ java -jar jackson-jq-cli-1.1.0.jar -n 'def f: 1; def g: f; def f: 2; g'
 2
 ```
 
@@ -283,7 +283,7 @@ $ java -jar jackson-jq-cli-1.0.1.jar -n 'def f: 1; def g: f; def f: 2; g'
 Avoid using the duplicate function name.
 
 ```console
-$ java -jar jackson-jq-cli-1.0.1.jar -n 'def f1: 1; def g: f1; def f2: 2; g'
+$ java -jar jackson-jq-cli-1.1.0.jar -n 'def f1: 1; def g: f1; def f2: 2; g'
 1
 ```
 
@@ -353,7 +353,7 @@ jq: error: Division by zero? at <top-level>, line 1:
 jq: 1 compile error
 $ jq '. / 0' <<< 0
 jq: error (at <stdin>:1): number (0) and number (0) cannot be divided because the divisor is zero
-$ java -jar jackson-jq-cli-1.0.1.jar -n '0 / 0'
+$ java -jar jackson-jq-cli-1.1.0.jar -n '0 / 0'
 jq: error: number (0) and number (0) cannot be divided because the divisor is zero
 ```
 
@@ -386,9 +386,9 @@ $ jq-1.2 -n '[1,2,3] | ((.[] | select(. > 1)) |= empty)'
   2,
   3
 ]
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.6 -n '[1,2,3] | ((.[] | select(. > 1)) |= empty)'
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.6 -n '[1,2,3] | ((.[] | select(. > 1)) |= empty)'
 jq: error: `|= empty` is undefined. See https://github.com/stedolan/jq/issues/897
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.5 -n '[1,2,3] | ((.[] | select(. > 1)) |= empty)'
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.5 -n '[1,2,3] | ((.[] | select(. > 1)) |= empty)'
 jq: error: `|= empty` is undefined. See https://github.com/stedolan/jq/issues/897
 ```
 
@@ -397,9 +397,9 @@ jq: error: `|= empty` is undefined. See https://github.com/stedolan/jq/issues/89
 You can use `_modify/2` if you really want to the original behavior.
 
 ```console
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.6 -n '[1,2,3] | _modify((.[] | select(. > 1)); empty)'
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.6 -n '[1,2,3] | _modify((.[] | select(. > 1)); empty)'
 [ 1, 3 ]
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.5 -n '[1,2,3] | _modify((.[] | select(. > 1)); empty)'
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.5 -n '[1,2,3] | _modify((.[] | select(. > 1)); empty)'
 null
 ```
 
@@ -419,7 +419,7 @@ jq 1.5
 ```console
 $ jq-1.5 -c 'path(.foo as $a | $a)' <<< '{"foo": 1}'
 ["foo"]
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.5 -c 'path(.foo as $a | $a)' <<< '{"foo": 1}'
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.5 -c 'path(.foo as $a | $a)' <<< '{"foo": 1}'
 jq: error: Invalid path expression with result 1
 ```
 
@@ -428,7 +428,7 @@ jq 1.6
 ```console
 $ jq-1.6 -c 'path(.foo as $a | $a)' <<< '{"foo": 1}'
 jq: error (at <stdin>:1): Invalid path expression with result 1
-$ java -jar jackson-jq-cli-1.0.1.jar --jq 1.6 -c 'path(.foo as $a | $a)' <<< '{"foo": 1}'
+$ java -jar jackson-jq-cli-1.1.0.jar --jq 1.6 -c 'path(.foo as $a | $a)' <<< '{"foo": 1}'
 jq: error: Invalid path expression with result 1
 ```
 
@@ -452,7 +452,7 @@ $ jq -n 'label $a | label $b | try (break $b) catch .'
 {
   "__jq": 1
 }
-$ java -jar jackson-jq-cli-1.0.1.jar -n 'label $a | label $b | try (break $b) catch .'
+$ java -jar jackson-jq-cli-1.1.0.jar -n 'label $a | label $b | try (break $b) catch .'
 {
   "__jq" : 0
 }
@@ -482,7 +482,7 @@ $ jq-1.6 -n '"x" | indices("")' # stuck in infinite loop
 ^C
 $ jq-1.6-83-gb52fc10 -n '"x" | indices("")'
 []
-$ java -jar jackson-jq-cli-1.0.1.jar -n '"x" | indices("")'
+$ java -jar jackson-jq-cli-1.1.0.jar -n '"x" | indices("")'
 [ ]
 ```
 
@@ -499,7 +499,7 @@ To use this module, you need to add the following Maven dependency and set `Buil
 <dependency>
 	<groupId>net.thisptr</groupId>
 	<artifactId>jackson-jq-extra</artifactId>
-	<version>1.0.1</version>
+	<version>1.1.0</version>
 </dependency>
 ```
 

jackson-jq-cli/pom.xml

@@ -8,14 +8,14 @@
 	<parent>
 		<groupId>net.thisptr</groupId>
 		<artifactId>jackson-jq-parent</artifactId>
-		<version>1.0.1</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>net.thisptr</groupId>
 			<artifactId>jackson-jq-extra</artifactId>
-			<version>1.0.1</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>

jackson-jq-extra/pom.xml

@@ -8,14 +8,14 @@
 	<parent>
 		<groupId>net.thisptr</groupId>
 		<artifactId>jackson-jq-parent</artifactId>
-		<version>1.0.1</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>net.thisptr</groupId>
 			<artifactId>jackson-jq</artifactId>
-			<version>1.0.1</version>
+			<version>1.1.0</version>
 		</dependency>
 	</dependencies>
 

jackson-jq/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>net.thisptr</groupId>
 		<artifactId>jackson-jq-parent</artifactId>
-		<version>1.0.1</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<dependencies>

jackson-jq/src/main/java/net/thisptr/jackson/jq/Scope.java

@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.function.Supplier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -53,26 +54,46 @@ public interface ValueWithPath {
 		Path path();
 	}
 
-	private static class ValueWithPathImpl implements ValueWithPath {
-		@JsonProperty("value")
-		private final JsonNode value;
-
-		@JsonProperty("path")
+	private static abstract class AbstractValueWithPath implements ValueWithPath {
 		private final Path path;
-
-		public ValueWithPathImpl(final JsonNode value, final Path path) {
-			this.value = value;
+
+		public AbstractValueWithPath (Path path) {
 			this.path = path;
 		}
+
+		@Override
+		public Path path() {
+			return path;
+		}
+	}
+
+	private static class ValueSupplierImpl extends AbstractValueWithPath {
+		private final Supplier<JsonNode> valueSupplier;
+
+		public ValueSupplierImpl(final Supplier<JsonNode> valueSupplier, final Path path) {
+			super(path);
+			this.valueSupplier = valueSupplier;
+		}
 
 		@Override
 		public JsonNode value() {
-			return value;
+			return valueSupplier.get();
+		}
+	}
+
+	private static class ValueWithPathImpl extends AbstractValueWithPath {
+		@JsonProperty("value")
+		private final JsonNode value;
+
+		public ValueWithPathImpl(final JsonNode value, final Path path) {
+			super(path);
+			this.value = value;
+
 		}
 
 		@Override
-		public Path path() {
-			return path;
+		public JsonNode value() {
+			return value;
 		}
 	}
 
@@ -139,12 +160,22 @@ private Function getFunctionRecursive(final String name) {
 	public void setValue(final String name, final JsonNode value) {
 		setValueWithPath(name, value, null);
 	}
+
+	public void setValue (final String name, Supplier<JsonNode> supplier) {
+		setValueWithPath (name, supplier, null);
+	}
 
 	public void setValueWithPath(final String name, final JsonNode value, final Path path) {
 		if (values == null)
 			values = new HashMap<>();
 		values.put(name, new ValueWithPathImpl(value, path));
 	}
+
+	public  void setValueWithPath(final String name, final Supplier<JsonNode> value, final Path path) {
+		if (values == null)
+			values = new HashMap<>();
+		values.put(name, new ValueSupplierImpl(value, path));
+	}
 
 	public ValueWithPath getValueWithPath(final String name) {
 		if (values != null) {

jackson-jq/src/test/java/net/thisptr/jackson/jq/CustomFunctionTest.java

@@ -0,0 +1,51 @@
+package net.thisptr.jackson.jq;
+
+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.ObjectNode;
+import net.thisptr.jackson.jq.exception.JsonQueryException;
+import net.thisptr.jackson.jq.path.Path;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+// end-to-end test of custom function
+public class CustomFunctionTest {
+
+    @Test
+    public void testCustomFunction() throws Exception {
+
+        ObjectMapper mapper = new ObjectMapper();
+        Version version = Versions.JQ_1_6;
+
+        Scope rootScope = Scope.newEmptyScope();
+
+        BuiltinFunctionLoader.getInstance().loadFunctions(version, rootScope);
+
+        rootScope.addFunction("times100", 1, new Function() {
+            @Override
+            public void apply(Scope scope, List<Expression> args, JsonNode in, Path path, PathOutput output, Version version) throws JsonQueryException {
+                args.get(0).apply(scope, in, (numberNode) -> {
+                    assert (numberNode.isIntegralNumber());
+                    output.emit(new IntNode(numberNode.asInt() * 100), null);
+                });
+            }
+        });
+
+        String input = "{ \"a\": 5 }";
+
+        Scope childScope = Scope.newChildScope(rootScope);
+
+        JsonQuery query = JsonQuery.compile("{ \"a\": times100(.a) }", version);
+
+        final List<JsonNode> out = new ArrayList<>();
+        query.apply(childScope, mapper.readTree(input), out::add);
+        assertThat(out).hasSize(1);
+        assertThat(out.get(0)).isInstanceOf(ObjectNode.class);
+        assertThat(out.get(0).toString()).isEqualTo("{\"a\":500}");
+    }
+}

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>net.thisptr</groupId>
 	<artifactId>jackson-jq-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.1</version>
+	<version>1.1.0</version>
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>jq for Jackson JSON Processor</description>
 	<url>https://github.com/eiiches/jackson-jq</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:[email protected]:eiiches/jackson-jq.git</connection>
 		<developerConnection>scm:git:[email protected]:eiiches/jackson-jq.git</developerConnection>
 		<url>[email protected]:juven/git-demo.git</url>
-		<tag>1.0.1</tag>
+		<tag>1.1.0</tag>
 	</scm>
 
 	<modules>