Skip to content

Commit 60598cf

Browse files
guidobreiguidobrei
committed
Use evaluate without jsonPath internally
1 parent 986223f commit 60598cf

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

‎src/main/java/io/github/jamsesso/jsonlogic/JsonLogic.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public Object apply(String json, Object data) throws JsonLogicException {
133133
}
134134

135135
try {
136-
return evaluator.evaluate(parseCache.get(json), data, "");
136+
return evaluator.evaluate(parseCache.get(json), data);
137137
} catch (JsonLogicException e) {
138138
e.prependPartialJsonPath("$");
139139
throw e;

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/JsonLogicEvaluator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public Object evaluate(JsonLogicVariable variable, Object data)
8989
Object defaultValue;
9090

9191
try {
92-
defaultValue = evaluate(variable.getDefaultValue(), null, "");
92+
defaultValue = evaluate(variable.getDefaultValue(), null);
9393
} catch (JsonLogicEvaluationException e) {
9494
e.prependPartialJsonPath("[1]");
9595
throw e;
@@ -102,7 +102,7 @@ public Object evaluate(JsonLogicVariable variable, Object data)
102102
Object key;
103103

104104
try {
105-
key = evaluate(variable.getKey(), data, "");
105+
key = evaluate(variable.getKey(), data);
106106
} catch (JsonLogicEvaluationException e) {
107107
e.prependPartialJsonPath("[0]");
108108
throw e;
@@ -111,7 +111,7 @@ public Object evaluate(JsonLogicVariable variable, Object data)
111111
if (key == null) {
112112
Object varValue;
113113
try {
114-
varValue = evaluate(variable.getDefaultValue(), null, "");
114+
varValue = evaluate(variable.getDefaultValue(), null);
115115
} catch (JsonLogicEvaluationException e) {
116116
e.prependPartialJsonPath("[0]");
117117
throw e;
@@ -214,7 +214,7 @@ public List<Object> evaluate(JsonLogicArray array, Object data) throws JsonLogic
214214
for (int index = 0; index < array.size(); index++) {
215215
JsonLogicNode element = array.get(index);
216216
try {
217-
values.add(evaluate(element, data, ""));
217+
values.add(evaluate(element, data));
218218
} catch (JsonLogicEvaluationException e) {
219219
e.prependPartialJsonPath("[" + index + "]");
220220
throw e;

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/AllExpression.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
2828

2929
Object maybeArray;
3030
try {
31-
maybeArray = evaluator.evaluate(arguments.get(0), data, "");
31+
maybeArray = evaluator.evaluate(arguments.get(0), data);
3232
} catch (JsonLogicEvaluationException e) {
3333
e.prependPartialJsonPath("[0]");
3434
throw e;
@@ -51,7 +51,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
5151
int index = 1;
5252
for (Object item : array) {
5353
try {
54-
if (!JsonLogic.truthy(evaluator.evaluate(arguments.get(1), item, ""))) {
54+
if (!JsonLogic.truthy(evaluator.evaluate(arguments.get(1), item))) {
5555
return false;
5656
}
5757
} catch (JsonLogicEvaluationException e) {

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/ArrayHasExpression.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
3232
Object maybeArray;
3333

3434
try {
35-
maybeArray = evaluator.evaluate(arguments.get(0), data, "");
35+
maybeArray = evaluator.evaluate(arguments.get(0), data);
3636
} catch (JsonLogicEvaluationException e) {
3737
e.prependPartialJsonPath("[0]");
3838
throw e;
@@ -53,7 +53,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
5353

5454
for (Object item : new ArrayLike(maybeArray)) {
5555
try {
56-
if (JsonLogic.truthy(evaluator.evaluate(arguments.get(1), item, ""))) {
56+
if (JsonLogic.truthy(evaluator.evaluate(arguments.get(1), item))) {
5757
return isSome;
5858
}
5959
} catch (JsonLogicEvaluationException e) {

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/FilterExpression.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
3131

3232
Object maybeArray;
3333
try {
34-
maybeArray = evaluator.evaluate(arguments.get(0), data, "");
34+
maybeArray = evaluator.evaluate(arguments.get(0), data);
3535
} catch (JsonLogicEvaluationException e) {
3636
e.prependPartialJsonPath("[0]");
3737
throw e;
@@ -45,7 +45,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
4545

4646
for (Object item : new ArrayLike(maybeArray)) {
4747
try {
48-
if (JsonLogic.truthy(evaluator.evaluate(arguments.get(1), item, ""))) {
48+
if (JsonLogic.truthy(evaluator.evaluate(arguments.get(1), item))) {
4949
result.add(item);
5050
}
5151
} catch (JsonLogicEvaluationException e) {

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/IfExpression.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
3232
// If there is only a single argument, simply evaluate & return that argument.
3333
if (arguments.size() == 1) {
3434
try {
35-
return evaluator.evaluate(arguments.get(0), data, "");
35+
return evaluator.evaluate(arguments.get(0), data);
3636
} catch (JsonLogicEvaluationException e) {
3737
e.prependPartialJsonPath("[0]");
3838
throw e;
@@ -42,7 +42,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
4242
// If there is 2 arguments, only evaluate the second argument if the first argument is truthy.
4343
if (arguments.size() == 2) {
4444
try {
45-
if (!JsonLogic.truthy(evaluator.evaluate(arguments.get(0), data, ""))) {
45+
if (!JsonLogic.truthy(evaluator.evaluate(arguments.get(0), data))) {
4646
return null;
4747
}
4848
} catch (JsonLogicEvaluationException e) {
@@ -51,7 +51,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
5151
}
5252

5353
try {
54-
return evaluator.evaluate(arguments.get(1), data, "");
54+
return evaluator.evaluate(arguments.get(1), data);
5555
} catch (JsonLogicEvaluationException e) {
5656
e.prependPartialJsonPath("[1]");
5757
throw e;
@@ -63,7 +63,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
6363
JsonLogicNode resultIfTrue = arguments.get(i + 1);
6464

6565
try {
66-
if (!JsonLogic.truthy(evaluator.evaluate(condition, data, ""))) {
66+
if (!JsonLogic.truthy(evaluator.evaluate(condition, data))) {
6767
continue;
6868
}
6969
} catch (JsonLogicEvaluationException e) {
@@ -72,7 +72,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
7272
}
7373

7474
try {
75-
return evaluator.evaluate(resultIfTrue, data, "");
75+
return evaluator.evaluate(resultIfTrue, data);
7676
} catch (JsonLogicEvaluationException e) {
7777
e.prependPartialJsonPath("[" + (i + 1) + "]");
7878
throw e;
@@ -85,7 +85,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
8585
}
8686

8787
try {
88-
return evaluator.evaluate(arguments.get(arguments.size() - 1), data, "");
88+
return evaluator.evaluate(arguments.get(arguments.size() - 1), data);
8989
} catch (JsonLogicEvaluationException e) {
9090
e.prependPartialJsonPath("[" + (arguments.size() - 1) + "]");
9191
throw e;

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/LogicExpression.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
3535
JsonLogicNode element = arguments.get(index);
3636

3737
try {
38-
result = evaluator.evaluate(element, data, "");
38+
result = evaluator.evaluate(element, data);
3939
} catch (JsonLogicEvaluationException e) {
4040
e.prependPartialJsonPath("[" + (index) + "]");
4141
throw e;

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/MapExpression.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
3232
Object maybeArray;
3333

3434
try {
35-
maybeArray = evaluator.evaluate(arguments.get(0), data, "");
35+
maybeArray = evaluator.evaluate(arguments.get(0), data);
3636
} catch (JsonLogicEvaluationException e) {
3737
e.prependPartialJsonPath("[0]");
3838
throw e;
@@ -46,7 +46,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
4646

4747
for (Object item : new ArrayLike(maybeArray)) {
4848
try {
49-
result.add(evaluator.evaluate(arguments.get(1), item, ""));
49+
result.add(evaluator.evaluate(arguments.get(1), item));
5050
} catch (JsonLogicEvaluationException e) {
5151
e.prependPartialJsonPath("[1]");
5252
throw e;

‎src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/ReduceExpression.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
3232
Object accumulator;
3333

3434
try {
35-
maybeArray = evaluator.evaluate(arguments.get(0), data, "");
35+
maybeArray = evaluator.evaluate(arguments.get(0), data);
3636
} catch (JsonLogicEvaluationException e) {
3737
e.prependPartialJsonPath("[0]");
3838
throw e;
3939
}
4040

4141
try {
42-
accumulator = evaluator.evaluate(arguments.get(2), data, "");
42+
accumulator = evaluator.evaluate(arguments.get(2), data);
4343
} catch (JsonLogicEvaluationException e) {
4444
e.prependPartialJsonPath("[2]");
4545
throw e;
@@ -55,7 +55,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
5555
for (Object item : new ArrayLike(maybeArray)) {
5656
context.put("current", item);
5757
try {
58-
context.put("accumulator", evaluator.evaluate(arguments.get(1), context, ""));
58+
context.put("accumulator", evaluator.evaluate(arguments.get(1), context));
5959
} catch (JsonLogicEvaluationException e) {
6060
e.prependPartialJsonPath("[1]");
6161
throw e;

0 commit comments

Comments
 (0)