dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating dt to 1.5.10 and fixing conflicts 

Signed-off-by: salaboy <Salaboy@gmail.com>
This commit is contained in:
salaboy 2025-08-26 10:50:09 +01:00
parent 7c8298aed3
commit b0a7a1b3ee
3 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk-workflows/pom.xml
View File

@ -47,7 +47,7 @@
<dependency> <dependency>
<groupId>io.dapr</groupId> <groupId>io.dapr</groupId>
<artifactId>durabletask-client</artifactId> <artifactId>durabletask-client</artifactId>
<version>1.5.6</version> <version>1.5.10</version>
</dependency> </dependency>
<!-- <!--
manually declare durabletask-client's jackson dependencies manually declare durabletask-client's jackson dependencies

48
sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskOptions.java
View File

@ -17,18 +17,48 @@ public class WorkflowTaskOptions {
private final WorkflowTaskRetryPolicy retryPolicy; private final WorkflowTaskRetryPolicy retryPolicy;
private final WorkflowTaskRetryHandler retryHandler; private final WorkflowTaskRetryHandler retryHandler;
private final String appId;
public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy, WorkflowTaskRetryHandler retryHandler) { public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy, WorkflowTaskRetryHandler retryHandler) {
this.retryPolicy = retryPolicy; this(retryPolicy, retryHandler, null);
this.retryHandler = retryHandler;
}
public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy) {
this(retryPolicy, null);
} }
public WorkflowTaskOptions(WorkflowTaskRetryHandler retryHandler) { public WorkflowTaskOptions(WorkflowTaskRetryHandler retryHandler) {
this(null, retryHandler); this(null, retryHandler, null);
}
public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy) {
this(retryPolicy, null, null);
}
/**
* Constructor for WorkflowTaskOptions with app ID for cross-app calls.
*
* @param appId the ID of the app to call the activity in
*/
public WorkflowTaskOptions(String appId) {
this(null, null, appId);
}
/**
* Constructor for WorkflowTaskOptions with retry policy, retry handler, and app ID.
*
* @param retryPolicy the retry policy
* @param retryHandler the retry handler
* @param appId the app ID for cross-app activity calls
*/
public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy, WorkflowTaskRetryHandler retryHandler, String appId) {
this.retryPolicy = retryPolicy;
this.retryHandler = retryHandler;
this.appId = appId;
}
public WorkflowTaskOptions(WorkflowTaskRetryPolicy retryPolicy, String appId) {
this(retryPolicy, null, appId);
}
public WorkflowTaskOptions(WorkflowTaskRetryHandler retryHandler, String appId) {
this(null, retryHandler, appId);
} }
public WorkflowTaskRetryPolicy getRetryPolicy() { public WorkflowTaskRetryPolicy getRetryPolicy() {
@ -39,4 +69,8 @@ public class WorkflowTaskOptions {
return retryHandler; return retryHandler;
} }
public String getAppId() {
return appId;
}
} }

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

@ -245,7 +245,11 @@ public class DefaultWorkflowContext implements WorkflowContext {
RetryPolicy retryPolicy = toRetryPolicy(options.getRetryPolicy()); RetryPolicy retryPolicy = toRetryPolicy(options.getRetryPolicy());
RetryHandler retryHandler = toRetryHandler(options.getRetryHandler()); RetryHandler retryHandler = toRetryHandler(options.getRetryHandler());
return new TaskOptions(retryPolicy, retryHandler); return TaskOptions.builder()
.retryPolicy(retryPolicy)
.retryHandler(retryHandler)
.appID(options.getAppId())
.build();
} }
/** /**