fix: MaxRetryInterval was not propagate (#1685) (#1686)

(cherry picked from commit a2877aa)

Signed-off-by: Javier Aliaga <javier@diagrid.io>
Co-authored-by: Javier Aliaga <javier@diagrid.io>

Author: dapr-bot

sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java

@@ -281,6 +281,9 @@ private RetryPolicy toRetryPolicy(WorkflowTaskRetryPolicy workflowTaskRetryPolic
     );
 
     retryPolicy.setBackoffCoefficient(workflowTaskRetryPolicy.getBackoffCoefficient());
+    if (workflowTaskRetryPolicy.getMaxRetryInterval() != null) {
+      retryPolicy.setMaxRetryInterval(workflowTaskRetryPolicy.getMaxRetryInterval());
+    }
     if (workflowTaskRetryPolicy.getRetryTimeout() != null) {
       retryPolicy.setRetryTimeout(workflowTaskRetryPolicy.getRetryTimeout());
     }

sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java

@@ -523,4 +523,44 @@ public void workflowRetryPolicyRetryThrowIllegalArgumentWhenRetryTimeoutIsLessTh
             .setRetryTimeout(Duration.ofSeconds(9))
             .build());
   }
+
+  @Test
+  public void callActivityRetryPolicyMaxRetryIntervalShouldBePropagated() {
+    String expectedName = "TestActivity";
+    String expectedInput = "TestInput";
+    Duration expectedMaxRetryInterval = Duration.ofSeconds(60);
+    WorkflowTaskRetryPolicy retryPolicy = WorkflowTaskRetryPolicy.newBuilder()
+            .setMaxNumberOfAttempts(5)
+            .setFirstRetryInterval(Duration.ofSeconds(1))
+            .setMaxRetryInterval(expectedMaxRetryInterval)
+            .build();
+    WorkflowTaskOptions options = new WorkflowTaskOptions(retryPolicy);
+    ArgumentCaptor<TaskOptions> captor = ArgumentCaptor.forClass(TaskOptions.class);
+
+    context.callActivity(expectedName, expectedInput, options, String.class);
+
+    verify(mockInnerContext, times(1))
+            .callActivity(eq(expectedName), eq(expectedInput), captor.capture(), eq(String.class));
+
+    assertEquals(expectedMaxRetryInterval, captor.getValue().getRetryPolicy().getMaxRetryInterval());
+  }
+
+  @Test
+  public void callActivityRetryPolicyDefaultMaxRetryIntervalShouldBeZeroWhenNotSet() {
+    String expectedName = "TestActivity";
+    String expectedInput = "TestInput";
+    WorkflowTaskRetryPolicy retryPolicy = WorkflowTaskRetryPolicy.newBuilder()
+            .setMaxNumberOfAttempts(5)
+            .setFirstRetryInterval(Duration.ofSeconds(1))
+            .build();
+    WorkflowTaskOptions options = new WorkflowTaskOptions(retryPolicy);
+    ArgumentCaptor<TaskOptions> captor = ArgumentCaptor.forClass(TaskOptions.class);
+
+    context.callActivity(expectedName, expectedInput, options, String.class);
+
+    verify(mockInnerContext, times(1))
+            .callActivity(eq(expectedName), eq(expectedInput), captor.capture(), eq(String.class));
+
+    assertEquals(Duration.ZERO, captor.getValue().getRetryPolicy().getMaxRetryInterval());
+  }
 }