From 39b489339c0c436a69177030f64b7f5691a2fea8 Mon Sep 17 00:00:00 2001
From: Marc PYNAERT <marc.pynaert@gmail.com>
Date: Sun, 14 Apr 2019 13:29:48 +0200
Subject: [PATCH] Fix compilation errors (ValueNodes.ValueListNode =>
ValueListNode)
---
.../src/main/java/com/jayway/jsonpath/Criteria.java | 8 ++++----
.../jsonpath/internal/filter/EvaluatorFactory.java | 12 +++++++-----
2 files changed, 11 insertions(+), 9 deletions(-)
mode change 100644 => 100755 json-path/src/main/java/com/jayway/jsonpath/Criteria.java
mode change 100644 => 100755 json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
diff --git a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
old mode 100644
new mode 100755
index 5155b486..7f2706df
--- a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
@@ -19,6 +19,7 @@ import com.jayway.jsonpath.internal.Utils;
import com.jayway.jsonpath.internal.filter.RelationalExpressionNode;
import com.jayway.jsonpath.internal.filter.RelationalOperator;
import com.jayway.jsonpath.internal.filter.ValueNode;
+import com.jayway.jsonpath.internal.filter.ValueNodes;
import java.util.ArrayList;
import java.util.Arrays;
@@ -28,9 +29,8 @@ import java.util.List;
import java.util.regex.Pattern;
import static com.jayway.jsonpath.internal.Utils.notNull;
-import com.jayway.jsonpath.internal.filter.ValueNodes;
-import static com.jayway.jsonpath.internal.filter.ValueNodes.ValueListNode;
import static com.jayway.jsonpath.internal.filter.ValueNodes.PredicateNode;
+import static com.jayway.jsonpath.internal.filter.ValueNodes.ValueListNode;
/**
*
@@ -317,7 +317,7 @@ public class Criteria implements Predicate {
public Criteria anyof(Collection<?> c) {
notNull(c, "collection can not be null");
this.criteriaType = RelationalOperator.ANYOF;
- this.right = new ValueNode.ValueListNode(c);
+ this.right = new ValueListNode(c);
return this;
}
@@ -342,7 +342,7 @@ public class Criteria implements Predicate {
public Criteria noneof(Collection<?> c) {
notNull(c, "collection can not be null");
this.criteriaType = RelationalOperator.NONEOF;
- this.right = new ValueNode.ValueListNode(c);
+ this.right = new ValueListNode(c);
return this;
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
old mode 100644
new mode 100755
index a006e638..cfbfdff7
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
@@ -2,11 +2,13 @@ package com.jayway.jsonpath.internal.filter;
import com.jayway.jsonpath.JsonPathException;
import com.jayway.jsonpath.Predicate;
-import static com.jayway.jsonpath.internal.filter.ValueNodes.*;
import java.util.HashMap;
import java.util.Map;
+import static com.jayway.jsonpath.internal.filter.ValueNodes.PatternNode;
+import static com.jayway.jsonpath.internal.filter.ValueNodes.ValueListNode;
+
public class EvaluatorFactory {
private static final Map<RelationalOperator, Evaluator> evaluators = new HashMap<RelationalOperator, Evaluator>();
@@ -301,7 +303,7 @@ public class EvaluatorFactory {
private static class AnyOfEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
- ValueNode.ValueListNode rightValueListNode;
+ ValueListNode rightValueListNode;
if (right.isJsonNode()) {
ValueNode vn = right.asJsonNode().asValueListNode(ctx);
if (vn.isUndefinedNode()) {
@@ -312,7 +314,7 @@ public class EvaluatorFactory {
} else {
rightValueListNode = right.asValueListNode();
}
- ValueNode.ValueListNode leftValueListNode;
+ ValueListNode leftValueListNode;
if (left.isJsonNode()) {
ValueNode vn = left.asJsonNode().asValueListNode(ctx);
if (vn.isUndefinedNode()) {
@@ -338,7 +340,7 @@ public class EvaluatorFactory {
private static class NoneOfEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
- ValueNode.ValueListNode rightValueListNode;
+ ValueListNode rightValueListNode;
if (right.isJsonNode()) {
ValueNode vn = right.asJsonNode().asValueListNode(ctx);
if (vn.isUndefinedNode()) {
@@ -349,7 +351,7 @@ public class EvaluatorFactory {
} else {
rightValueListNode = right.asValueListNode();
}
- ValueNode.ValueListNode leftValueListNode;
+ ValueListNode leftValueListNode;
if (left.isJsonNode()) {
ValueNode vn = left.asJsonNode().asValueListNode(ctx);
if (vn.isUndefinedNode()) {