chore: convert ValueEntity codegen to new scheme (#662)

lightbend · Oct 19, 2021 · 02d6592 · 02d6592
1 parent fdb6822
commit 02d6592
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 171 deletions.
diff --git a/...rc/main/scala/com/akkaserverless/codegen/scalasdk/impl/ActionServiceSourceGenerator.scala b/...rc/main/scala/com/akkaserverless/codegen/scalasdk/impl/ActionServiceSourceGenerator.scala
@@ -39,7 +39,8 @@ object ActionServiceSourceGenerator {
     Seq(abstractAction(service), actionRouter(service), actionProvider(service))
 
   private[codegen] def actionSource(service: ModelBuilder.ActionService): File = {
-    import Types._
+    import Types.{ Source, NotUsed }
+    import Types.Action._
 
     val className = service.className
 
@@ -100,7 +101,8 @@ object ActionServiceSourceGenerator {
   }
 
   private[codegen] def abstractAction(service: ModelBuilder.ActionService): File = {
-    import Types._
+    import Types.{ Source, NotUsed }
+    import Types.Action._
 
     val methods = service.commands.map { cmd =>
       val methodName = cmd.name
@@ -141,7 +143,8 @@ object ActionServiceSourceGenerator {
   }
 
   private[codegen] def actionRouter(service: ModelBuilder.ActionService): File = {
-    import Types._
+    import Types.{ Source, NotUsed }
+    import Types.Action._
 
     val unaryCases = service.commands.filter(_.isUnary).map { cmd =>
       val methodName = cmd.name
@@ -223,7 +226,8 @@ object ActionServiceSourceGenerator {
   }
 
   private[codegen] def actionProvider(service: ModelBuilder.ActionService): File = {
-    import Types._
+    import Types.{ Descriptors, ImmutableSeq }
+    import Types.Action._
 
     generate(
       service.fqn.parent,

diff --git a/...in/scala/com/akkaserverless/codegen/scalasdk/impl/EventSourcedEntitySourceGenerator.scala b/...in/scala/com/akkaserverless/codegen/scalasdk/impl/EventSourcedEntitySourceGenerator.scala
@@ -39,7 +39,7 @@ object EventSourcedEntitySourceGenerator {
   private[codegen] def abstractEntity(
       eventSourcedEntity: ModelBuilder.EventSourcedEntity,
       service: ModelBuilder.EntityService): File = {
-    import Types._
+    import Types.EventSourcedEntity._
     val abstractEntityName = eventSourcedEntity.abstractEntityName
 
     val stateType = eventSourcedEntity.state.fqn
@@ -78,7 +78,7 @@ object EventSourcedEntitySourceGenerator {
   private[codegen] def handler(
       eventSourcedEntity: ModelBuilder.EventSourcedEntity,
       service: ModelBuilder.EntityService): File = {
-    import Types._
+    import Types.EventSourcedEntity._
 
     val stateType = eventSourcedEntity.state.fqn
     val eventSourcedEntityName = eventSourcedEntity.fqn
@@ -126,7 +126,8 @@ object EventSourcedEntitySourceGenerator {
   }
 
   def provider(entity: ModelBuilder.EventSourcedEntity, service: ModelBuilder.EntityService): File = {
-    import Types._
+    import Types.{ ImmutableSeq, Descriptors }
+    import Types.EventSourcedEntity._
     val className = entity.providerName
 
     val descriptors =
@@ -166,7 +167,7 @@ object EventSourcedEntitySourceGenerator {
   def generateImplementationSkeleton(
       eventSourcedEntity: ModelBuilder.EventSourcedEntity,
       service: ModelBuilder.EntityService): File = {
-    import Types._
+    import Types.EventSourcedEntity._
 
     val eventHandlers =
       eventSourcedEntity.events.map { event =>

diff --git a/codegen/scala-gen/src/main/scala/com/akkaserverless/codegen/scalasdk/impl/Types.scala b/codegen/scala-gen/src/main/scala/com/akkaserverless/codegen/scalasdk/impl/Types.scala
@@ -19,26 +19,41 @@ package com.akkaserverless.codegen.scalasdk.impl
 import com.lightbend.akkasls.codegen.FullyQualifiedName
 
 object Types {
-  val EventSourcedEntity = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntity")
-  val EventSourcedEntityProvider = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntityProvider")
-  val EventSourcedEntityOptions = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntityOptions")
-  val EventSourcedEntityContext = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntityContext")
-
-  val CommandContext = FQN("com.akkaserverless.scalasdk.eventsourcedentity.CommandContext")
-  val EventSourcedEntityRouter = FQN("com.akkaserverless.scalasdk.impl.eventsourcedentity.EventSourcedEntityRouter")
-
-  val CommandHandlerNotFound = FQN(
-    "com.akkaserverless.javasdk.impl.eventsourcedentity.EventSourcedEntityRouter.CommandHandlerNotFound")
-  val EventHandlerNotFound = FQN(
-    "com.akkaserverless.javasdk.impl.eventsourcedentity.EventSourcedEntityRouter.EventHandlerNotFound")
-
-  val Action = FQN("com.akkaserverless.scalasdk.action.Action")
-  val ActionCreationContext = FQN("com.akkaserverless.scalasdk.action.ActionCreationContext")
-  val ActionOptions = FQN("com.akkaserverless.scalasdk.action.ActionOptions")
-  val ActionProvider = FQN("com.akkaserverless.scalasdk.action.ActionProvider")
-  val MessageEnvelope = FQN("com.akkaserverless.scalasdk.action.MessageEnvelope")
-  val ActionRouter = FQN("com.akkaserverless.scalasdk.impl.action.ActionRouter")
-  val HandlerNotFound = FQN("com.akkaserverless.javasdk.impl.action.ActionRouter.HandlerNotFound")
+  object Action {
+    val Action = FQN("com.akkaserverless.scalasdk.action.Action")
+    val ActionCreationContext = FQN("com.akkaserverless.scalasdk.action.ActionCreationContext")
+    val ActionOptions = FQN("com.akkaserverless.scalasdk.action.ActionOptions")
+    val ActionProvider = FQN("com.akkaserverless.scalasdk.action.ActionProvider")
+    val MessageEnvelope = FQN("com.akkaserverless.scalasdk.action.MessageEnvelope")
+    val ActionRouter = FQN("com.akkaserverless.scalasdk.impl.action.ActionRouter")
+    val HandlerNotFound = FQN("com.akkaserverless.javasdk.impl.action.ActionRouter.HandlerNotFound")
+  }
+
+  object EventSourcedEntity {
+    val EventSourcedEntity = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntity")
+    val EventSourcedEntityProvider = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntityProvider")
+    val EventSourcedEntityOptions = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntityOptions")
+    val EventSourcedEntityContext = FQN("com.akkaserverless.scalasdk.eventsourcedentity.EventSourcedEntityContext")
+
+    val CommandContext = FQN("com.akkaserverless.scalasdk.eventsourcedentity.CommandContext")
+    val EventSourcedEntityRouter = FQN("com.akkaserverless.scalasdk.impl.eventsourcedentity.EventSourcedEntityRouter")
+
+    val CommandHandlerNotFound = FQN(
+      "com.akkaserverless.javasdk.impl.eventsourcedentity.EventSourcedEntityRouter.CommandHandlerNotFound")
+    val EventHandlerNotFound = FQN(
+      "com.akkaserverless.javasdk.impl.eventsourcedentity.EventSourcedEntityRouter.EventHandlerNotFound")
+  }
+
+  object ValueEntity {
+    val ValueEntity = FQN("com.akkaserverless.scalasdk.valueentity.ValueEntity")
+    val CommandContext = FQN("com.akkaserverless.scalasdk.valueentity.CommandContext")
+    val ValueEntityContext = FQN("com.akkaserverless.scalasdk.valueentity.ValueEntityContext")
+    val ValueEntityOptions = FQN("com.akkaserverless.scalasdk.valueentity.ValueEntityOptions")
+    val ValueEntityProvider = FQN("com.akkaserverless.scalasdk.valueentity.ValueEntityProvider")
+    val ValueEntityRouter = FQN("com.akkaserverless.scalasdk.impl.valueentity.ValueEntityRouter")
+    val CommandHandlerNotFound = FQN(
+      "com.akkaserverless.javasdk.impl.valueentity.ValueEntityRouter.CommandHandlerNotFound")
+  }
 
   val Source = FQN("akka.stream.scaladsl.Source")
   val NotUsed = FQN("akka.NotUsed")