Use flat_package for scala codegen by default

plugin-tester-scala/src/main/scala/io/grpc/examples/helloworld/GreeterClient.scala → plugin-tester-scala/src/main/scala/io/grpc/examples/GreeterClient.scala

@@ -1,5 +1,5 @@
 //#full-client
-package io.grpc.examples.helloworld
+package io.grpc.examples
 
 import java.util.concurrent.TimeUnit
 

plugin-tester-scala/src/main/scala/io/grpc/examples/helloworld/GreeterServer.scala → plugin-tester-scala/src/main/scala/io/grpc/examples/GreeterServer.scala

@@ -1,5 +1,5 @@
 //#full-server
-package io.grpc.examples.helloworld
+package io.grpc.examples
 
 import java.io.FileInputStream
 import java.nio.file.Files

plugin-tester-scala/src/main/scala/io/grpc/examples/helloworld/GreeterServiceImpl.scala → plugin-tester-scala/src/main/scala/io/grpc/examples/GreeterServiceImpl.scala

@@ -1,5 +1,5 @@
 //#full-service-impl
-package io.grpc.examples.helloworld
+package io.grpc.examples
 
 import scala.concurrent.Future
 

project/ReflectiveCodeGen.scala

@@ -7,8 +7,16 @@ import ProtocPlugin.autoImport.PB
 import protocbridge.{Artifact, Generator, JvmGenerator, Target}
 import sbt.internal.inc.classpath.ClasspathUtilities
 
+import scalapb.ScalaPbCodeGenerator
+
 /** A plugin that allows to use a code generator compiled in one subproject to be used in a test project */
 object ReflectiveCodeGen extends AutoPlugin {
+  // In the 'real' plugin we enable the 'flat_package' option by default to get package names
+  // that are more consistent between Scala and Java.
+  // Because the interop tests generate both Scala and Java code, however, here we disable this
+  // option to avoid name clashes in the generated classes:
+  val codeGeneratorSettings = Seq.empty
+
   override def projectSettings: Seq[Def.Setting[_]] =
     inConfig(Compile)(Seq(
       PB.generate :=
@@ -36,7 +44,7 @@ object ReflectiveCodeGen extends AutoPlugin {
       mutableGenerator in Compile := createMutableGenerator(),
       PB.targets in Compile := Seq(
         // Scala model classes:
-        scalapb.gen(grpc = false, flatPackage = false) -> (sourceManaged in Compile).value,
+        (JvmGenerator("scala", ScalaPbCodeGenerator), codeGeneratorSettings) -> (sourceManaged in Compile).value,
         // Java model classes:
         PB.gens.java -> (sourceManaged in Compile).value,
         // akka-grpc code:
@@ -72,13 +80,7 @@ object ReflectiveCodeGen extends AutoPlugin {
     }
 
     val adapted = new MutableProtocCodeGenerator
-    val generator = JvmGenerator(s"mutable", adapted)
-    val settings: Seq[String] = Seq(
-      "flat_package" -> false,
-      "java_conversions" -> false,
-      "single_line_to_string" -> false).collect { case (settingName, v) if v => settingName }
-
-    MutableGeneratorAccess(adapted.setUnderlying _, (generator, settings))
+    MutableGeneratorAccess(adapted.setUnderlying _, (JvmGenerator(s"mutable", adapted), codeGeneratorSettings))
   }
 
   def loadAndSetGenerator(classpath: Classpath, access: MutableGeneratorAccess): Unit = {

sbt-plugin/src/main/scala/akka/grpc/sbt/AkkaGrpcPlugin.scala

@@ -30,7 +30,7 @@ object AkkaGrpcPlugin extends AutoPlugin {
 
   def configSettings(config: Configuration): Seq[Setting[_]] = {
     inConfig(config)(Seq(
-      codeGeneratorSettings := Seq.empty,
+      codeGeneratorSettings := Seq("flat_package"),
       akkaGrpcCodeGenerators := GeneratorAndSettings(ScalaServerCodeGenerator, codeGeneratorSettings.value) :: Nil,
       akkaGrpcModelGenerators := Seq[Target]((JvmGenerator("scala", ScalaPbCodeGenerator), codeGeneratorSettings.value) -> sourceManaged.value),
 

sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt

@@ -25,5 +25,11 @@ javaAgents ++= Seq(
 enablePlugins(JavaAgent)
 enablePlugins(AkkaGrpcPlugin)
 
+// By default we enable the 'flat_package' option by default to get package names
+// that are more consistent between Scala and Java.
+// Because the interop tests generate both Scala and Java code, however, here we disable this
+// option to avoid name clashes in the generated classes:
+(codeGeneratorSettings in Compile) := Seq.empty
+
 (akkaGrpcCodeGenerators in Compile) += GeneratorAndSettings(JavaServerCodeGenerator)
 (akkaGrpcModelGenerators in Compile) += PB.gens.java -> sourceManaged.value

sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/io/akka/grpc/helloworld/GreeterImpl.scala → sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/src/main/scala/io/akka/grpc/GreeterImpl.scala

@@ -1,12 +1,10 @@
-package io.akka.grpc.helloworld
+package io.akka.grpc
 
 import scala.concurrent.Future
 
 import akka.NotUsed
 import akka.stream.scaladsl.Source
 
-import io.akka.grpc.helloworld._
-
 class GreeterImpl extends Greeter {
   override def sayHello(in: HelloRequest): Future[HelloReply] = ???
 
@@ -15,4 +13,5 @@ class GreeterImpl extends Greeter {
   override def itKeepsTalking(in: Source[HelloRequest, NotUsed]): Future[HelloReply] = ???
 
   override def itKeepsReplying(in: HelloRequest): Source[HelloReply, NotUsed] = ???
+
 }

sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/test

@@ -3,6 +3,6 @@
 > check
 
 $ exists target/scala-2.12/src_managed
-$ exists target/scala-2.12/src_managed/main/io/akka/grpc/helloworld/HelloRequest.scala
-$ exists target/scala-2.12/src_managed/main/io/akka/grpc/helloworld/HelloworldProto.scala
-$ exists target/scala-2.12/src_managed/main/io/akka/grpc/helloworld/Greeter.scala
+$ exists target/scala-2.12/src_managed/main/io/akka/grpc/HelloRequest.scala
+$ exists target/scala-2.12/src_managed/main/io/akka/grpc/HelloworldProto.scala
+$ exists target/scala-2.12/src_managed/main/io/akka/grpc/Greeter.scala

sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/io/akka/grpc/echo/Echo.scala → sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/io/akka/grpc/EchoImpl.scala

@@ -1,4 +1,4 @@
-package io.akka.grpc.echo
+package io.akka.grpc
 
 import scala.concurrent.Future
 

sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/src/main/scala/io/akka/grpc/helloworld/GreeterImpl.scala → sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/io/akka/grpc/GreeterImpl.scala

@@ -1,12 +1,10 @@
-package io.akka.grpc.helloworld
+package io.akka.grpc
 
 import scala.concurrent.Future
 
 import akka.NotUsed
 import akka.stream.scaladsl.Source
 
-import io.akka.grpc.helloworld._
-
 class GreeterImpl extends Greeter {
   override def sayHello(in: HelloRequest): Future[HelloReply] = ???
 
@@ -15,5 +13,4 @@ class GreeterImpl extends Greeter {
   override def itKeepsTalking(in: Source[HelloRequest, NotUsed]): Future[HelloReply] = ???
 
   override def itKeepsReplying(in: HelloRequest): Source[HelloReply, NotUsed] = ???
-
 }

sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/io/akka/grpc/Main.scala

@@ -7,8 +7,6 @@ import javax.net.ssl.{KeyManagerFactory, SSLContext}
 import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
 import akka.http.scaladsl.{Http2, HttpsConnectionContext}
-import io.akka.grpc.echo.{EchoImpl, EchoHandler}
-import io.akka.grpc.helloworld.{GreeterImpl, GreeterHandler}
 
 object Main extends App {
   implicit val system = ActorSystem()