Merge pull request #2923 from DataDog/typo/FFL-1184-resolve-value-method

[flags] Generic resolve method

Author: typotter

features/dd-sdk-android-flags/api/apiSurface

@@ -15,10 +15,23 @@ interface com.datadog.android.flags.featureflags.FlagsClient
   fun resolveDoubleValue(String, Double): Double
   fun resolveIntValue(String, Int): Int
   fun resolveStructureValue(String, org.json.JSONObject): org.json.JSONObject
+  fun <T: Any> resolve(String, T): com.datadog.android.flags.model.ResolutionDetails<T>
   class Builder
     constructor(String = DEFAULT_CLIENT_NAME, com.datadog.android.api.SdkCore = Datadog.getInstance())
     fun build(): FlagsClient
   companion object 
     fun get(String = DEFAULT_CLIENT_NAME, com.datadog.android.api.SdkCore = Datadog.getInstance()): FlagsClient
 data class com.datadog.android.flags.featureflags.model.EvaluationContext
   constructor(String, Map<String, String> = emptyMap())
+enum com.datadog.android.flags.model.ErrorCode
+  - FLAG_NOT_FOUND
+  - PARSE_ERROR
+  - TYPE_MISMATCH
+data class com.datadog.android.flags.model.ResolutionDetails<T: Any>
+  constructor(T, String? = null, ResolutionReason? = null, ErrorCode? = null, String? = null, Map<String, Any>? = null)
+enum com.datadog.android.flags.model.ResolutionReason
+  - DEFAULT
+  - TARGETING_MATCH
+  - RULE_MATCH
+  - PREREQUISITE_FAILED
+  - ERROR

features/dd-sdk-android-flags/api/dd-sdk-android-flags.api

@@ -33,6 +33,7 @@ public abstract interface class com/datadog/android/flags/featureflags/FlagsClie
 	public static fun get ()Lcom/datadog/android/flags/featureflags/FlagsClient;
 	public static fun get (Ljava/lang/String;)Lcom/datadog/android/flags/featureflags/FlagsClient;
 	public static fun get (Ljava/lang/String;Lcom/datadog/android/api/SdkCore;)Lcom/datadog/android/flags/featureflags/FlagsClient;
+	public abstract fun resolve (Ljava/lang/String;Ljava/lang/Object;)Lcom/datadog/android/flags/model/ResolutionDetails;
 	public abstract fun resolveBooleanValue (Ljava/lang/String;Z)Z
 	public abstract fun resolveDoubleValue (Ljava/lang/String;D)D
 	public abstract fun resolveIntValue (Ljava/lang/String;I)I
@@ -68,3 +69,43 @@ public final class com/datadog/android/flags/featureflags/model/EvaluationContex
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/datadog/android/flags/model/ErrorCode : java/lang/Enum {
+	public static final field FLAG_NOT_FOUND Lcom/datadog/android/flags/model/ErrorCode;
+	public static final field PARSE_ERROR Lcom/datadog/android/flags/model/ErrorCode;
+	public static final field TYPE_MISMATCH Lcom/datadog/android/flags/model/ErrorCode;
+	public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/flags/model/ErrorCode;
+	public static fun values ()[Lcom/datadog/android/flags/model/ErrorCode;
+}
+
+public final class com/datadog/android/flags/model/ResolutionDetails {
+	public fun <init> (Ljava/lang/Object;Ljava/lang/String;Lcom/datadog/android/flags/model/ResolutionReason;Lcom/datadog/android/flags/model/ErrorCode;Ljava/lang/String;Ljava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/Object;Ljava/lang/String;Lcom/datadog/android/flags/model/ResolutionReason;Lcom/datadog/android/flags/model/ErrorCode;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/Object;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Lcom/datadog/android/flags/model/ResolutionReason;
+	public final fun component4 ()Lcom/datadog/android/flags/model/ErrorCode;
+	public final fun component5 ()Ljava/lang/String;
+	public final fun component6 ()Ljava/util/Map;
+	public final fun copy (Ljava/lang/Object;Ljava/lang/String;Lcom/datadog/android/flags/model/ResolutionReason;Lcom/datadog/android/flags/model/ErrorCode;Ljava/lang/String;Ljava/util/Map;)Lcom/datadog/android/flags/model/ResolutionDetails;
+	public static synthetic fun copy$default (Lcom/datadog/android/flags/model/ResolutionDetails;Ljava/lang/Object;Ljava/lang/String;Lcom/datadog/android/flags/model/ResolutionReason;Lcom/datadog/android/flags/model/ErrorCode;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/datadog/android/flags/model/ResolutionDetails;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getErrorCode ()Lcom/datadog/android/flags/model/ErrorCode;
+	public final fun getErrorMessage ()Ljava/lang/String;
+	public final fun getFlagMetadata ()Ljava/util/Map;
+	public final fun getReason ()Lcom/datadog/android/flags/model/ResolutionReason;
+	public final fun getValue ()Ljava/lang/Object;
+	public final fun getVariant ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/datadog/android/flags/model/ResolutionReason : java/lang/Enum {
+	public static final field DEFAULT Lcom/datadog/android/flags/model/ResolutionReason;
+	public static final field ERROR Lcom/datadog/android/flags/model/ResolutionReason;
+	public static final field PREREQUISITE_FAILED Lcom/datadog/android/flags/model/ResolutionReason;
+	public static final field RULE_MATCH Lcom/datadog/android/flags/model/ResolutionReason;
+	public static final field TARGETING_MATCH Lcom/datadog/android/flags/model/ResolutionReason;
+	public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/flags/model/ResolutionReason;
+	public static fun values ()[Lcom/datadog/android/flags/model/ResolutionReason;
+}
+

features/dd-sdk-android-flags/src/main/kotlin/com/datadog/android/flags/featureflags/FlagsClient.kt

@@ -28,6 +28,7 @@ import com.datadog.android.flags.featureflags.internal.repository.net.Precompute
 import com.datadog.android.flags.featureflags.model.EvaluationContext
 import com.datadog.android.flags.internal.FlagsFeature
 import com.datadog.android.flags.internal.net.PrecomputedAssignmentsDownloader
+import com.datadog.android.flags.model.ResolutionDetails
 import org.json.JSONObject
 
 /**
@@ -114,6 +115,40 @@ interface FlagsClient {
      */
     fun resolveStructureValue(flagKey: String, defaultValue: JSONObject): JSONObject
 
+    /**
+     * Resolves a flag value with detailed resolution information.
+     *
+     * This is the core resolution method that provides comprehensive details about the flag
+     * resolution process, including the resolved value, variant identifier, resolution reason,
+     * error information, and any associated metadata.
+     *
+     * ## Usage Examples
+     *
+     * ```kotlin
+     * // Boolean flag
+     * val boolResult = client.resolve("feature-enabled", false)
+     * if (boolResult.errorCode == null) {
+     *     println("Feature is ${boolResult.value}, variant: ${boolResult.variant}")
+     * }
+     *
+     * // String flag
+     * val stringResult = client.resolve("api-endpoint", "https://default.com")
+     * println("Using endpoint: ${stringResult.value}")
+     *
+     * // With metadata
+     * val result = client.resolve("experiment", "control")
+     * result.flagMetadata?.let { metadata ->
+     *     println("Experiment metadata: $metadata")
+     * }
+     * ```
+     *
+     * @param T The type of the flag value (Boolean, String, Int, Double, or JSONObject). Must be non-null.
+     * @param flagKey The unique identifier of the flag to resolve.
+     * @param defaultValue The value to return if the flag cannot be retrieved or parsed. Cannot be null.
+     * @return [ResolutionDetails] containing the value, variant, reason, error info, and metadata.
+     */
+    fun <T : Any> resolve(flagKey: String, defaultValue: T): ResolutionDetails<T>
+
     /**
      * Builder for creating [FlagsClient] instances with custom configuration.
      *