Make server codegen more deterministic by ensuring service methods or…

…dering #988
akka · Jun 3, 2020 · 277ed2c · 277ed2c
1 parent fec8123
commit 277ed2c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/Service.scala b/codegen/src/main/scala/akka/grpc/gen/javadsl/Service.scala
@@ -20,7 +20,7 @@ final case class Service(
     serverPowerApi: Boolean,
     usePlayActions: Boolean,
     comment: Option[String] = None) {
-  def serializers: Set[Serializer] = (methods.map(_.deserializer) ++ methods.map(_.serializer)).toSet
+  def serializers: Seq[Serializer] = (methods.map(_.deserializer) ++ methods.map(_.serializer)).distinct
   def packageDir = packageName.replace('.', '/')
 }
 

diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala b/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala
@@ -19,7 +19,7 @@ case class Service(
     serverPowerApi: Boolean,
     usePlayActions: Boolean,
     comment: Option[String] = None) {
-  def serializers: Set[Serializer] = (methods.map(_.deserializer) ++ methods.map(_.serializer)).toSet
+  def serializers: Seq[Serializer] = (methods.map(_.deserializer) ++ methods.map(_.serializer)).distinct
   def packageDir = packageName.replace('.', '/')
 }
 

diff --git a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
@@ -12,5 +12,5 @@
       case akka.grpc.gen.ClientStreaming => singleResponse
       case akka.grpc.gen.ServerStreaming => streamResponse
       case akka.grpc.gen.BidiStreaming => streamResponse
-  }.toSet.mkString("\n")
+  }.distinct.mkString("\n")
 }
diff --git a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
@@ -24,7 +24,7 @@ import akka.grpc.internal.ClientState
 @{
   def withSingleResponse(stmt: String) = Set("import akka.grpc.scaladsl.SingleResponseRequestBuilder", stmt)
   def withStreamResponse(stmt: String) = Set("import akka.grpc.scaladsl.StreamResponseRequestBuilder", stmt)
-  service.methods.toSet.flatMap { method: akka.grpc.gen.scaladsl.Method =>
+  service.methods.distinct.flatMap { method: akka.grpc.gen.scaladsl.Method =>
 
     val statements = method.methodType match {
       case akka.grpc.gen.Unary => withSingleResponse("import akka.grpc.internal.ScalaUnaryRequestBuilder")