fixup: implementation

Author: toddbaert

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/rpc/RpcResolver.java

@@ -254,6 +254,8 @@ private <ValT, ReqT extends Message, ResT extends Message> ProviderEvaluation<Va
         final ProviderEvaluation.ProviderEvaluationBuilder<ValT> resultBuilder;
         if ("DEFAULT".equals(reason) && variant.isEmpty()) {
             resultBuilder = ProviderEvaluation.<ValT>builder().value(defaultValue);
+        } else if ("DISABLED".equals(reason)) {
+            resultBuilder = ProviderEvaluation.<ValT>builder().value(defaultValue);
         } else {
             resultBuilder = ProviderEvaluation.<ValT>builder().value(value).variant(variant);
         }

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/InProcessResolverTest.java

@@ -313,7 +313,7 @@ public void disabledFlag() throws Exception {
         ProviderEvaluation<Boolean> disabledFlag =
                 inProcessResolver.booleanEvaluation("disabledFlag", false, new ImmutableContext());
         assertEquals(null, disabledFlag.getErrorCode());
-        assertEquals(null, disabledFlag.getValue());
+        assertEquals(false, disabledFlag.getValue());
         assertEquals(null, disabledFlag.getVariant());
         assertEquals(Reason.DISABLED.toString(), disabledFlag.getReason());
 

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/MockEvaluator.java

@@ -101,6 +101,7 @@ private <T> ProviderEvaluation<T> resolve(Class<T> type, String key, T defaultVa
         // state check
         if ("DISABLED".equals(flag.getState())) {
             return ProviderEvaluation.<T>builder()
+                    .value(defaultValue)
                     .reason(Reason.DISABLED.toString())
                     .flagMetadata(getFlagMetadata(flagSetMetadata, flag))
                     .build();

tools/flagd-api-testkit/src/main/java/dev/openfeature/contrib/tools/flagd/api/testkit/EvaluationSteps.java

@@ -97,12 +97,6 @@ public void resolvedValueEquals(String value) throws IOException {
         assertThat(state.evaluation.getValue()).isEqualTo(EvaluatorUtils.convert(value, state.flagType));
     }
 
-    /** Asserts the resolved value is absent (null) — used for disabled flags where the evaluator omits the value. */
-    @Then("the resolved value should be absent")
-    public void resolvedValueIsAbsent() {
-        assertThat(state.evaluation.getValue()).isNull();
-    }
-
     /** Asserts the evaluation reason matches the expected value. */
     @Then("the reason should be {string}")
     public void reasonEquals(String reason) {

tools/flagd-core/src/main/java/dev/openfeature/contrib/tools/flagd/core/FlagdCore.java

@@ -210,9 +210,10 @@ private <T> ProviderEvaluation<T> resolve(Class<T> type, String key, T defaultVa
                     .build();
         }
 
-        // state check
+        // state check (DISABLED flags default with reason = DEFAULT)
         if ("DISABLED".equals(flag.getState())) {
             return ProviderEvaluation.<T>builder()
+                    .value(defaultValue)
                     .reason(Reason.DISABLED.toString())
                     .flagMetadata(getFlagMetadata(currentFlagSetMetadata, flag))
                     .build();

tools/flagd-core/src/test/java/dev/openfeature/contrib/tools/flagd/core/FlagdCoreTest.java

@@ -80,18 +80,18 @@ void resolveBooleanValue_flagNotFound_returnsError() {
     }
 
     @Test
-    void resolveBooleanValue_disabledFlag_returnsDisabledReason() {
+    void resolveBooleanValue_disabledFlag_returnsDisabledReasonWithDefault() {
         ProviderEvaluation<Boolean> result =
                 flagdCore.resolveBooleanValue("disabledFlag", false, new ImmutableContext());
 
         assertThat(result.getErrorCode()).isNull();
-        assertThat(result.getValue()).isNull();
+        assertThat(result.getValue()).isFalse();
         assertThat(result.getVariant()).isNull();
         assertThat(result.getReason()).isEqualTo(Reason.DISABLED.toString());
     }
 
     @Test
-    void resolveObjectValue_disabledFlag_returnsDisabledReasonWithNullValue() {
+    void resolveObjectValue_disabledFlag_returnsDisabledReasonWithDefault() {
         ProviderEvaluation<Value> result =
                 flagdCore.resolveObjectValue("disabledFlag", null, new ImmutableContext());