Minor code improvements

Combining some var declarations, fixing a type, etc.

Author: boekkooi-fresh

aggregate/aggregate_type.go

@@ -7,10 +7,8 @@ import (
 	"github.com/hellofresh/goengine"
 )
 
-var (
-	// ErrInitiatorMustReturnRoot occurs when a aggregate.Initiator did not return a pointer
-	ErrInitiatorMustReturnRoot = errors.New("goengine: the aggregate.Initiator must return a pointer to the aggregate.Root")
-)
+// ErrInitiatorMustReturnRoot occurs when a aggregate.Initiator did not return a pointer
+var ErrInitiatorMustReturnRoot = errors.New("goengine: the aggregate.Initiator must return a pointer to the aggregate.Root")
 
 type (
 	// Initiator creates a new empty instance of a aggregate.Root

aggregate/repository.go

@@ -26,14 +26,12 @@ var (
 	ErrEmptyEventStream = errors.New("goengine: unsupported empty event stream")
 )
 
-type (
-	// Repository a repository to save and load aggregate.Root's of a specific type
-	Repository struct {
-		aggregateType *Type
-		eventStore    goengine.EventStore
-		streamName    goengine.StreamName
-	}
-)
+// Repository a repository to save and load aggregate.Root's of a specific type
+type Repository struct {
+	aggregateType *Type
+	eventStore    goengine.EventStore
+	streamName    goengine.StreamName
+}
 
 // NewRepository instantiates a new AggregateRepository
 func NewRepository(

driver/inmemory/internal/generate_matcher/main.go

@@ -21,9 +21,7 @@ import (
 	"github.com/hellofresh/goengine/metadata"
 )
 
-var (
-	ErrUnsupportedType = errors.New("the value is not a scalar type")
-)
+var ErrUnsupportedType = errors.New("the value is not a scalar type")
 
 func asScalar(value interface{}) (interface{}, error) {
 	switch value.(type) {

driver/inmemory/matcher_gen.go

@@ -120,7 +120,7 @@ func (a *AdvisoryLockAggregateProjectionStorage) PersistFailure(conn driverSQL.E
 }
 
 // Acquire returns a driverSQL.ProjectorTransaction and the position of the projection within the event stream when a
-// lock is acquire for the specified aggregate_id. Otherwise an error is returned indicating why the lock could not be acquired.
+// lock is acquired for the specified aggregate_id. Otherwise an error is returned indicating why the lock could not be acquired.
 func (a *AdvisoryLockAggregateProjectionStorage) Acquire(
 	ctx context.Context,
 	conn *sql.Conn,
@@ -135,10 +135,8 @@ func (a *AdvisoryLockAggregateProjectionStorage) Acquire(
 	res := conn.QueryRowContext(ctx, a.queryAcquireLock, aggregateID, notification.No)
 
 	var (
-		acquiredLock    bool
-		locked          bool
-		failed          bool
-		projectionState driverSQL.ProjectionRawState
+		acquiredLock, locked, failed bool
+		projectionState              driverSQL.ProjectionRawState
 	)
 	if err := res.Scan(&acquiredLock, &locked, &failed, &projectionState.Position, &projectionState.ProjectionState); err != nil {
 		// No rows are returned when the projector is already at the notification position

driver/sql/postgres/advisory_lock_aggregate_projection_storage.go

@@ -7,13 +7,12 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/golang/mock/gomock"
 	"github.com/hellofresh/goengine"
 	driverSQL "github.com/hellofresh/goengine/driver/sql"
 	"github.com/hellofresh/goengine/driver/sql/postgres"
 	"github.com/hellofresh/goengine/mocks/driver/sql"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 

driver/sql/postgres/advisory_lock_aggregate_projection_storage_test.go

@@ -121,9 +121,8 @@ func (s *AdvisoryLockStreamProjectionStorage) Acquire(
 	}
 
 	var (
-		acquiredLock    bool
-		locked          bool
-		projectionState driverSQL.ProjectionRawState
+		acquiredLock, locked bool
+		projectionState      driverSQL.ProjectionRawState
 	)
 	if err := res.Scan(&acquiredLock, &locked, &projectionState.Position, &projectionState.ProjectionState); err != nil {
 		// No rows are returned when the projector is already at the notification position

driver/sql/postgres/advisory_lock_stream_projection_storage.go

@@ -150,11 +150,8 @@ func (s *notificationProjector) projectStream(
 	ctx context.Context,
 	tx ProjectorTransaction,
 	stream *eventStreamHandlerIterator,
-) error {
-	var (
-		err   error
-		state ProjectionState
-	)
+) (err error) {
+	var state ProjectionState
 	for stream.Next() {
 		// Check if the context is expired
 		select {