Merge pull request #250 from cschleiden/module-reorg-2

Improve code organization /2

Author: cschleiden

README.md

@@ -268,7 +268,7 @@ Create a `Client` instance then then call `CancelWorkflow` to cancel a workflow.
 Sub-workflows will be canceled if their parent workflow is canceled.
 
 ```go
-var c client.Client
+var c *client.Client
 err = c.CancelWorkflowInstance(context.Background(), workflowInstance)
 if err != nil {
 	panic("could not cancel workflow")

activitytester/activitytester.go

@@ -8,6 +8,8 @@ import (
 	"github.com/cschleiden/go-workflows/internal/activity"
 )
 
+// WithActivityTestState returns a context with an activity state attached that can be used for unit testing
+// activities.
 func WithActivityTestState(ctx context.Context, activityID, instanceID string, logger *slog.Logger) context.Context {
 	if logger == nil {
 		logger = slog.Default()

backend/backend.go

@@ -5,11 +5,10 @@ import (
 	"errors"
 	"log/slog"
 
+	"github.com/cschleiden/go-workflows/backend/converter"
 	"github.com/cschleiden/go-workflows/backend/history"
-	"github.com/cschleiden/go-workflows/contextpropagation"
-	"github.com/cschleiden/go-workflows/converter"
+	"github.com/cschleiden/go-workflows/backend/metrics"
 	"github.com/cschleiden/go-workflows/core"
-	"github.com/cschleiden/go-workflows/metrics"
 	"github.com/cschleiden/go-workflows/workflow"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -83,5 +82,5 @@ type Backend interface {
 	Converter() converter.Converter
 
 	// ContextPropagators returns the configured context propagators for the backend
-	ContextPropagators() []contextpropagation.ContextPropagator
+	ContextPropagators() []workflow.ContextPropagator
 }

converter/converter.go renamed to backend/converter/converter.go

@@ -1,7 +1,7 @@
 package converter
 
 import (
-	"github.com/cschleiden/go-workflows/internal/payload"
+	"github.com/cschleiden/go-workflows/backend/payload"
 )
 
 type Converter interface {

converter/json.go renamed to backend/converter/json.go

@@ -3,7 +3,7 @@ package converter
 import (
 	"encoding/json"
 
-	"github.com/cschleiden/go-workflows/internal/payload"
+	"github.com/cschleiden/go-workflows/backend/payload"
 )
 
 type jsonConverter struct{}

backend/history/activity_completed.go

@@ -1,6 +1,6 @@
 package history
 
-import "github.com/cschleiden/go-workflows/internal/payload"
+import "github.com/cschleiden/go-workflows/backend/payload"
 
 type ActivityCompletedAttributes struct {
 	Result payload.Payload `json:"result,omitempty"`

backend/history/activity_scheduled.go

@@ -2,7 +2,7 @@ package history
 
 import (
 	"github.com/cschleiden/go-workflows/backend/metadata"
-	"github.com/cschleiden/go-workflows/internal/payload"
+	"github.com/cschleiden/go-workflows/backend/payload"
 )
 
 type ActivityScheduledAttributes struct {

backend/history/side_effect_result.go

@@ -1,6 +1,6 @@
 package history
 
-import "github.com/cschleiden/go-workflows/internal/payload"
+import "github.com/cschleiden/go-workflows/backend/payload"
 
 type SideEffectResultAttributes struct {
 	Result payload.Payload `json:"result,omitempty"`

backend/history/signal_received.go

@@ -1,6 +1,6 @@
 package history
 
-import "github.com/cschleiden/go-workflows/internal/payload"
+import "github.com/cschleiden/go-workflows/backend/payload"
 
 type SignalReceivedAttributes struct {
 	Name string          `json:"name,omitempty"`

backend/history/subworkflow_completed.go

@@ -1,6 +1,6 @@
 package history
 
-import "github.com/cschleiden/go-workflows/internal/payload"
+import "github.com/cschleiden/go-workflows/backend/payload"
 
 type SubWorkflowCompletedAttributes struct {
 	Result payload.Payload `json:"result,omitempty"`