Merge branch 'master' into fix-protoc

This commit is contained in:
salaboy 2025-08-20 15:09:43 +01:00 committed by GitHub
commit 4264772d1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 37 additions and 4 deletions

View File

@ -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

View File

@ -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>

View File

@ -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);
}

View File

@ -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);
}
}

View File

@ -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();