From cac6ce082c6b78fbe5b6c246f8505a76a76a1dde Mon Sep 17 00:00:00 2001
From: William Boxhall <william.boxhall@cultureamp.com>
Date: Fri, 17 Apr 2020 14:20:49 +1000
Subject: [PATCH] Rename Err to CmdErr to make compiler errors easier to
 understand

---
 .../cultureamp/eventsourcing/Configuration.kt | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt b/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt
index d0aa0e7..8f790bb 100644
--- a/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt
+++ b/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt
@@ -4,52 +4,52 @@ import org.joda.time.DateTime
 import java.util.*
 import kotlin.reflect.KClass
 
-data class Configuration<CreationCmd : CreationCommand, CreationEvt : CreationEvent, Err : CommandError, UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, Agg : Aggregate>(
+data class Configuration<CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, Agg : Aggregate>(
         val creationCommandClass: KClass<CreationCmd>,
         val updateCommandClass: KClass<UpdateCmd>,
-        val create: (CreationCmd) -> Either<Err, CreationEvt>,
-        val update: Agg.(UpdateCmd) -> Either<Err, List<UpdateEvt>>,
+        val create: (CreationCmd) -> Either<CmdErr, CreationEvt>,
+        val update: Agg.(UpdateCmd) -> Either<CmdErr, List<UpdateEvt>>,
         val created: (CreationEvt) -> Agg,
         val updated: Agg.(UpdateEvt) -> Agg,
         val aggregateType: Agg.() -> String
 ) {
     companion object {
 
-        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, Err : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, reified Agg : Aggregate> from(
-                noinline create: (CreationCmd) -> Either<Err, CreationEvt>,
-                noinline update: Agg.(UpdateCmd) -> Either<Err, List<UpdateEvt>>,
+        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, reified Agg : Aggregate> from(
+                noinline create: (CreationCmd) -> Either<CmdErr, CreationEvt>,
+                noinline update: Agg.(UpdateCmd) -> Either<CmdErr, List<UpdateEvt>>,
                 noinline created: (CreationEvt) -> Agg,
                 noinline updated: Agg.(UpdateEvt) -> Agg = { _ -> this },
                 noinline aggregateType: Agg.() -> String = { this::class.simpleName!! }
-        ): Configuration<CreationCmd, CreationEvt, Err, UpdateCmd, UpdateEvt, Agg> {
+        ): Configuration<CreationCmd, CreationEvt, CmdErr, UpdateCmd, UpdateEvt, Agg> {
             return Configuration(CreationCmd::class, UpdateCmd::class, create, update, created, updated, aggregateType)
         }
 
-        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, Err : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, reified Agg : Aggregate> fromStateless(
-                noinline create: (CreationCmd) -> Either<Err, CreationEvt>,
-                noinline update: (UpdateCmd) -> Either<Err, List<UpdateEvt>>,
+        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, reified Agg : Aggregate> fromStateless(
+                noinline create: (CreationCmd) -> Either<CmdErr, CreationEvt>,
+                noinline update: (UpdateCmd) -> Either<CmdErr, List<UpdateEvt>>,
                 instance: Agg,
                 noinline aggregateType: Agg.() -> String = { this::class.simpleName!! }
-        ): Configuration<CreationCmd, CreationEvt, Err, UpdateCmd, UpdateEvt, Agg> {
+        ): Configuration<CreationCmd, CreationEvt, CmdErr, UpdateCmd, UpdateEvt, Agg> {
             return from(create, { update(it) }, { instance }, { instance }, aggregateType)
         }
 
-        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, Err : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, reified Agg : TypedAggregate<UpdateCmd, UpdateEvt, Err, Agg>> fromTypedAggregate(
-                aggregateConstructor: AggregateConstructor<CreationCmd, CreationEvt, Err, UpdateCmd, UpdateEvt, Agg>
-        ): Configuration<CreationCmd, CreationEvt, Err, UpdateCmd, UpdateEvt, Agg> {
+        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, reified Agg : TypedAggregate<UpdateCmd, UpdateEvt, CmdErr, Agg>> fromTypedAggregate(
+                aggregateConstructor: AggregateConstructor<CreationCmd, CreationEvt, CmdErr, UpdateCmd, UpdateEvt, Agg>
+        ): Configuration<CreationCmd, CreationEvt, CmdErr, UpdateCmd, UpdateEvt, Agg> {
             val created = aggregateConstructor::created
             val create = aggregateConstructor::create
-            val updated = TypedAggregate<UpdateCmd, UpdateEvt, Err, Agg>::updated
-            val update = TypedAggregate<UpdateCmd, UpdateEvt, Err, Agg>::update
-            val aggregateType = TypedAggregate<UpdateCmd, UpdateEvt, Err, Agg>::aggregateType
+            val updated = TypedAggregate<UpdateCmd, UpdateEvt, CmdErr, Agg>::updated
+            val update = TypedAggregate<UpdateCmd, UpdateEvt, CmdErr, Agg>::update
+            val aggregateType = TypedAggregate<UpdateCmd, UpdateEvt, CmdErr, Agg>::aggregateType
             return from(create, update, created, updated, aggregateType)
         }
 
-        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, Err : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, P, Agg : AggregateWithProjection<UpdateCmd, UpdateEvt, Err, P, Agg>> fromTypedAggregate(
-                aggregateConstructor: AggregateConstructorWithProjection<CreationCmd, CreationEvt, Err, UpdateCmd, UpdateEvt, P, Agg>,
+        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, P, Agg : AggregateWithProjection<UpdateCmd, UpdateEvt, CmdErr, P, Agg>> fromTypedAggregate(
+                aggregateConstructor: AggregateConstructorWithProjection<CreationCmd, CreationEvt, CmdErr, UpdateCmd, UpdateEvt, P, Agg>,
                 projection: P
-        ): Configuration<CreationCmd, CreationEvt, Err, UpdateCmd, UpdateEvt, TypedAggregate<UpdateCmd, UpdateEvt, Err, *>> {
-            return fromTypedAggregate<CreationCmd, CreationEvt, Err, UpdateCmd, UpdateEvt, TypedAggregate<UpdateCmd, UpdateEvt, Err, *>>(aggregateConstructor.partial(projection))
+        ): Configuration<CreationCmd, CreationEvt, CmdErr, UpdateCmd, UpdateEvt, TypedAggregate<UpdateCmd, UpdateEvt, CmdErr, *>> {
+            return fromTypedAggregate<CreationCmd, CreationEvt, CmdErr, UpdateCmd, UpdateEvt, TypedAggregate<UpdateCmd, UpdateEvt, CmdErr, *>>(aggregateConstructor.partial(projection))
         }
     }