Merge branch 'release/0.0.13' into master/0.x

eiiches · eiiches · commit 5742cd0f5843 · 2021-06-10T07:50:32.000+09:00
diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml
@@ -0,0 +1,32 @@
+# this name appears in the badge
+name: 'test'
+on:
+  push:
+    branches:
+    - develop/0.x
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: Download jq-1.5 and jq-1.6
+      run: |
+        mkdir -p $HOME/bin
+        wget -O $HOME/bin/jq-1.5 https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
+        wget -O $HOME/bin/jq-1.6 https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
+        chmod +x $HOME/bin/jq-1.5 $HOME/bin/jq-1.6
+
+    - name: Configure Maven
+      env:
+        M2_SETTINGS_XML: ${{ secrets.M2_SETTINGS_XML }}
+      run: |
+        mkdir -p $HOME/.m2
+        echo "$M2_SETTINGS_XML" > $HOME/.m2/settings.xml
+
+    - name: Build & Deploy
+      run: 'PATH="$HOME/bin:$PATH" mvn clean deploy'
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ jackson-jq
 
 [jq](http://stedolan.github.io/jq/) for Jackson JSON Processor
 
-[![CircleCI](https://circleci.com/gh/eiiches/jackson-jq/tree/develop.svg?style=shield)](https://circleci.com/gh/eiiches/jackson-jq/tree/develop)
+[![GitHub Actions](https://github.com/eiiches/jackson-jq/workflows/test/badge.svg?branch=develop%2F0.x)](https://github.com/eiiches/jackson-jq/actions)
 
 Installation
 ------------
@@ -15,7 +15,7 @@ Just add jackson-jq in your pom.xml.
 	<dependency>
 		<groupId>net.thisptr</groupId>
 		<artifactId>jackson-jq</artifactId>
-		<version>0.0.12</version>
+		<version>0.0.13</version>
 	</dependency>
 </dependencies>
 ```
@@ -211,7 +211,7 @@ Using jackson-jq-extra module
     <dependency>
         <groupId>net.thisptr</groupId>
         <artifactId>jackson-jq-extra</artifactId>
-        <version>0.0.12</version>
+        <version>0.0.13</version>
     </dependency>
 </dependencies>
 ```
diff --git a/circle.yml b/circle.yml
diff --git a/jackson-jq-cli/pom.xml b/jackson-jq-cli/pom.xml
@@ -8,14 +8,14 @@
 	<parent>
 		<groupId>net.thisptr</groupId>
 		<artifactId>jackson-jq-parent</artifactId>
-		<version>0.0.12</version>
+		<version>0.0.13</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>net.thisptr</groupId>
 			<artifactId>jackson-jq-extra</artifactId>
-			<version>0.0.12</version>
+			<version>0.0.13</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>
diff --git a/jackson-jq-extra/pom.xml b/jackson-jq-extra/pom.xml
@@ -8,14 +8,14 @@
 	<parent>
 		<groupId>net.thisptr</groupId>
 		<artifactId>jackson-jq-parent</artifactId>
-		<version>0.0.12</version>
+		<version>0.0.13</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>net.thisptr</groupId>
 			<artifactId>jackson-jq</artifactId>
-			<version>0.0.12</version>
+			<version>0.0.13</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/jackson-jq/pom.xml b/jackson-jq/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>net.thisptr</groupId>
 		<artifactId>jackson-jq-parent</artifactId>
-		<version>0.0.12</version>
+		<version>0.0.13</version>
 	</parent>
 
 	<dependencies>
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/misc/Pair.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/misc/Pair.java
@@ -34,4 +34,36 @@ public static <T, U> List<U> _2(final List<Pair<T, U>> items) {
 	public String toString() {
 		return String.format("(%s, %s)", _1, _2);
 	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((_1 == null) ? 0 : _1.hashCode());
+		result = prime * result + ((_2 == null) ? 0 : _2.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(final Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		@SuppressWarnings("rawtypes")
+		final Pair other = (Pair) obj;
+		if (_1 == null) {
+			if (other._1 != null)
+				return false;
+		} else if (!_1.equals(other._1))
+			return false;
+		if (_2 == null) {
+			if (other._2 != null)
+				return false;
+		} else if (!_2.equals(other._2))
+			return false;
+		return true;
+	}
 }
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/ForeachExpression.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/ForeachExpression.java
@@ -57,7 +57,7 @@ public List<JsonNode> apply(final Scope scope, final JsonNode in) throws JsonQue
 							}
 							accumulators[0] = newaccumulator;
 						}
-					}, stack, true);
+					}, stack);
 				}
 			}
 
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/PipedQuery.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/PipedQuery.java
@@ -50,7 +50,7 @@ private static void applyRecursive(final Scope scope, final JsonNode in, final L
 						scope2.setValue(var._1, var._2);
 					}
 					applyRecursive(scope2, in, out, qs.subList(1, qs.size()));
-				}, accumulate, true);
+				}, accumulate);
 			} else {
 				applyRecursive(scope2, o, out, qs.subList(1, qs.size()));
 			}
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/ReduceExpression.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/ReduceExpression.java
@@ -53,7 +53,7 @@ public List<JsonNode> apply(final Scope scope, final JsonNode in) throws JsonQue
 							// We only use the last value from reduce expression.
 							final List<JsonNode> reduceResult = reduceExpr.apply(childScope, accumulators[0]);
 							accumulators[0] = reduceResult.isEmpty() ? NullNode.getInstance() : reduceResult.get(reduceResult.size() - 1);
-						}, stack, true);
+						}, stack);
 					}
 
 				} finally {
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/PatternMatcher.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/PatternMatcher.java
@@ -11,5 +11,5 @@
 import net.thisptr.jackson.jq.internal.misc.Pair;
 
 public interface PatternMatcher {
-	void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate, final boolean emit) throws JsonQueryException;
+	void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate) throws JsonQueryException;
 }
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ArrayMatcher.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ArrayMatcher.java
@@ -20,15 +20,26 @@ public ArrayMatcher(final List<PatternMatcher> matchers) {
 		this.matchers = matchers;
 	}
 
+	private void recursive(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate, int index) throws JsonQueryException {
+		if (index >= matchers.size()) {
+			out.accept(accumulate);
+			return;
+		}
+
+		final PatternMatcher matcher = matchers.get(index);
+		final JsonNode value = in.get(index);
+
+		matcher.match(scope, value != null ? value : NullNode.getInstance(), (match) -> {
+			recursive(scope, in, out, accumulate, index + 1);
+		}, accumulate);
+	}
+
 	@Override
-	public void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate, final boolean emit) throws JsonQueryException {
+	public void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate) throws JsonQueryException {
 		if (!in.isArray() && !in.isNull())
 			throw JsonQueryTypeException.format("Cannot index %s with number", in.getNodeType());
-		for (int i = 0; i < matchers.size(); ++i) {
-			final PatternMatcher matcher = matchers.get(i);
-			final JsonNode item = in.get(i);
-			matcher.match(scope, item != null ? item : NullNode.getInstance(), out, accumulate, emit && i == matchers.size() - 1);
-		}
+
+		recursive(scope, in, out, accumulate, 0);
 	}
 
 	@Override
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ObjectMatcher.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ObjectMatcher.java
@@ -21,9 +21,11 @@ public ObjectMatcher(final List<Pair<JsonQuery, PatternMatcher>> matchers) {
 		this.matchers = matchers;
 	}
 
-	private void recursive(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate, final boolean emit, int index) throws JsonQueryException {
-		if (index >= matchers.size())
+	private void recursive(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate, int index) throws JsonQueryException {
+		if (index >= matchers.size()) {
+			out.accept(accumulate);
 			return;
+		}
 
 		final Pair<JsonQuery, PatternMatcher> kvexpr = matchers.get(index);
 		final JsonQuery keyexpr = kvexpr._1;
@@ -36,44 +38,21 @@ private void recursive(final Scope scope, final JsonNode in, final Functional.Co
 			final JsonNode value = in.get(key.asText());
 
 			final int size = accumulate.size();
-			matcher.match(scope, value != null ? value : NullNode.getInstance(), out, accumulate, emit && index == matchers.size() - 1);
-			recursive(scope, in, out, accumulate, emit, index + 1);
+			matcher.match(scope, value != null ? value : NullNode.getInstance(), (match) -> {
+				recursive(scope, in, out, accumulate, index + 1);
+			}, accumulate);
 			accumulate.setSize(size);
 		}
 	}
 
 	@Override
-	public void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate, final boolean emit) throws JsonQueryException {
+	public void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate) throws JsonQueryException {
 		if (!in.isObject() && !in.isNull())
 			throw JsonQueryTypeException.format("Cannot index %s with string", in.getNodeType());
 
-		recursive(scope, in, out, accumulate, emit, 0);
+		recursive(scope, in, out, accumulate, 0);
 	}
 
-	// . as [$a, {(.a, .a): $b}] === .[0] as $a | (.[1].a, .[1].a) as $b
-
-	// public void match(final Scope scope, final JsonNode in, final boolean emit, final Map<String, JsonNode> accum, final Consumer<Map<String, JsonNode>> out)
-	// throws JsonQueryException {
-	// if (!in.isObject() && !in.isNull())
-	// throw JsonQueryTypeException.format("Cannot index %s with string", in.getNodeType());
-	//
-	// recursive(scope, in, emit, out, 0);
-	// }
-	//
-	// {
-	// for (int i = 0; i < matchers.size(); ++i) {
-	// final PatternMatcher matcher = matchers.get(i);
-	//
-	// for (final JsonNode key : entry.getKey().apply(scope, in)) {
-	// if (!key.isTextual())
-	// throw JsonQueryTypeException.format("Cannot index %s with %s", in.getNodeType(), key.getNodeType());
-	//
-	// final JsonNode value = in.get(key.asText());
-	// matcher.match(value != null ? value : NullNode.getInstance(), out);
-	// }
-	// }
-	// }
-
 	@Override
 	public String toString() {
 		final StringBuilder sb = new StringBuilder("{");
diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ValueMatcher.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ValueMatcher.java
@@ -19,10 +19,9 @@ public ValueMatcher(final String name) {
 	}
 
 	@Override
-	public void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate, final boolean emit) throws JsonQueryException {
+	public void match(final Scope scope, final JsonNode in, final Functional.Consumer<List<Pair<String, JsonNode>>> out, final Stack<Pair<String, JsonNode>> accumulate) throws JsonQueryException {
 		accumulate.push(Pair.of(name, in));
-		if (emit)
-			out.accept(accumulate);
+		out.accept(accumulate);
 	}
 
 	@Override
diff --git a/jackson-jq/src/test/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ObjectMatcherTest.java b/jackson-jq/src/test/java/net/thisptr/jackson/jq/internal/tree/matcher/matchers/ObjectMatcherTest.java
@@ -0,0 +1,61 @@
+package net.thisptr.jackson.jq.internal.tree.matcher.matchers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Stack;
+
+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 net.thisptr.jackson.jq.JsonQuery;
+import net.thisptr.jackson.jq.Scope;
+import net.thisptr.jackson.jq.internal.misc.Pair;
+
+public class ObjectMatcherTest {
+
+	@Test
+	void test1() throws Exception {
+		final JsonNode in = new ObjectMapper().readTree("{\"outer\":{\"a\": 1, \"b\": 2}, \"c\": 3}");
+		final ObjectMatcher matcher = new ObjectMatcher(Arrays.asList(
+				Pair.of(JsonQuery.compile("\"outer\""), new ObjectMatcher(Arrays.asList(
+						Pair.of(JsonQuery.compile("(\"a\",\"b\")"), new ValueMatcher("x"))))),
+				Pair.of(JsonQuery.compile("\"c\""), new ValueMatcher("y"))));
+
+		final List<List<Pair<String, JsonNode>>> matches = new ArrayList<>();
+
+		final Stack<Pair<String, JsonNode>> accumulator = new Stack<>();
+		matcher.match(Scope.newEmptyScope(), in, (match) -> {
+			matches.add(new ArrayList<>(match));
+		}, accumulator);
+
+		assertEquals(Arrays.asList(
+				Arrays.asList(Pair.of("x", IntNode.valueOf(1)), Pair.of("y", IntNode.valueOf(3))),
+				Arrays.asList(Pair.of("x", IntNode.valueOf(2)), Pair.of("y", IntNode.valueOf(3)))), matches);
+	}
+
+	@Test
+	void test2() throws Exception {
+		final JsonNode in = new ObjectMapper().readTree("{\"outer\":{\"a\": 1}, \"b\": 2, \"c\": 3}");
+		final ObjectMatcher matcher = new ObjectMatcher(Arrays.asList(
+				Pair.of(JsonQuery.compile("\"outer\""), new ObjectMatcher(Arrays.asList(
+						Pair.of(JsonQuery.compile("\"a\""), new ValueMatcher("x"))))),
+				Pair.of(JsonQuery.compile("(\"b\",\"c\")"), new ValueMatcher("y"))));
+
+		final List<List<Pair<String, JsonNode>>> matches = new ArrayList<>();
+
+		final Stack<Pair<String, JsonNode>> accumulator = new Stack<>();
+		matcher.match(Scope.newEmptyScope(), in, (match) -> {
+			matches.add(new ArrayList<>(match));
+		}, accumulator);
+
+		assertEquals(Arrays.asList(
+				Arrays.asList(Pair.of("x", IntNode.valueOf(1)), Pair.of("y", IntNode.valueOf(2))),
+				Arrays.asList(Pair.of("x", IntNode.valueOf(1)), Pair.of("y", IntNode.valueOf(3)))), matches);
+	}
+}
diff --git a/jackson-jq/src/test/resources/jq-test-extra-ok.json b/jackson-jq/src/test/resources/jq-test-extra-ok.json
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public List<JsonNode> apply(final Scope scope, final JsonNode in) throws JsonQue`
`57`	`57`	`}`
`58`	`58`	`accumulators[0] = newaccumulator;`
`59`	`59`	`}`
`60`		`- }, stack, true);`
	`60`	`+ }, stack);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private static void applyRecursive(final Scope scope, final JsonNode in, final L`
`50`	`50`	`scope2.setValue(var._1, var._2);`
`51`	`51`	`}`
`52`	`52`	`applyRecursive(scope2, in, out, qs.subList(1, qs.size()));`
`53`		`- }, accumulate, true);`
	`53`	`+ }, accumulate);`
`54`	`54`	`} else {`
`55`	`55`	`applyRecursive(scope2, o, out, qs.subList(1, qs.size()));`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public List<JsonNode> apply(final Scope scope, final JsonNode in) throws JsonQue`
`53`	`53`	`// We only use the last value from reduce expression.`
`54`	`54`	`final List<JsonNode> reduceResult = reduceExpr.apply(childScope, accumulators[0]);`
`55`	`55`	`accumulators[0] = reduceResult.isEmpty() ? NullNode.getInstance() : reduceResult.get(reduceResult.size() - 1);`
`56`		`- }, stack, true);`
	`56`	`+ }, stack);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`} finally {`