Merge branch 'master' into fix-protoc

.github/scripts/update_sdk_version.sh

@@ -26,6 +26,7 @@ mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dap
 
 # dapr-spring
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -DprocessDependencies=true -f dapr-spring/pom.xml
+mvn versions:set-property -Dproperty=dapr.spring.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f dapr-spring/pom.xml
 
 # spring-boot-examples
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f spring-boot-examples/pom.xml

dapr-spring/pom.xml

@@ -33,7 +33,8 @@
     <maven.compiler.release>11</maven.compiler.release>
     <testcontainers.version>1.19.8</testcontainers.version>
     <junit.version>5.11.2</junit.version>
-    <dapr.spring.version>0.16.0-SNAPSHOT</dapr.spring.version>
+    <!-- WARNING: don't change this property unless you also update .github/scripts/update_sdk_version.sh -->
+    <dapr.spring.version>0.17.0-SNAPSHOT</dapr.spring.version>
   </properties>
 
   <dependencyManagement>

sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java

@@ -526,4 +526,12 @@ public interface WorkflowContext {
   default UUID newUuid() {
     throw new RuntimeException("No implementation found.");
   }
+
+  /**
+   * Set a custom status to a workflow execution.
+   *
+   * @param status to be set to the current execution
+   */
+  void setCustomStatus(Object status);
+  
 }

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

@@ -59,7 +59,7 @@ public class DefaultWorkflowContext implements WorkflowContext {
    * @throws IllegalArgumentException if context or logger is null
    */
   public DefaultWorkflowContext(TaskOrchestrationContext context, Logger logger)
-      throws IllegalArgumentException {
+          throws IllegalArgumentException {
     if (context == null) {
       throw new IllegalArgumentException("Context cannot be null");
     }
@@ -114,7 +114,7 @@ public class DefaultWorkflowContext implements WorkflowContext {
    */
   @Override
   public <V> Task<V> waitForExternalEvent(String name, Duration timeout, Class<V> dataType)
-      throws TaskCanceledException {
+          throws TaskCanceledException {
     return this.innerContext.waitForExternalEvent(name, timeout, dataType);
   }
 
@@ -130,7 +130,7 @@ public class DefaultWorkflowContext implements WorkflowContext {
    * @param timeout the amount of time to wait before canceling the returned
    *                {@code Task}
    * @return a new {@link Task} that completes when the external event is received
-   *         or when {@code timeout} expires
+   *     or when {@code timeout} expires
    * @throws TaskCanceledException if the specified {@code timeout} value expires
    *                               before the event is received
    */
@@ -294,4 +294,13 @@ public class DefaultWorkflowContext implements WorkflowContext {
       return workflowTaskRetryHandler.handle(workflowRetryContext);
     };
   }
+
+  /**
+   * Set custom status to a workflow execution.
+   *
+   * @param status to set to the execution
+   */
+  public void setCustomStatus(Object status) {
+    innerContext.setCustomStatus(status);
+  }
 }

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

@@ -135,6 +135,11 @@ public class DefaultWorkflowContextTest {
       @Override
       public void continueAsNew(Object input, boolean preserveUnprocessedEvents) {
       }
+
+      @Override
+      public void setCustomStatus(Object status) {
+
+      }
     };
   }
 
@@ -403,6 +408,15 @@ public class DefaultWorkflowContextTest {
     verify(mockInnerContext, times(1)).callSubOrchestrator(expectedName, expectedInput, null, null, String.class);
   }
 
+  @Test
+  public void setCustomStatusWorkflow() {
+    String customStatus = "CustomStatus";
+
+    context.setCustomStatus(customStatus);
+    verify(mockInnerContext, times(1)).setCustomStatus(customStatus);
+
+  }
+
   @Test
   public void newUuidTest() {
     context.newUuid();