Renamed ActivityOptionsWithDefault to MergedActivityOptions

mfateev · Apr 18, 2024 · 45f1f41 · 45f1f41
1 parent 51249bd
commit 45f1f41
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 36 deletions.
diff --git a/...al/common/ActivityOptionsWithDefault.java → ...nternal/common/MergedActivityOptions.java b/...al/common/ActivityOptionsWithDefault.java → ...nternal/common/MergedActivityOptions.java
@@ -4,23 +4,39 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public final class ActivityOptionsWithDefault {
+/**
+ * The chain of ActivityOptions and per type options maps. Used to merge options specified at the
+ * following layers:
+ *
+ * <pre>
+ *     * WorkflowImplementationOptions
+ *     * Workflow
+ *     * ActivityStub
+ * </pre>
+ *
+ * Each next layer overrides specific options specified at the previous layer.
+ */
+public final class MergedActivityOptions {
+
+  /** Common options across all activity types. */
   private ActivityOptions defaultOptions;
 
+  /** Per activity type options. These override defaultOptions. */
   private Map<String, ActivityOptions> optionsMap;
 
-  private final ActivityOptionsWithDefault overridden;
+  /** The options specified at the previous layer. They are overriden by this object. */
+  private final MergedActivityOptions overridden;
 
-  public ActivityOptionsWithDefault(
-      ActivityOptionsWithDefault overridden,
+  public MergedActivityOptions(
+      MergedActivityOptions overridden,
       ActivityOptions defaultOptions,
       Map<String, ActivityOptions> optionsMap) {
     this.overridden = overridden;
     this.defaultOptions = defaultOptions;
     this.optionsMap = new HashMap<>(optionsMap);
   }
 
-  public ActivityOptionsWithDefault(ActivityOptionsWithDefault overridden) {
+  public MergedActivityOptions(MergedActivityOptions overridden) {
     this.overridden = overridden;
     defaultOptions = null;
     optionsMap = null;
@@ -34,6 +50,7 @@ public void setOptionsMap(Map<String, ActivityOptions> optionsMap) {
     this.optionsMap = optionsMap;
   }
 
+  /** Get merged options for the given activityType. */
   public ActivityOptions getMergedOptions(String activityType) {
     ActivityOptions overrideOptions = overridden.getMergedOptions(activityType);
     return merge(overrideOptions, defaultOptions, optionsMap.get(activityType));

diff --git a/temporal-sdk/src/main/java/io/temporal/internal/sync/ActivityInvocationHandler.java b/temporal-sdk/src/main/java/io/temporal/internal/sync/ActivityInvocationHandler.java
@@ -24,7 +24,7 @@
 import io.temporal.activity.ActivityOptions;
 import io.temporal.common.MethodRetry;
 import io.temporal.common.interceptors.WorkflowOutboundCallsInterceptor;
-import io.temporal.internal.common.ActivityOptionsWithDefault;
+import io.temporal.internal.common.MergedActivityOptions;
 import io.temporal.workflow.ActivityStub;
 import io.temporal.workflow.Functions;
 import java.lang.reflect.InvocationHandler;
@@ -33,14 +33,14 @@
 
 @VisibleForTesting
 public class ActivityInvocationHandler extends ActivityInvocationHandlerBase {
-  private final ActivityOptionsWithDefault options;
+  private final MergedActivityOptions options;
   private final WorkflowOutboundCallsInterceptor activityExecutor;
   private final Functions.Proc assertReadOnly;
 
   @VisibleForTesting
   public static InvocationHandler newInstance(
       Class<?> activityInterface,
-      ActivityOptionsWithDefault options,
+      MergedActivityOptions options,
       WorkflowOutboundCallsInterceptor activityExecutor,
       Functions.Proc assertReadOnly) {
     return new ActivityInvocationHandler(
@@ -50,7 +50,7 @@ public static InvocationHandler newInstance(
   private ActivityInvocationHandler(
       Class<?> activityInterface,
       WorkflowOutboundCallsInterceptor activityExecutor,
-      ActivityOptionsWithDefault options,
+      MergedActivityOptions options,
       Functions.Proc assertReadOnly) {
     super(activityInterface);
     this.options = options;

diff --git a/temporal-sdk/src/main/java/io/temporal/internal/sync/SyncWorkflowContext.java b/temporal-sdk/src/main/java/io/temporal/internal/sync/SyncWorkflowContext.java
@@ -56,8 +56,8 @@
 import io.temporal.common.interceptors.WorkflowOutboundCallsInterceptor;
 import io.temporal.failure.*;
 import io.temporal.internal.common.ActivityOptionUtils;
-import io.temporal.internal.common.ActivityOptionsWithDefault;
 import io.temporal.internal.common.HeaderUtils;
+import io.temporal.internal.common.MergedActivityOptions;
 import io.temporal.internal.common.OptionsUtils;
 import io.temporal.internal.common.ProtobufTimeUtils;
 import io.temporal.internal.common.SdkFlag;
@@ -120,14 +120,7 @@ final class SyncWorkflowContext implements WorkflowContext, WorkflowOutboundCall
   private WorkflowInboundCallsInterceptor headInboundInterceptor;
   private WorkflowOutboundCallsInterceptor headOutboundInterceptor;
 
-  /** Activity options specified through {@link WorkflowImplementationOptions}. */
-  private ActivityOptionsWithDefault workflowImplementationOptionsActivityOptions;
-
-  /**
-   * Activity options specified through {@link Workflow#setDefaultActivityOptions(ActivityOptions)}
-   * and {@link Workflow#applyActivityOptions(Map)}
-   */
-  private ActivityOptionsWithDefault workflowActivityOptions;
+  private final MergedActivityOptions activityOptions;
 
   private LocalActivityOptions defaultLocalActivityOptions = null;
   private Map<String, LocalActivityOptions> localActivityOptionsMap;
@@ -152,9 +145,10 @@ public SyncWorkflowContext(
     this.signalDispatcher = signalDispatcher;
     this.queryDispatcher = queryDispatcher;
     this.updateDispatcher = updateDispatcher;
+    MergedActivityOptions activityOptionsFromWorkflowImplementationOptions = null;
     if (workflowImplementationOptions != null) {
-      this.workflowImplementationOptionsActivityOptions =
-          new ActivityOptionsWithDefault(
+      activityOptionsFromWorkflowImplementationOptions =
+          new MergedActivityOptions(
               null,
               workflowImplementationOptions.getDefaultActivityOptions(),
               workflowImplementationOptions.getActivityOptions());
@@ -163,6 +157,8 @@ public SyncWorkflowContext(
       this.localActivityOptionsMap =
           new HashMap<>(workflowImplementationOptions.getLocalActivityOptions());
     }
+    this.activityOptions =
+        new MergedActivityOptions(activityOptionsFromWorkflowImplementationOptions);
     this.workflowImplementationOptions =
         workflowImplementationOptions == null
             ? WorkflowImplementationOptions.getDefaultInstance()
@@ -211,8 +207,8 @@ public void initHeadInboundCallsInterceptor(WorkflowInboundCallsInterceptor head
     updateDispatcher.setInboundCallsInterceptor(head);
   }
 
-  public ActivityOptionsWithDefault getActivityOptions() {
-    return workflowImplementationOptionsActivityOptions;
+  public MergedActivityOptions getActivityOptions() {
+    return activityOptions;
   }
 
   public LocalActivityOptions getDefaultLocalActivityOptions() {
@@ -226,11 +222,11 @@ public LocalActivityOptions getDefaultLocalActivityOptions() {
   }
 
   public void setDefaultActivityOptions(ActivityOptions defaultActivityOptions) {
-    workflowActivityOptions.setDefaultOptions(defaultActivityOptions);
+    activityOptions.setDefaultOptions(defaultActivityOptions);
   }
 
   public void applyActivityOptions(Map<String, ActivityOptions> activityTypeToOption) {
-    workflowActivityOptions.setOptionsMap(activityTypeToOption);
+    activityOptions.setOptionsMap(activityTypeToOption);
   }
 
   public void setDefaultLocalActivityOptions(LocalActivityOptions defaultLocalActivityOptions) {

diff --git a/temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowInternal.java b/temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowInternal.java
@@ -42,7 +42,7 @@
 import io.temporal.common.metadata.POJOWorkflowMethodMetadata;
 import io.temporal.internal.WorkflowThreadMarker;
 import io.temporal.internal.common.ActivityOptionUtils;
-import io.temporal.internal.common.ActivityOptionsWithDefault;
+import io.temporal.internal.common.MergedActivityOptions;
 import io.temporal.internal.common.NonIdempotentHandle;
 import io.temporal.internal.common.SearchAttributesUtil;
 import io.temporal.internal.logging.ReplayAwareLogger;
@@ -301,14 +301,13 @@ public static <T> T newActivityStub(
     // Merge the activity options we may have received from the workflow with the options we may
     // have received in WorkflowImplementationOptions.
     SyncWorkflowContext context = getRootWorkflowContext();
-    ActivityOptionsWithDefault optionsWithDefault =
-        new ActivityOptionsWithDefault(
-            context.getActivityOptions(), options, activityMethodOptions);
+    MergedActivityOptions activityOptions =
+        new MergedActivityOptions(context.getActivityOptions(), options, activityMethodOptions);
 
     InvocationHandler invocationHandler =
         ActivityInvocationHandler.newInstance(
             activityInterface,
-            optionsWithDefault,
+            activityOptions,
             context.getWorkflowOutboundInterceptor(),
             () -> assertNotReadOnly("schedule activity"));
     return ActivityInvocationHandlerBase.newProxy(activityInterface, invocationHandler);

diff --git a/temporal-testing/src/main/java/io/temporal/testing/TestActivityEnvironmentInternal.java b/temporal-testing/src/main/java/io/temporal/testing/TestActivityEnvironmentInternal.java
@@ -48,7 +48,7 @@
 import io.temporal.internal.activity.ActivityExecutionContextFactory;
 import io.temporal.internal.activity.ActivityExecutionContextFactoryImpl;
 import io.temporal.internal.activity.ActivityTaskHandlerImpl;
-import io.temporal.internal.common.ActivityOptionsWithDefault;
+import io.temporal.internal.common.MergedActivityOptions;
 import io.temporal.internal.common.ProtobufTimeUtils;
 import io.temporal.internal.sync.*;
 import io.temporal.internal.testservice.InProcessGRPCServer;
@@ -189,11 +189,10 @@ public <T> T newActivityStub(Class<T> activityInterface) {
             .setScheduleToCloseTimeout(Duration.ofDays(1))
             .setHeartbeatTimeout(Duration.ofSeconds(1))
             .build();
-    ActivityOptionsWithDefault optionsWithDefault =
-        new ActivityOptionsWithDefault(null, options, null);
+    MergedActivityOptions activityOptions = new MergedActivityOptions(null, options, null);
     InvocationHandler invocationHandler =
         ActivityInvocationHandler.newInstance(
-            activityInterface, optionsWithDefault, new TestActivityExecutor(), () -> {});
+            activityInterface, activityOptions, new TestActivityExecutor(), () -> {});
     invocationHandler =
         new DeterministicRunnerWrapper(invocationHandler, deterministicRunnerExecutor::submit);
     return ActivityInvocationHandlerBase.newProxy(activityInterface, invocationHandler);
@@ -207,12 +206,11 @@ public <T> T newActivityStub(Class<T> activityInterface) {
    */
   @Override
   public <T> T newActivityStub(Class<T> activityInterface, ActivityOptions options) {
-    ActivityOptionsWithDefault optionsWithDefault =
-        new ActivityOptionsWithDefault(null, options, null);
+    MergedActivityOptions activityOptions = new MergedActivityOptions(null, options, null);
 
     InvocationHandler invocationHandler =
         ActivityInvocationHandler.newInstance(
-            activityInterface, optionsWithDefault, new TestActivityExecutor(), () -> {});
+            activityInterface, activityOptions, new TestActivityExecutor(), () -> {});
     invocationHandler =
         new DeterministicRunnerWrapper(invocationHandler, deterministicRunnerExecutor::submit);
     return ActivityInvocationHandlerBase.newProxy(activityInterface, invocationHandler);