Server-side power API #179

build.sbt

@@ -7,6 +7,7 @@ scalaVersion := scala212
 
 val commonSettings = Seq(
   organization := "com.lightbend.akka.grpc",
+  version := "0.4.1.livongo",
 
   scalacOptions ++= List(
     "-unchecked",
@@ -307,19 +308,19 @@ lazy val root = Project(
   .aggregate(
     runtime,
     codegen,
-    mavenPlugin,
+//    mavenPlugin,
     sbtPlugin,
     scalapbProtocPlugin,
-    interopTests,
-    playInteropTestJava,
-    playInteropTestScala,
-    playTestkit,
-    playSpecs2,
-    playScalaTest,
-    playTestdata,
-    pluginTesterScala,
-    pluginTesterJava,
-    docs,
+//    interopTests,
+//    playInteropTestJava,
+//    playInteropTestScala,
+//    playTestkit,
+//    playSpecs2,
+//    playScalaTest,
+//    playTestdata,
+//    pluginTesterScala,
+//    pluginTesterJava,
+//    docs,
   )
   .enablePlugins(akka.grpc.NoPublish)
   .settings(

codegen/src/main/scala/akka/grpc/gen/Main.scala

@@ -48,65 +48,65 @@ object Main extends App {
     case _ => SilencedLogger
   }
 
-  val out = {
-    val codeGenerator =
-      if (!generatePlay) {
-        if (languageScala) {
-          // Scala
-          if (generateClient && generateServer) ScalaBothCodeGenerator
-          else if (generateClient) ScalaClientCodeGenerator
-          else if (generateServer) ScalaServerCodeGenerator
-          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
-        } else {
-          // Java
-          if (generateClient && generateServer) JavaBothCodeGenerator
-          else if (generateClient) JavaClientCodeGenerator
-          else if (generateServer) JavaServerCodeGenerator
-          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
-        }
-      } else {
-        if (languageScala) {
-          // Scala
-          if (generateClient && generateServer) CombinedPlayScalaBothCodeGenerator
-          else if (generateClient) CombinedPlayScalaClientCodeGenerator
-          else if (generateServer) CombinedPlayScalaServerCodeGenerator
-          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
-        } else {
-          // Java
-          if (generateClient && generateServer) CombinedPlayJavaBothCodeGenerator
-          else if (generateClient) CombinedPlayJavaClientCodeGenerator
-          else if (generateServer) CombinedPlayJavaServerCodeGenerator
-          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
-        }
-      }
-
-    codeGenerator.run(req, logger)
-  }
-
-  System.out.write(out.toByteArray)
-  System.out.flush()
-
-  /**
-   * Generators to generate both the 'plain' akka-grpc code and the play-specific code that depends on it.
-   * In other build tools (Maven and sbt) these are passed to protoc separately, but since Gradle does the
-   * akka-grpc code generation in a single protoc invocation we need to combine those here:
-   */
-  object CombinedPlayJavaClientCodeGenerator extends PlayJavaClientCodeGenerator with JavaClientCodeGenerator {
-    override def name = "combined-play-java-client"
-  }
-  object CombinedPlayJavaServerCodeGenerator extends PlayJavaServerCodeGenerator with JavaServerCodeGenerator {
-    override def name = "combined-play-java-server"
-  }
-  object CombinedPlayJavaBothCodeGenerator extends PlayJavaClientCodeGenerator with JavaClientCodeGenerator with PlayJavaServerCodeGenerator with JavaServerCodeGenerator {
-    override def name = "combined-play-java-both"
-  }
-  object CombinedPlayScalaClientCodeGenerator extends PlayScalaClientCodeGenerator with ScalaClientCodeGenerator {
-    override def name = "combined-play-scala-client"
-  }
-  object CombinedPlayScalaServerCodeGenerator extends PlayScalaServerCodeGenerator with ScalaServerCodeGenerator {
-    override def name = "combined-play-scala-server"
-  }
-  object CombinedPlayScalaBothCodeGenerator extends PlayScalaClientCodeGenerator with ScalaClientCodeGenerator with PlayScalaServerCodeGenerator with ScalaServerCodeGenerator {
-    override def name = "combined-play-scala-both"
-  }
+  //  val out = {
+  //    val codeGenerator =
+  //      if (!generatePlay) {
+  //        if (languageScala) {
+  //          // Scala
+  //          if (generateClient && generateServer) ScalaBothCodeGenerator
+  //          else if (generateClient) ScalaClientCodeGenerator
+  //          else if (generateServer) ScalaServerCodeGenerator()
+  //          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
+  //        } else {
+  //          // Java
+  //          if (generateClient && generateServer) JavaBothCodeGenerator
+  //          else if (generateClient) JavaClientCodeGenerator
+  //          else if (generateServer) JavaServerCodeGenerator
+  //          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
+  //        }
+  //      } else {
+  //        if (languageScala) {
+  //          // Scala
+  //          if (generateClient && generateServer) CombinedPlayScalaBothCodeGenerator
+  //          else if (generateClient) CombinedPlayScalaClientCodeGenerator
+  //          else if (generateServer) CombinedPlayScalaServerCodeGenerator
+  //          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
+  //        } else {
+  //          // Java
+  //          if (generateClient && generateServer) CombinedPlayJavaBothCodeGenerator
+  //          else if (generateClient) CombinedPlayJavaClientCodeGenerator
+  //          else if (generateServer) CombinedPlayJavaServerCodeGenerator
+  //          else throw new IllegalArgumentException("At least one of generateClient or generateServer must be enabled")
+  //        }
+  //      }
+  //
+  //    codeGenerator.run(req, logger)
+  //  }
+  //
+  //  System.out.write(out.toByteArray)
+  //  System.out.flush()
+  //
+  //  /**
+  //   * Generators to generate both the 'plain' akka-grpc code and the play-specific code that depends on it.
+  //   * In other build tools (Maven and sbt) these are passed to protoc separately, but since Gradle does the
+  //   * akka-grpc code generation in a single protoc invocation we need to combine those here:
+  //   */
+  //  object CombinedPlayJavaClientCodeGenerator extends PlayJavaClientCodeGenerator with JavaClientCodeGenerator {
+  //    override def name = "combined-play-java-client"
+  //  }
+  //  object CombinedPlayJavaServerCodeGenerator extends PlayJavaServerCodeGenerator with JavaServerCodeGenerator {
+  //    override def name = "combined-play-java-server"
+  //  }
+  //  object CombinedPlayJavaBothCodeGenerator extends PlayJavaClientCodeGenerator with JavaClientCodeGenerator with PlayJavaServerCodeGenerator with JavaServerCodeGenerator {
+  //    override def name = "combined-play-java-both"
+  //  }
+  //  object CombinedPlayScalaClientCodeGenerator extends PlayScalaClientCodeGenerator with ScalaClientCodeGenerator {
+  //    override def name = "combined-play-scala-client"
+  //  }
+  //  object CombinedPlayScalaServerCodeGenerator extends PlayScalaServerCodeGenerator with ScalaServerCodeGenerator {
+  //    override def name = "combined-play-scala-server"
+  //  }
+  //  object CombinedPlayScalaBothCodeGenerator extends PlayScalaClientCodeGenerator with ScalaClientCodeGenerator with PlayScalaServerCodeGenerator with ScalaServerCodeGenerator {
+  //    override def name = "combined-play-scala-both"
+  //  }
 }

codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaBothCodeGenerator.scala

@@ -4,6 +4,6 @@
 
 package akka.grpc.gen.scaladsl
 
-object ScalaBothCodeGenerator extends ScalaServerCodeGenerator with ScalaClientCodeGenerator {
+object ScalaBothCodeGenerator extends ScalaServerCodeGenerator(powerApis = false) with ScalaClientCodeGenerator {
   override def name = "akka-grpc-scaladsl-both"
 }

codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala

@@ -8,18 +8,30 @@ import akka.grpc.gen.Logger
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
 import templates.ScalaServer.txt._
 
-trait ScalaServerCodeGenerator extends ScalaCodeGenerator {
+case class ScalaServerCodeGenerator(powerApis: Boolean = false) extends ScalaCodeGenerator {
+  import ScalaServerCodeGenerator._
   override def name = "akka-grpc-scaladsl-server"
 
-  override def perServiceContent = super.perServiceContent + ScalaCodeGenerator.generateServiceFile + generateHandler
+  override def perServiceContent =
+    super.perServiceContent + ScalaCodeGenerator.generateServiceFile ++ {
+      if (powerApis) Set(generatePowerService) else Set.empty
+    } + generateHandler(powerApis)
+}
 
-  def generateHandler(logger: Logger, service: Service): CodeGeneratorResponse.File = {
+object ScalaServerCodeGenerator {
+  val generatePowerService: (Logger, Service) => CodeGeneratorResponse.File = (logger, service) => {
     val b = CodeGeneratorResponse.File.newBuilder()
-    b.setContent(Handler(service).body)
-    b.setName(s"${service.packageDir}/${service.name}Handler.scala")
+    b.setContent(PowerApiTrait(service).body)
+    b.setName(s"${service.packageDir}/${service.name}PowerApi.scala")
+    logger.info(s"Generating Akka gRPC file ${b.getName}")
+    //    logger.info(s"Generating Akka gRPC extended service interface ${service.packageName}.${service.name}Extended")
     b.build
   }
 
+  def generateHandler(powerApis: Boolean): (Logger, Service) => CodeGeneratorResponse.File = (logger, service) => {
+    val b = CodeGeneratorResponse.File.newBuilder()
+    b.setContent(Handler(service, powerApis).body)
+    b.setName(s"${service.packageDir}/${service.name}Handler.scala")
+    b.build
+  }
 }
-
-object ScalaServerCodeGenerator extends ScalaServerCodeGenerator

codegen/src/main/scala/akka/grpc/gen/scaladsl/play/PlayScalaServerCodeGenerator.scala

@@ -5,21 +5,25 @@
 package akka.grpc.gen.scaladsl.play
 
 import akka.grpc.gen.Logger
-import akka.grpc.gen.scaladsl.{ ScalaCodeGenerator, Service }
+import akka.grpc.gen.scaladsl.{ ScalaCodeGenerator, ScalaServerCodeGenerator, Service }
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
-import templates.PlayScala.txt.Router
+import templates.PlayScala.txt._
 
-object PlayScalaServerCodeGenerator extends PlayScalaServerCodeGenerator
+case class PlayScalaServerCodeGenerator(powerApis: Boolean = false) extends ScalaCodeGenerator {
+
+  import ScalaServerCodeGenerator._
 
-trait PlayScalaServerCodeGenerator extends ScalaCodeGenerator {
   override def name: String = "akka-grpc-play-server-scala"
 
-  override def perServiceContent = super.perServiceContent + generateRouter
+  override def perServiceContent = super.perServiceContent ++ Set(ScalaCodeGenerator.generateServiceFile) ++ {
+    if (powerApis) Set(generatePowerService) else Set.empty
+  } ++ Set(generateHandler(powerApis), generateRouter)
 
   private val generateRouter: (Logger, Service) => CodeGeneratorResponse.File = (logger, service) => {
     val b = CodeGeneratorResponse.File.newBuilder()
-    b.setContent(Router(service).body)
+    b.setContent(Router(service, powerApis).body)
     b.setName(s"${service.packageDir}/Abstract${service.name}Router.scala")
+    logger.info(s"Generating Akka gRPC file ${b.getName}")
     b.build
   }
 }

codegen/src/main/twirl/templates/PlayScala/AkkaGrpcClientModule.scala.txt

@@ -5,7 +5,7 @@
 @(packageName: String, services: Seq[akka.grpc.gen.scaladsl.Service])
 
 @akka.grpc.gen.Constants.DoNotEditComment
-package @{packageName}
+@{if (packageName.nonEmpty) s"package $packageName" else ""}
 
 import play.api.inject.Binding
 import play.api.{Configuration, Environment}

codegen/src/main/twirl/templates/PlayScala/Router.scala.txt

@@ -2,7 +2,7 @@
  * Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
  *@
 
-@(service: akka.grpc.gen.scaladsl.Service)
+@(service: akka.grpc.gen.scaladsl.Service, powerApis: Boolean)
 
 @akka.grpc.gen.Constants.DoNotEditComment
 package @service.packageName
@@ -17,9 +17,8 @@ import akka.grpc.internal.PlayRouter
 /**
  * Abstract base class for implementing @{service.name} and using as a play Router
  */
-abstract class Abstract@{service.name}Router(mat: Materializer) extends PlayRouter(mat, @{service.name}.name) with @{service.name} {
+abstract class Abstract@{service.name}Router(mat: Materializer) extends PlayRouter(mat, @{service.name}.name) with @{service.name}@{if(powerApis) { "PowerApi"} else { "" }} {
 
   final override def createHandler(serviceName: String, mat: Materializer): HttpRequest => Future[HttpResponse] =
     @{service.name}Handler(this, serviceName)(mat)
-
 }