fix: clarify error message when a single value is needed but fewer/mo…

…re values are present
telekom · Apr 9, 2024 · a1c2fcf · a1c2fcf
1 parent 53d7504
commit a1c2fcf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/main/java/de/telekom/jsonfilter/exception/NoSingleValueException.java b/src/main/java/de/telekom/jsonfilter/exception/NoSingleValueException.java
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2024 Deutsche Telekom AG
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package de.telekom.jsonfilter.exception;
+
+public class NoSingleValueException extends Exception {
+
+    public NoSingleValueException(String jsonPath, int numberOfActualResults) {
+        super("The evaluation of \"" + jsonPath + "\" did not return a single value. Expected 1 value, got " + numberOfActualResults + ".");
+    }
+}
diff --git a/src/main/java/de/telekom/jsonfilter/exception/TooManyValueExeption.java b/src/main/java/de/telekom/jsonfilter/exception/TooManyValueExeption.java
diff --git a/src/main/java/de/telekom/jsonfilter/operator/comparison/ComparisonOperator.java b/src/main/java/de/telekom/jsonfilter/operator/comparison/ComparisonOperator.java
@@ -7,7 +7,7 @@
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.internal.path.PathCompiler;
-import de.telekom.jsonfilter.exception.TooManyValueExeption;
+import de.telekom.jsonfilter.exception.NoSingleValueException;
 import de.telekom.jsonfilter.operator.EvaluationResult;
 import de.telekom.jsonfilter.operator.Operator;
 import de.telekom.jsonfilter.operator.ValidationResult;
@@ -54,12 +54,12 @@ public EvaluationResult evaluate(String json) {
 
     abstract EvaluationResult compare(String json, String jsonPath, T expectedValue);
 
-    protected Comparable<T> getActualValue(String json, String jsonPath) throws TooManyValueExeption {
+    protected Comparable<T> getActualValue(String json, String jsonPath) throws NoSingleValueException {
         var valueList = getActualValues(json, jsonPath);
         if (valueList.size() == 1) {
             return valueList.getFirst();
         } else {
-            throw new TooManyValueExeption(jsonPath, valueList.size());
+            throw new NoSingleValueException(jsonPath, valueList.size());
         }
     }
 

diff --git a/src/main/java/de/telekom/jsonfilter/operator/comparison/EqualsOperator.java b/src/main/java/de/telekom/jsonfilter/operator/comparison/EqualsOperator.java
@@ -6,6 +6,7 @@
 
 import de.telekom.jsonfilter.operator.EvaluationResult;
 
+
 public class EqualsOperator<T> extends ComparisonOperator<T> {
 
     public EqualsOperator(String jsonPath, T expectedValue) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@

		import de.telekom.jsonfilter.operator.EvaluationResult;


		public class EqualsOperator<T> extends ComparisonOperator<T> {

		public EqualsOperator(String jsonPath, T expectedValue) {
Expand Down