Skip to content

Commit f72440d

Browse files
authored
Merge pull request #40 from cicoyle/fix-wf-hanging
Fix WF Hanging
2 parents 4ffeb04 + 0cb5588 commit f72440d

31 files changed

+73
-69
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ When updating the protobuf definitions in `internal/durabletask-protobuf/protos/
4242
./gradlew publishToMavenLocal
4343
```
4444

45-
or simply `./gradlew build publishToMavenLocal`
45+
or simply `./gradlew build publishToMavenLocal -PskipSigning`
4646

4747
Check if it was released locally with:
4848
```shell

azurefunctions/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ import java.util.Optional;
7979
import com.microsoft.azure.functions.*;
8080
import com.microsoft.azure.functions.annotation.*;
8181

82-
import com.microsoft.durabletask.*;
82+
import io.dapr.durabletask.*;
8383
import com.microsoft.durabletask.azurefunctions.*;
8484

8585
public class DurableFunctionsSample {

azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/DurableClientContext.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import com.microsoft.azure.functions.HttpResponseMessage;
88

99
import com.microsoft.azure.functions.HttpStatus;
10-
import com.microsoft.durabletask.DurableTaskClient;
11-
import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
12-
import com.microsoft.durabletask.OrchestrationMetadata;
13-
import com.microsoft.durabletask.OrchestrationRuntimeStatus;
10+
import io.dapr.durabletask.DurableTaskClient;
11+
import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
12+
import io.dapr.durabletask.OrchestrationMetadata;
13+
import io.dapr.durabletask.OrchestrationRuntimeStatus;
1414

1515
import java.io.UnsupportedEncodingException;
1616
import java.net.MalformedURLException;

azurefunctions/src/main/java/com/microsoft/durabletask/azurefunctions/internal/middleware/OrchestrationMiddleware.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import com.microsoft.azure.functions.internal.spi.middleware.Middleware;
1010
import com.microsoft.azure.functions.internal.spi.middleware.MiddlewareChain;
1111
import com.microsoft.azure.functions.internal.spi.middleware.MiddlewareContext;
12-
import com.microsoft.durabletask.CompositeTaskFailedException;
13-
import com.microsoft.durabletask.DataConverter;
14-
import com.microsoft.durabletask.OrchestrationRunner;
15-
import com.microsoft.durabletask.TaskFailedException;
16-
import com.microsoft.durabletask.interruption.ContinueAsNewInterruption;
17-
import com.microsoft.durabletask.interruption.OrchestratorBlockedException;
12+
import io.dapr.durabletask.CompositeTaskFailedException;
13+
import io.dapr.durabletask.DataConverter;
14+
import io.dapr.durabletask.OrchestrationRunner;
15+
import io.dapr.durabletask.TaskFailedException;
16+
import io.dapr.durabletask.interruption.ContinueAsNewInterruption;
17+
import io.dapr.durabletask.interruption.OrchestratorBlockedException;
1818

1919
/**
2020
* Durable Function Orchestration Middleware

azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package com.microsoft.durabletask.azuremanaged;
55

6-
import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
6+
import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
77
import com.azure.core.credential.TokenCredential;
88
import io.grpc.Channel;
99
import java.util.Objects;

azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package com.microsoft.durabletask.azuremanaged;
55

66
import com.azure.core.credential.TokenCredential;
7-
import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
7+
import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
88

99
import io.grpc.Channel;
1010
import java.util.Objects;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.microsoft.durabletask.azuremanaged;
22

33
import com.azure.core.credential.TokenCredential;
4-
import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
4+
import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
55
import io.grpc.Channel;
66
import org.junit.jupiter.api.DisplayName;
77
import org.junit.jupiter.api.Test;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.microsoft.durabletask.azuremanaged;
22

3-
import com.microsoft.durabletask.DurableTaskClient;
4-
import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
5-
import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
3+
import io.dapr.durabletask.DurableTaskClient;
4+
import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
5+
import io.dapr.durabletask.NewOrchestrationInstanceOptions;
66
import io.grpc.*;
77
import io.grpc.stub.ServerCalls;
88
import io.grpc.stub.StreamObserver;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.microsoft.durabletask.azuremanaged;
22

33
import com.azure.core.credential.TokenCredential;
4-
import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
4+
import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
55
import io.grpc.Channel;
66
import org.junit.jupiter.api.DisplayName;
77
import org.junit.jupiter.api.Test;

client/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
}
1212

1313
group 'io.dapr'
14-
version = '1.5.8'
14+
version = '1.5.9'
1515
archivesBaseName = 'durabletask-client'
1616

1717
def grpcVersion = '1.69.0'

0 commit comments

Comments
 (0)