PROC-1444: Check expected type for Objects

indeedeng · Feb 29, 2024 · c222086 · c222086
1 parent 00f02ee
commit c222086
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/proctor-common/src/main/java/com/indeed/proctor/common/RuleEvaluator.java b/proctor-common/src/main/java/com/indeed/proctor/common/RuleEvaluator.java
@@ -169,13 +169,10 @@ static void checkRuleIsBooleanType(
         // To support users writing rules, be more strict here in requiring the type of the
         // value to be expected before coercion
         Class<?> type = ve.getType(elContext);
-        // if rule is not primitive type attempt to get value with context values
-        if (!ClassUtils.isPrimitiveWrapper(type)) {
-            type = ve.getValue(elContext).getClass();
-        }
-
         if (ClassUtils.isPrimitiveWrapper(type)) {
             type = ClassUtils.wrapperToPrimitive(type);
+        } else if (type == Object.class) {
+            type = ve.getExpectedType();
         }
         // allow null to be coerced for historic reasons
         if ((type != null) && (type != boolean.class)) {