Fix syntax errors

chrfwow · chrfwow · commit 021a50bca908 · 2025-06-17T11:39:37.000+02:00
Signed-off-by: christian.lutnik &lt;christian.lutnik@dynatrace.com&gt;
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/Fractional.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/Fractional.java
@@ -18,7 +18,7 @@ public String key() {
         return "fractional";
     }
 
-    public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationException {
+    public Object evaluate(List arguments, Object data, String jsonPath) throws JsonLogicEvaluationException {
         if (arguments.size() < 2) {
             return null;
         }
@@ -53,7 +53,7 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx
 
         try {
             for (Object dist : distibutions) {
-                FractionProperty fractionProperty = new FractionProperty(dist);
+                FractionProperty fractionProperty = new FractionProperty(dist, jsonPath);
                 propertyList.add(fractionProperty);
                 totalWeight += fractionProperty.getWeight();
             }
@@ -63,11 +63,11 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx
         }
 
         // find distribution
-        return distributeValue(bucketBy, propertyList, totalWeight);
+        return distributeValue(bucketBy, propertyList, totalWeight, jsonPath);
     }
 
     private static String distributeValue(
-            final String hashKey, final List<FractionProperty> propertyList, int totalWeight)
+            final String hashKey, final List<FractionProperty> propertyList, int totalWeight, String jsonPath)
             throws JsonLogicEvaluationException {
         byte[] bytes = hashKey.getBytes(StandardCharsets.UTF_8);
         int mmrHash = MurmurHash3.hash32x86(bytes, 0, bytes.length, 0);
@@ -83,7 +83,7 @@ private static String distributeValue(
         }
 
         // this shall not be reached
-        throw new JsonLogicEvaluationException("Unable to find a correct bucket");
+        throw new JsonLogicEvaluationException("Unable to find a correct bucket", jsonPath);
     }
 
     @Getter
@@ -96,27 +96,28 @@ protected final void finalize() {
             // DO NOT REMOVE, spotbugs: CT_CONSTRUCTOR_THROW
         }
 
-        FractionProperty(final Object from) throws JsonLogicException {
+        FractionProperty(final Object from, String jsonPath) throws JsonLogicException {
             if (!(from instanceof List<?>)) {
-                throw new JsonLogicException("Property is not an array");
+                throw new JsonLogicException("Property is not an array", jsonPath);
             }
 
             final List<?> array = (List) from;
 
             if (array.isEmpty()) {
-                throw new JsonLogicException("Fraction property needs at least one element");
+                throw new JsonLogicException("Fraction property needs at least one element", jsonPath);
             }
 
             // first must be a string
             if (!(array.get(0) instanceof String)) {
-                throw new JsonLogicException("First element of the fraction property is not a string variant");
+                throw new JsonLogicException("First element of the fraction property is not a string variant",
+                        jsonPath);
             }
 
             variant = (String) array.get(0);
             if (array.size() >= 2) {
                 // second element must be a number
                 if (!(array.get(1) instanceof Number)) {
-                    throw new JsonLogicException("Second element of the fraction property is not a number");
+                    throw new JsonLogicException("Second element of the fraction property is not a number", jsonPath);
                 }
                 weight = ((Number) array.get(1)).intValue();
             } else {
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/SemVer.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/SemVer.java
@@ -37,7 +37,7 @@ public String key() {
         return "sem_ver";
     }
 
-    public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationException {
+    public Object evaluate(List arguments, Object data, String jsonPath) throws JsonLogicEvaluationException {
 
         if (arguments.size() != 3) {
             log.debug("Incorrect number of arguments for sem_ver operator");
@@ -75,10 +75,10 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx
             return null;
         }
 
-        return compare(arg2Parsed, arg1Parsed, arg3Parsed);
+        return compare(arg2Parsed, arg1Parsed, arg3Parsed, jsonPath);
     }
 
-    private static boolean compare(final String operator, final Semver arg1, final Semver arg2)
+    private static boolean compare(final String operator, final Semver arg1, final Semver arg2, final String jsonPath)
             throws JsonLogicEvaluationException {
 
         int comp = arg1.compareTo(arg2);
@@ -102,7 +102,7 @@ private static boolean compare(final String operator, final Semver arg1, final S
                 return arg1.getMinor() == arg2.getMinor() && arg1.getMajor() == arg2.getMajor();
             default:
                 throw new JsonLogicEvaluationException(
-                        String.format("Unsupported operator received. Operator: %s", operator));
+                        String.format("Unsupported operator received. Operator: %s", operator), jsonPath);
         }
     }
 }
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/StringComp.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/StringComp.java
@@ -17,7 +17,7 @@ public String key() {
         return type.key;
     }
 
-    public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationException {
+    public Object evaluate(List arguments, Object data, String jsonPath) throws JsonLogicEvaluationException {
         if (arguments.size() != 2) {
             log.debug("Incorrect number of arguments for String comparison operator");
             return null;
diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/connector/sync/SyncStreamQueueSourceTest.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/connector/sync/SyncStreamQueueSourceTest.java
@@ -27,7 +27,6 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 class SyncStreamQueueSourceTest {
@@ -48,13 +47,11 @@ public void init() throws Exception {
 
         stub = mock(FlagSyncServiceStub.class);
         when(stub.withDeadlineAfter(anyLong(), any())).thenReturn(stub);
-        doAnswer(new Answer<Void>() {
-                    public Void answer(InvocationOnMock invocation) {
-                        latch.countDown();
-                        Object[] args = invocation.getArguments();
-                        observer = (QueueingStreamObserver<SyncFlagsResponse>) args[1];
-                        return null;
-                    }
+        doAnswer((Answer<Void>) invocation -> {
+                    Object[] args = invocation.getArguments();
+                    observer = (QueueingStreamObserver<SyncFlagsResponse>) args[1];
+                    latch.countDown();
+                    return null;
                 })
                 .when(stub)
                 .syncFlags(any(SyncFlagsRequest.class), any(QueueingStreamObserver.class)); // Mock the initialize
diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/FractionalTest.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/FractionalTest.java
@@ -41,7 +41,7 @@ void validate_emptyJson_targetingReturned(@ConvertWith(FileContentConverter.clas
         data.put(FLAGD_PROPS_KEY, flagdProperties);
 
         // when
-        Object evaluate = fractional.evaluate(testData.rule, data);
+        Object evaluate = fractional.evaluate(testData.rule, data, "path");
 
         // then
         assertEquals(testData.result, evaluate);
diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/SemVerTest.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/SemVerTest.java
@@ -33,7 +33,7 @@ void testValidCases(List<String> args) throws JsonLogicEvaluationException {
         final SemVer semVer = new SemVer();
 
         // when
-        Object result = semVer.evaluate(args, new Object());
+        Object result = semVer.evaluate(args, new Object(), "jsonPath");
 
         // then
         if (!(result instanceof Boolean)) {
@@ -58,6 +58,6 @@ void testInvalidCases(List args) throws JsonLogicEvaluationException {
         final SemVer semVer = new SemVer();
 
         // then
-        assertNull(semVer.evaluate(args, new Object()));
+        assertNull(semVer.evaluate(args, new Object(), "jsonPath"));
     }
 }
diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/StringCompTest.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/targeting/StringCompTest.java
@@ -15,7 +15,7 @@ public void startsWithEvaluation() throws JsonLogicEvaluationException {
         final StringComp startsWith = new StringComp(StringComp.Type.STARTS_WITH);
 
         // when
-        Object result = startsWith.evaluate(Arrays.asList("abc@123.com", "abc"), new Object());
+        Object result = startsWith.evaluate(Arrays.asList("abc@123.com", "abc"), new Object(), "jsonPath");
 
         // then
         if (!(result instanceof Boolean)) {
@@ -31,7 +31,7 @@ public void endsWithEvaluation() throws JsonLogicEvaluationException {
         final StringComp endsWith = new StringComp(StringComp.Type.ENDS_WITH);
 
         // when
-        Object result = endsWith.evaluate(Arrays.asList("abc@123.com", "123.com"), new Object());
+        Object result = endsWith.evaluate(Arrays.asList("abc@123.com", "123.com"), new Object(), "jsonPath");
 
         // then
         if (!(result instanceof Boolean)) {
@@ -47,7 +47,7 @@ public void invalidTypeCheckArg1() throws JsonLogicEvaluationException {
         final StringComp operator = new StringComp(StringComp.Type.STARTS_WITH);
 
         // when
-        Object result = operator.evaluate(Arrays.asList(1230, "12"), new Object());
+        Object result = operator.evaluate(Arrays.asList(1230, "12"), new Object(), "jsonPath");
 
         // then
         assertThat(result).isNull();
@@ -59,7 +59,7 @@ public void invalidTypeCheckArg2() throws JsonLogicEvaluationException {
         final StringComp operator = new StringComp(StringComp.Type.STARTS_WITH);
 
         // when
-        Object result = operator.evaluate(Arrays.asList("abc@123.com", 123), new Object());
+        Object result = operator.evaluate(Arrays.asList("abc@123.com", 123), new Object(), "jsonPath");
 
         // then
         assertThat(result).isNull();
@@ -71,7 +71,7 @@ public void invalidNumberOfArgs() throws JsonLogicEvaluationException {
         final StringComp operator = new StringComp(StringComp.Type.STARTS_WITH);
 
         // when
-        Object result = operator.evaluate(Arrays.asList("123", "12", "1"), new Object());
+        Object result = operator.evaluate(Arrays.asList("123", "12", "1"), new Object(), "jsonPath");
 
         // then
         assertThat(result).isNull();

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public String key() {`
`18`	`18`	`return "fractional";`
`19`	`19`	`}`
`20`	`20`
`21`		`- public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationException {`
	`21`	`+ public Object evaluate(List arguments, Object data, String jsonPath) throws JsonLogicEvaluationException {`
`22`	`22`	`if (arguments.size() < 2) {`
`23`	`23`	`return null;`
`24`	`24`	`}`
`@@ -53,7 +53,7 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx`
`53`	`53`
`54`	`54`	`try {`
`55`	`55`	`for (Object dist : distibutions) {`
`56`		`- FractionProperty fractionProperty = new FractionProperty(dist);`
	`56`	`+ FractionProperty fractionProperty = new FractionProperty(dist, jsonPath);`
`57`	`57`	`propertyList.add(fractionProperty);`
`58`	`58`	`totalWeight += fractionProperty.getWeight();`
`59`	`59`	`}`
`@@ -63,11 +63,11 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// find distribution`
`66`		`- return distributeValue(bucketBy, propertyList, totalWeight);`
	`66`	`+ return distributeValue(bucketBy, propertyList, totalWeight, jsonPath);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`private static String distributeValue(`
`70`		`- final String hashKey, final List<FractionProperty> propertyList, int totalWeight)`
	`70`	`+ final String hashKey, final List<FractionProperty> propertyList, int totalWeight, String jsonPath)`
`71`	`71`	`throws JsonLogicEvaluationException {`
`72`	`72`	`byte[] bytes = hashKey.getBytes(StandardCharsets.UTF_8);`
`73`	`73`	`int mmrHash = MurmurHash3.hash32x86(bytes, 0, bytes.length, 0);`
`@@ -83,7 +83,7 @@ private static String distributeValue(`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`// this shall not be reached`
`86`		`- throw new JsonLogicEvaluationException("Unable to find a correct bucket");`
	`86`	`+ throw new JsonLogicEvaluationException("Unable to find a correct bucket", jsonPath);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Getter`
`@@ -96,27 +96,28 @@ protected final void finalize() {`
`96`	`96`	`// DO NOT REMOVE, spotbugs: CT_CONSTRUCTOR_THROW`
`97`	`97`	`}`
`98`	`98`
`99`		`- FractionProperty(final Object from) throws JsonLogicException {`
	`99`	`+ FractionProperty(final Object from, String jsonPath) throws JsonLogicException {`
`100`	`100`	`if (!(from instanceof List<?>)) {`
`101`		`- throw new JsonLogicException("Property is not an array");`
	`101`	`+ throw new JsonLogicException("Property is not an array", jsonPath);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`final List<?> array = (List) from;`
`105`	`105`
`106`	`106`	`if (array.isEmpty()) {`
`107`		`- throw new JsonLogicException("Fraction property needs at least one element");`
	`107`	`+ throw new JsonLogicException("Fraction property needs at least one element", jsonPath);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`// first must be a string`
`111`	`111`	`if (!(array.get(0) instanceof String)) {`
`112`		`- throw new JsonLogicException("First element of the fraction property is not a string variant");`
	`112`	`+ throw new JsonLogicException("First element of the fraction property is not a string variant",`
	`113`	`+ jsonPath);`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`variant = (String) array.get(0);`
`116`	`117`	`if (array.size() >= 2) {`
`117`	`118`	`// second element must be a number`
`118`	`119`	`if (!(array.get(1) instanceof Number)) {`
`119`		`- throw new JsonLogicException("Second element of the fraction property is not a number");`
	`120`	`+ throw new JsonLogicException("Second element of the fraction property is not a number", jsonPath);`
`120`	`121`	`}`
`121`	`122`	`weight = ((Number) array.get(1)).intValue();`
`122`	`123`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public String key() {`
`37`	`37`	`return "sem_ver";`
`38`	`38`	`}`
`39`	`39`
`40`		`- public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationException {`
	`40`	`+ public Object evaluate(List arguments, Object data, String jsonPath) throws JsonLogicEvaluationException {`
`41`	`41`
`42`	`42`	`if (arguments.size() != 3) {`
`43`	`43`	`log.debug("Incorrect number of arguments for sem_ver operator");`
`@@ -75,10 +75,10 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx`
`75`	`75`	`return null;`
`76`	`76`	`}`
`77`	`77`
`78`		`- return compare(arg2Parsed, arg1Parsed, arg3Parsed);`
	`78`	`+ return compare(arg2Parsed, arg1Parsed, arg3Parsed, jsonPath);`
`79`	`79`	`}`
`80`	`80`
`81`		`- private static boolean compare(final String operator, final Semver arg1, final Semver arg2)`
	`81`	`+ private static boolean compare(final String operator, final Semver arg1, final Semver arg2, final String jsonPath)`
`82`	`82`	`throws JsonLogicEvaluationException {`
`83`	`83`
`84`	`84`	`int comp = arg1.compareTo(arg2);`
`@@ -102,7 +102,7 @@ private static boolean compare(final String operator, final Semver arg1, final S`
`102`	`102`	`return arg1.getMinor() == arg2.getMinor() && arg1.getMajor() == arg2.getMajor();`
`103`	`103`	`default:`
`104`	`104`	`throw new JsonLogicEvaluationException(`
`105`		`- String.format("Unsupported operator received. Operator: %s", operator));`
	`105`	`+ String.format("Unsupported operator received. Operator: %s", operator), jsonPath);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public String key() {`
`17`	`17`	`return type.key;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationException {`
	`20`	`+ public Object evaluate(List arguments, Object data, String jsonPath) throws JsonLogicEvaluationException {`
`21`	`21`	`if (arguments.size() != 2) {`
`22`	`22`	`log.debug("Incorrect number of arguments for String comparison operator");`
`23`	`23`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void testValidCases(List<String> args) throws JsonLogicEvaluationException {`
`33`	`33`	`final SemVer semVer = new SemVer();`
`34`	`34`
`35`	`35`	`// when`
`36`		`- Object result = semVer.evaluate(args, new Object());`
	`36`	`+ Object result = semVer.evaluate(args, new Object(), "jsonPath");`
`37`	`37`
`38`	`38`	`// then`
`39`	`39`	`if (!(result instanceof Boolean)) {`
`@@ -58,6 +58,6 @@ void testInvalidCases(List args) throws JsonLogicEvaluationException {`
`58`	`58`	`final SemVer semVer = new SemVer();`
`59`	`59`
`60`	`60`	`// then`
`61`		`- assertNull(semVer.evaluate(args, new Object()));`
	`61`	`+ assertNull(semVer.evaluate(args, new Object(), "jsonPath"));`
`62`	`62`	`}`
`63`	`63`	`}`