Use workflow Workflow and Activity types

Author: cschleiden

internal/workflow/registry.go

@@ -7,21 +7,20 @@ import (
 
 	"github.com/cschleiden/go-workflows/internal/args"
 	"github.com/cschleiden/go-workflows/internal/fn"
+	wf "github.com/cschleiden/go-workflows/workflow"
 )
 
-type Activity interface{}
-
 type Registry struct {
 	sync.Mutex
 
-	workflowMap map[string]Workflow
+	workflowMap map[string]wf.Workflow
 	activityMap map[string]interface{}
 }
 
 func NewRegistry() *Registry {
 	return &Registry{
 		Mutex:       sync.Mutex{},
-		workflowMap: make(map[string]Workflow),
+		workflowMap: make(map[string]wf.Workflow),
 		activityMap: make(map[string]interface{}),
 	}
 }
@@ -42,7 +41,7 @@ func (e *ErrInvalidActivity) Error() string {
 	return e.msg
 }
 
-func (r *Registry) RegisterWorkflowByName(name string, workflow Workflow) error {
+func (r *Registry) RegisterWorkflowByName(name string, workflow wf.Workflow) error {
 	wfType := reflect.TypeOf(workflow)
 	if wfType.Kind() != reflect.Func {
 		return &ErrInvalidWorkflow{"workflow is not a function"}
@@ -78,7 +77,7 @@ func (r *Registry) RegisterWorkflowByName(name string, workflow Workflow) error
 	return nil
 }
 
-func (r *Registry) RegisterWorkflow(workflow Workflow) error {
+func (r *Registry) RegisterWorkflow(workflow wf.Workflow) error {
 	name := fn.Name(workflow)
 	return r.RegisterWorkflowByName(name, workflow)
 }
@@ -150,7 +149,7 @@ func checkActivity(actType reflect.Type) error {
 	return nil
 }
 
-func (r *Registry) GetWorkflow(name string) (Workflow, error) {
+func (r *Registry) GetWorkflow(name string) (wf.Workflow, error) {
 	r.Lock()
 	defer r.Unlock()
 

internal/workflow/registry_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/cschleiden/go-workflows/internal/fn"
 	"github.com/cschleiden/go-workflows/internal/sync"
+	wf "github.com/cschleiden/go-workflows/workflow"
 	"github.com/stretchr/testify/require"
 )
 
@@ -16,7 +17,7 @@ func reg_workflow1(ctx sync.Context) error {
 func TestRegistry_RegisterWorkflow(t *testing.T) {
 	type args struct {
 		name     string
-		workflow Workflow
+		workflow wf.Workflow
 	}
 	tests := []struct {
 		name     string

internal/workflow/workflow.go

@@ -12,8 +12,6 @@ import (
 	"github.com/cschleiden/go-workflows/internal/workflowerrors"
 )
 
-type Workflow interface{}
-
 type workflow struct {
 	s      *sync.Scheduler
 	fn     reflect.Value

tester/tester.go

@@ -24,9 +24,9 @@ import (
 	"github.com/cschleiden/go-workflows/internal/fn"
 	"github.com/cschleiden/go-workflows/internal/log"
 	"github.com/cschleiden/go-workflows/internal/signals"
-	"github.com/cschleiden/go-workflows/internal/workflow"
+	wf "github.com/cschleiden/go-workflows/internal/workflow"
 	"github.com/cschleiden/go-workflows/internal/workflowerrors"
-	wf "github.com/cschleiden/go-workflows/workflow"
+	"github.com/cschleiden/go-workflows/workflow"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/mock"
 	"go.opentelemetry.io/otel/trace"
@@ -80,7 +80,7 @@ type WorkflowTester[TResult any] interface {
 
 	Execute(ctx context.Context, args ...interface{})
 
-	Registry() *workflow.Registry
+	Registry() *wf.Registry
 
 	OnActivity(activity workflow.Activity, args ...interface{}) *mock.Call
 
@@ -125,7 +125,7 @@ type workflowTester[TResult any] struct {
 	workflowResult   payload.Payload
 	workflowErr      *workflowerrors.Error
 
-	registry *workflow.Registry
+	registry *wf.Registry
 
 	ma               *mock.Mock
 	mockedActivities map[string]bool
@@ -158,13 +158,13 @@ type workflowTester[TResult any] struct {
 
 	converter converter.Converter
 
-	propagators []wf.ContextPropagator
+	propagators []workflow.ContextPropagator
 }
 
 var _ WorkflowTester[any] = (*workflowTester[any])(nil)
 
-func NewWorkflowTester[TResult any](wf interface{}, opts ...WorkflowTesterOption) *workflowTester[TResult] {
-	if err := margs.ReturnTypeMatch[TResult](wf); err != nil {
+func NewWorkflowTester[TResult any](workflow workflow.Workflow, opts ...WorkflowTesterOption) *workflowTester[TResult] {
+	if err := margs.ReturnTypeMatch[TResult](workflow); err != nil {
 		panic(fmt.Sprintf("workflow return type does not match: %s", err))
 	}
 
@@ -173,7 +173,7 @@ func NewWorkflowTester[TResult any](wf interface{}, opts ...WorkflowTesterOption
 	c.Set(time.Now())
 
 	wfi := core.NewWorkflowInstance(uuid.NewString(), uuid.NewString())
-	registry := workflow.NewRegistry()
+	registry := wf.NewRegistry()
 
 	options := &options{
 		TestTimeout: time.Second * 10,
@@ -190,7 +190,7 @@ func NewWorkflowTester[TResult any](wf interface{}, opts ...WorkflowTesterOption
 	wt := &workflowTester[TResult]{
 		options: options,
 
-		wf:       wf,
+		wf:       workflow,
 		wfi:      wfi,
 		wfm:      &metadata.WorkflowMetadata{},
 		registry: registry,
@@ -223,7 +223,7 @@ func NewWorkflowTester[TResult any](wf interface{}, opts ...WorkflowTesterOption
 	registry.RegisterActivity(signalActivities)
 
 	// Always register the workflow under test
-	if err := wt.registry.RegisterWorkflow(wf); err != nil {
+	if err := wt.registry.RegisterWorkflow(workflow); err != nil {
 		panic(fmt.Sprintf("could not register workflow under test: %v", err))
 	}
 
@@ -234,7 +234,7 @@ func (wt *workflowTester[TResult]) Now() time.Time {
 	return wt.clock.Now()
 }
 
-func (wt *workflowTester[TResult]) Registry() *workflow.Registry {
+func (wt *workflowTester[TResult]) Registry() *wf.Registry {
 	return wt.registry
 }
 
@@ -313,7 +313,7 @@ func (wt *workflowTester[TResult]) Execute(ctx context.Context, args ...interfac
 			tw.pendingEvents = tw.pendingEvents[:0]
 
 			// Execute task
-			e, err := workflow.NewExecutor(wt.logger, wt.tracer, wt.registry, wt.converter, wt.propagators, &testHistoryProvider{tw.history}, tw.instance, tw.metadata, wt.clock)
+			e, err := wf.NewExecutor(wt.logger, wt.tracer, wt.registry, wt.converter, wt.propagators, &testHistoryProvider{tw.history}, tw.instance, tw.metadata, wt.clock)
 			if err != nil {
 				panic(fmt.Errorf("could not create workflow executor: %v", err))
 			}