diff --git a/dd-openfeature/src/main/java/com/datadog/openfeature/internal/evaluation/FlagEvaluator.java b/dd-openfeature/src/main/java/com/datadog/openfeature/internal/evaluation/FlagEvaluator.java index 79d0b97c25e..c44d15ba97a 100644 --- a/dd-openfeature/src/main/java/com/datadog/openfeature/internal/evaluation/FlagEvaluator.java +++ b/dd-openfeature/src/main/java/com/datadog/openfeature/internal/evaluation/FlagEvaluator.java @@ -428,13 +428,16 @@ private static boolean compareNumber( /** * Converts a comparison operand to a double. A {@link Number} converts without allocating. Any - * other value goes through {@link #mapValue} as before: a non-numeric value fails with mapValue's - * exception, and null fails when its null result is unboxed. + * other non-null value goes through {@link #mapValue}: a non-numeric value fails with mapValue's + * exception. A null operand throws a {@link NullPointerException} with a fixed message. */ private static double toDouble(final Object value) { if (value instanceof Number) { return ((Number) value).doubleValue(); } + if (value == null) { + throw new NullPointerException("Cannot compare a null value as a number"); + } return mapValue(Double.class, value); } diff --git a/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorMembershipTest.java b/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorMembershipTest.java index 9fcd2b4e298..4679d507871 100644 --- a/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorMembershipTest.java +++ b/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorMembershipTest.java @@ -20,6 +20,7 @@ import com.datadog.openfeature.internal.ufc.Split; import com.datadog.openfeature.internal.ufc.ValueType; import com.datadog.openfeature.internal.ufc.Variant; +import dev.openfeature.sdk.ErrorCode; import dev.openfeature.sdk.MutableContext; import dev.openfeature.sdk.ProviderEvaluation; import dev.openfeature.sdk.Value; @@ -239,6 +240,29 @@ public Iterator iterator() { assertEquals(scan.getErrorMessage(), indexed.getErrorMessage()); } + @TableTest({ + "operator | nullFirst", + "ONE_OF | true ", + "ONE_OF | false ", + "NOT_ONE_OF | true ", + "NOT_ONE_OF | false " + }) + void preservesNullElementOrder(final ConditionOperator operator, final boolean nullFirst) { + final List values = nullFirst ? asList(null, "42") : asList("42", null); + if (nullFirst) { + assertEquals(0, MembershipIndex.throwsAt(MembershipIndex.build(values).lookup(42))); + } + for (final boolean indexed : new boolean[] {false, true}) { + final ProviderEvaluation result = evaluate(operator, values, 42, indexed); + + assertEquals(nullFirst ? ErrorCode.GENERAL : null, result.getErrorCode()); + assertEquals( + nullFirst ? "Cannot compare a null value as a number" : null, result.getErrorMessage()); + assertEquals( + !nullFirst && operator == ConditionOperator.ONE_OF ? "in" : "out", result.getValue()); + } + } + private void assertSameResult( final ConditionOperator operator, final List list, final Object attribute) { final ProviderEvaluation scan = evaluate(operator, list, attribute, false); @@ -284,7 +308,7 @@ private ProviderEvaluation evaluate( singletonMap("in", new Variant("in", "in")), singletonList(allocation)); final ServerConfiguration config = - new ServerConfiguration("", "", null, null, singletonMap(FLAG, flag)); + new ServerConfiguration("", "", true, null, singletonMap(FLAG, flag)); final MutableContext context = new MutableContext("user", singletonMap("attr", toValue(attribute))); return evaluator.evaluate(config, String.class, FLAG, "out", context); diff --git a/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorTest.java b/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorTest.java index 84802d9b2c6..7fa93eb301b 100644 --- a/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorTest.java +++ b/dd-openfeature/src/test/java/com/datadog/openfeature/internal/evaluation/FlagEvaluatorTest.java @@ -18,7 +18,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assumptions.assumeTrue; import com.datadog.openfeature.ExperimentationOptOutMode; import com.datadog.openfeature.internal.ufc.Allocation; @@ -381,7 +380,7 @@ void reportsNumericConversionErrorsAsMapValueDoes( } @Test - void reportsANullListElementAsMapValueDoes() { + void reportsANullListElementWithADeterministicMessage() { final MutableContext context = new MutableContext("user"); context.add("score", 5); @@ -392,10 +391,7 @@ void reportsANullListElementAsMapValueDoes() { context); assertEquals(ErrorCode.GENERAL, result.getErrorCode()); - final String expectedMessage = mapValueFailure(null).getMessage(); - // Before JDK 15 a NullPointerException has no message, so there is nothing to compare. - assumeTrue(expectedMessage != null, "helpful NullPointerException messages are unavailable"); - assertEquals(expectedMessage, result.getErrorMessage()); + assertEquals("Cannot compare a null value as a number", result.getErrorMessage()); } @Test