actual fix and bump version

Signed-off-by: Cassandra Coyle <[email protected]>

Author: cicoyle

azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsUserAgentTest.java

@@ -1,8 +1,8 @@
 package com.microsoft.durabletask.azuremanaged;
 
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
-import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
+import io.dapr.durabletask.NewOrchestrationInstanceOptions;
 import io.grpc.*;
 import io.grpc.stub.ServerCalls;
 import io.grpc.stub.StreamObserver;

client/build.gradle

@@ -11,7 +11,7 @@ plugins {
 }
 
 group 'io.dapr'
-version = '1.5.8'
+version = '1.5.9'
 archivesBaseName = 'durabletask-client'
 
 def grpcVersion = '1.69.0'

client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java

@@ -292,28 +292,32 @@ public <V> Task<V> callActivity(
             // Add target app ID if specified in options
             if (options != null && options.hasAppID()) {
                 String targetAppId = options.getAppID();
-                routerBuilder.setTargetAppID(targetAppId);
+                TaskRouter router = TaskRouter.newBuilder()
+                    .setSourceAppID(this.appId)
+                    .setTargetAppID(targetAppId)
+                    .build();
+                scheduleTaskBuilder.setRouter(router);
                 this.logger.fine(() -> String.format(
-                "cross app routing detected: source=%s, target=%s",
-                this.appId, targetAppId));
-        }
-            TaskRouter router = routerBuilder.build();
-            scheduleTaskBuilder.setRouter(router);
+                    "cross app routing detected: source=%s, target=%s",
+                    this.appId, targetAppId));
+            }
             TaskFactory<V> taskFactory = () -> {
                 int id = this.sequenceNumber++;
 
                 ScheduleTaskAction scheduleTaskAction = scheduleTaskBuilder.build();
                 OrchestratorAction.Builder actionBuilder = OrchestratorAction.newBuilder()
                         .setId(id)
                         .setScheduleTask(scheduleTaskBuilder);
-                TaskRouter.Builder actionRouterBuilder = TaskRouter.newBuilder()
-                        .setSourceAppID(this.appId);
+                
                 if (options != null && options.hasAppID()) {
                     String targetAppId = options.getAppID();
-                    actionRouterBuilder.setTargetAppID(targetAppId);
+                    TaskRouter actionRouter = TaskRouter.newBuilder()
+                        .setSourceAppID(this.appId)
+                        .setTargetAppID(targetAppId)
+                        .build();
+                    actionBuilder.setRouter(actionRouter);
                 }
 
-                actionBuilder.setRouter(actionRouterBuilder.build());
                 this.pendingActions.put(id, actionBuilder.build());
 
                 if (!this.isReplaying) {

endtoendtests/src/main/java/com/functions/AzureFunctions.java

@@ -4,7 +4,7 @@
 import com.microsoft.azure.functions.*;
 import java.util.*;
 
-import com.microsoft.durabletask.*;
+import io.dapr.durabletask.*;
 import com.microsoft.durabletask.azurefunctions.DurableActivityTrigger;
 import com.microsoft.durabletask.azurefunctions.DurableClientContext;
 import com.microsoft.durabletask.azurefunctions.DurableClientInput;