Skip to content

Commit 380cda6

Browse files
artur-ciocanuArtur Ciocanu
andauthored
Ensure Dapr workflows classes and interfaces have proper packages and visibility (dapr#1176)
* Rename orchestrator and activity wrapper Signed-off-by: Artur Ciocanu <[email protected]> * Move workflow activity to root package Signed-off-by: Artur Ciocanu <[email protected]> * Move workflow context implementation to runtime Signed-off-by: Artur Ciocanu <[email protected]> * Rename workflow activity context and add an interface Signed-off-by: Artur Ciocanu <[email protected]> * Convert workflow abstract class to interface Signed-off-by: Artur Ciocanu <[email protected]> * Move saga internals to runtime.saga package Signed-off-by: Artur Ciocanu <[email protected]> * Tiny typo fix Signed-off-by: Artur Ciocanu <[email protected]> * Adjusting the class names based on feedback Signed-off-by: Artur Ciocanu <[email protected]> * Revert accidental JavaDocs commits Signed-off-by: Artur Ciocanu <[email protected]> * Fixing some compilation errors Signed-off-by: Artur Ciocanu <[email protected]> --------- Signed-off-by: Artur Ciocanu <[email protected]> Co-authored-by: Artur Ciocanu <[email protected]>
1 parent 69f2407 commit 380cda6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+154
-138
lines changed

dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/workflows/TestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.dapr.spring.boot.autoconfigure.client.workflows;
22

3-
import io.dapr.workflows.runtime.WorkflowActivity;
4-
import io.dapr.workflows.runtime.WorkflowActivityContext;
3+
import io.dapr.workflows.WorkflowActivity;
4+
import io.dapr.workflows.WorkflowActivityContext;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.web.client.RestTemplate;
77

dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/workflows/TestWorkflow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.web.client.RestTemplate;
77

8-
public class TestWorkflow extends Workflow {
8+
public class TestWorkflow implements Workflow {
99

1010
@Autowired
1111
private RestTemplate restTemplate;

dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/DaprWorkflowsConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package io.dapr.spring.workflows.config;
22

33
import io.dapr.workflows.Workflow;
4-
import io.dapr.workflows.runtime.WorkflowActivity;
4+
import io.dapr.workflows.WorkflowActivity;
55
import io.dapr.workflows.runtime.WorkflowRuntime;
66
import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
77
import org.slf4j.Logger;
88
import org.slf4j.LoggerFactory;
99
import org.springframework.beans.BeansException;
10-
import org.springframework.beans.factory.annotation.Autowired;
1110
import org.springframework.context.ApplicationContext;
1211
import org.springframework.context.ApplicationContextAware;
1312
import org.springframework.context.annotation.Configuration;

examples/src/main/java/io/dapr/examples/unittesting/DaprWorkflowExampleTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class DaprWorkflowExampleTest {
4242
private static final String noTimeoutWorkflow = "DemoWorkflowNoTimeout";
4343
private static final String workflowDefaultId = "demo-workflow-123";
4444

45-
private class DemoWorkflow extends Workflow {
45+
private class DemoWorkflow implements Workflow {
4646

4747
@Override
4848
public WorkflowStub create() {

examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainWorkflow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.dapr.workflows.Workflow;
1717
import io.dapr.workflows.WorkflowStub;
1818

19-
public class DemoChainWorkflow extends Workflow {
19+
public class DemoChainWorkflow implements Workflow {
2020
@Override
2121
public WorkflowStub create() {
2222
return ctx -> {

examples/src/main/java/io/dapr/examples/workflows/chain/ToUpperCaseActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package io.dapr.examples.workflows.chain;
1515

16-
import io.dapr.workflows.runtime.WorkflowActivity;
17-
import io.dapr.workflows.runtime.WorkflowActivityContext;
16+
import io.dapr.workflows.WorkflowActivity;
17+
import io.dapr.workflows.WorkflowActivityContext;
1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
2020

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.dapr.workflows.Workflow;
1717
import io.dapr.workflows.WorkflowStub;
1818

19-
public class DemoChildWorkflow extends Workflow {
19+
public class DemoChildWorkflow implements Workflow {
2020
@Override
2121
public WorkflowStub create() {
2222
return ctx -> {

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoWorkflow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.dapr.workflows.Workflow;
1717
import io.dapr.workflows.WorkflowStub;
1818

19-
public class DemoWorkflow extends Workflow {
19+
public class DemoWorkflow implements Workflow {
2020
@Override
2121
public WorkflowStub create() {
2222
return ctx -> {

examples/src/main/java/io/dapr/examples/workflows/childworkflow/ReverseActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package io.dapr.examples.workflows.childworkflow;
1515

16-
import io.dapr.workflows.runtime.WorkflowActivity;
17-
import io.dapr.workflows.runtime.WorkflowActivityContext;
16+
import io.dapr.workflows.WorkflowActivity;
17+
import io.dapr.workflows.WorkflowActivityContext;
1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
2020

examples/src/main/java/io/dapr/examples/workflows/continueasnew/CleanUpActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package io.dapr.examples.workflows.continueasnew;
1515

16-
import io.dapr.workflows.runtime.WorkflowActivity;
17-
import io.dapr.workflows.runtime.WorkflowActivityContext;
16+
import io.dapr.workflows.WorkflowActivity;
17+
import io.dapr.workflows.WorkflowActivityContext;
1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
2020

0 commit comments

Comments
 (0)