fix: update hooks to work with SDKVariable_PB and Variable<T> and introduce cloud hooks to work with Variable<T>

Author: kaushalkapasi

src/main/java/com/devcycle/sdk/server/cloud/api/DevCycleCloudClient.java

@@ -150,7 +150,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
             }
 
             variable.setIsDefaulted(false);
-            evalHooksRunner.executeAfter(reversedHooks, context, variable);
+            evalHooksRunner.executeAfterCloud(reversedHooks, context, variable);
         } catch (Throwable exception) {
             if (!(exception instanceof BeforeHookError || exception instanceof AfterHookError)) {
                 variable = (Variable<T>) Variable.builder()
@@ -170,7 +170,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
 
             evalHooksRunner.executeError(reversedHooks, context, exception);
         } finally {
-            evalHooksRunner.executeFinally(reversedHooks, context, Optional.ofNullable(variable));
+            evalHooksRunner.executeFinallyCloud(reversedHooks, context, Optional.ofNullable(variable));
         }
         return variable;
     }

src/main/java/com/devcycle/sdk/server/common/model/EvalHook.java

@@ -2,12 +2,18 @@
 
 import java.util.Optional;
 
+import com.devcycle.sdk.server.local.protobuf.SDKVariable_PB;
+
 public interface EvalHook<T> {
 
     default Optional<HookContext<T>> before(HookContext<T> ctx) {
         return Optional.empty();
     }
-    default void after(HookContext<T> ctx, Variable<T> variable) {}
     default void error(HookContext<T> ctx, Throwable e) {}
-    default void onFinally(HookContext<T> ctx, Optional<Variable<T>> variable) {}
+    
+    default void after(HookContext<T> ctx, SDKVariable_PB variable) {}
+    default void onFinally(HookContext<T> ctx, Optional<SDKVariable_PB> variable) {}
+
+    default void afterCloud(HookContext<T> ctx, Variable<T> variable) {}
+    default void onFinallyCloud(HookContext<T> ctx, Optional<Variable<T>> variable) {}
 }

src/main/java/com/devcycle/sdk/server/common/model/EvalHooksRunner.java

@@ -7,6 +7,7 @@
 import com.devcycle.sdk.server.common.exception.AfterHookError;
 import com.devcycle.sdk.server.common.exception.BeforeHookError;
 import com.devcycle.sdk.server.common.logging.DevCycleLogger;
+import com.devcycle.sdk.server.local.protobuf.SDKVariable_PB;
 
 /**
  * A class that manages evaluation hooks for the DevCycle SDK.
@@ -81,7 +82,7 @@ public <T> HookContext<T> executeBefore(ArrayList<EvalHook<T>> hooks, HookContex
      * @param variable The variable result to pass to the hooks
      * @param <T> The type of the variable value
      */
-    public void executeAfter(ArrayList<EvalHook<T>> hooks, HookContext<T> context, Variable<T> variable) {
+    public void executeAfter(ArrayList<EvalHook<T>> hooks, HookContext<T> context, SDKVariable_PB variable) {
         for (EvalHook<T> hook : hooks) {
             try {
                 hook.after(context, variable);
@@ -91,6 +92,23 @@ public void executeAfter(ArrayList<EvalHook<T>> hooks, HookContext<T> context, V
         }
     }
 
+    /**
+     * Runs all after hooks in reverse order.
+     *
+     * @param context The context to pass to the hooks
+     * @param variable The variable result to pass to the hooks
+     * @param <T> The type of the variable value
+     */
+    public void executeAfterCloud(ArrayList<EvalHook<T>> hooks, HookContext<T> context, Variable<T> variable) {
+        for (EvalHook<T> hook : hooks) {
+            try {
+                hook.afterCloud(context, variable);
+            } catch (Exception e) {
+                throw new AfterHookError("After hook failed", e);
+            }
+        }
+    }
+
     /**
      * Runs all error hooks in reverse order.
      *
@@ -115,7 +133,7 @@ public void executeError(ArrayList<EvalHook<T>> hooks, HookContext<T> context, T
      * @param context The context to pass to the hooks
      * @param variable The variable result to pass to the hooks (may be null)
      */
-    public void executeFinally(ArrayList<EvalHook<T>> hooks, HookContext<T> context, Optional<Variable<T>> variable) {
+    public void executeFinally(ArrayList<EvalHook<T>> hooks, HookContext<T> context, Optional<SDKVariable_PB> variable) {
         for (EvalHook<T> hook : hooks) {
             try {
                 hook.onFinally(context, variable);
@@ -125,4 +143,21 @@ public void executeFinally(ArrayList<EvalHook<T>> hooks, HookContext<T> context,
             }
         }
     }
+
+    /**
+     * Runs all finally hooks in reverse order.
+     * 
+     * @param context The context to pass to the hooks
+     * @param variable The variable result to pass to the hooks (may be null)
+     */
+    public void executeFinallyCloud(ArrayList<EvalHook<T>> hooks, HookContext<T> context, Optional<Variable<T>> variable) {
+        for (EvalHook<T> hook : hooks) {
+            try {
+                hook.onFinallyCloud(context, variable);
+            } catch (Exception e) {
+                // Log finally hook error but don't throw
+                DevCycleLogger.error("Finally hook failed: " + e.getMessage(), e);
+            }
+        }
+    }
 }

src/main/java/com/devcycle/sdk/server/local/api/DevCycleLocalClient.java

@@ -181,6 +181,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
 
         HookContext<T> hookContext = new HookContext<T>(user, key, defaultValue, getMetadata());
         Variable<T> variable = null;
+        SDKVariable_PB sdkVariable = null;
         ArrayList<EvalHook<T>> hooks = new ArrayList<EvalHook<T>>(evalHooksRunner.getHooks());
         ArrayList<EvalHook<T>> reversedHooks = new ArrayList<EvalHook<T>>(evalHooksRunner.getHooks());
         Collections.reverse(reversedHooks);
@@ -200,7 +201,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
                 variable = defaultVariable;
                 variable.setEval(EvalReason.defaultReason(EvalReason.DefaultReasonDetailsEnum.USER_NOT_TARGETED));
             } else {
-                SDKVariable_PB sdkVariable = SDKVariable_PB.parseFrom(variableData);
+                sdkVariable = SDKVariable_PB.parseFrom(variableData);
                 if (sdkVariable.getType() != pbVariableType) {
                     DevCycleLogger.warning("Variable type mismatch, returning default value");
                     variable = defaultVariable;
@@ -212,7 +213,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
             if (beforeError != null) {
                 throw beforeError;
             }
-            evalHooksRunner.executeAfter(reversedHooks, hookContext, variable);
+            evalHooksRunner.executeAfter(reversedHooks, hookContext, sdkVariable);
         } catch (Throwable e) {
             if (!(e instanceof BeforeHookError)) {
                 DevCycleLogger.error("Unable to evaluate Variable " + key + " due to error: " + e, e);
@@ -225,7 +226,7 @@ public <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue) {
                 variable = defaultVariable;
                 variable.setEval(EvalReason.defaultReason(EvalReason.DefaultReasonDetailsEnum.USER_NOT_TARGETED));
             }
-            evalHooksRunner.executeFinally(reversedHooks, hookContext, Optional.of(variable));
+            evalHooksRunner.executeFinally(reversedHooks, hookContext, Optional.ofNullable(sdkVariable));
         }
         return variable;
     }