Cleanup

Author: iRevive

codegen/src/main/scala/fs2/grpc/codegen/Fs2CodeGenerator.scala

@@ -140,15 +140,14 @@ object Fs2CodeGenerator extends CodeGenApp {
       paramsAndUnparsed <- GeneratorParams.fromStringCollectUnrecognized(params)
       params = paramsAndUnparsed._1
       unparsed = paramsAndUnparsed._2
-      suffix <- unparsed
-        .map(_.split("=", 2).toList)
-        .foldLeft[Either[String, Fs2Params]](Right(Fs2Params.default.withScala3Sources(params.scala3Sources))) {
-          case (Right(params), ServiceSuffix :: suffix :: Nil) => Right(params.withServiceSuffix(suffix))
-          case (Right(params), DisableTrailers :: Nil) => Right(params.withDisableTrailers(true))
-          case (Right(params), RenderContextAsImplicit :: Nil) => Right(params.withRenderContextAsImplicit(true))
-          case (Right(_), xs) => Left(s"Unrecognized parameter: $xs")
-          case (Left(e), _) => Left(e)
-        }
+      initial = Fs2Params.default.withScala3Sources(params.scala3Sources)
+      suffix <- unparsed.map(_.split("=", 2).toList).foldLeft[Either[String, Fs2Params]](Right(initial)) {
+        case (Right(params), ServiceSuffix :: suffix :: Nil) => Right(params.withServiceSuffix(suffix))
+        case (Right(params), DisableTrailers :: Nil) => Right(params.withDisableTrailers(true))
+        case (Right(params), RenderContextAsImplicit :: Nil) => Right(params.withRenderContextAsImplicit(true))
+        case (Right(_), xs) => Left(s"Unrecognized parameter: $xs")
+        case (Left(e), _) => Left(e)
+      }
     } yield (params, suffix)
 
   def process(request: CodeGenRequest): CodeGenResponse = {

codegen/src/main/scala/fs2/grpc/codegen/Fs2GrpcExhaustiveTrailersServicePrinter.scala

@@ -34,10 +34,6 @@ class Fs2GrpcExhaustiveTrailersServicePrinter(
   import fs2.grpc.codegen.Fs2AbstractServicePrinter.constants._
   import di._
 
-  // for binary compatibility
-  def this(service: ServiceDescriptor, serviceSuffix: String, di: DescriptorImplicits) =
-    this(service, serviceSuffix, false, false, di)
-
   override protected def serviceMethodSignature(method: MethodDescriptor): String = {
 
     val scalaInType = method.inputType.scalaType

codegen/src/main/scala/fs2/grpc/codegen/Fs2GrpcServicePrinter.scala

@@ -34,10 +34,6 @@ class Fs2GrpcServicePrinter(
   import fs2.grpc.codegen.Fs2AbstractServicePrinter.constants._
   import di._
 
-  // for binary compatibility
-  def this(service: ServiceDescriptor, serviceSuffix: String, di: DescriptorImplicits) =
-    this(service, serviceSuffix, false, false, di)
-
   override protected def serviceMethodSignature(method: MethodDescriptor): String = {
 
     val scalaInType = method.inputType.scalaType

plugin/src/main/scala/fs2/grpc/codegen/Fs2GrpcPlugin.scala

@@ -88,7 +88,7 @@ object Fs2GrpcPlugin extends AutoPlugin {
         * }}}
         */
       case object Fs2GrpcRenderContextAsImplicit extends CodeGeneratorOption {
-        override def toString: String = "fs2_grpc:disable_trailers"
+        override def toString: String = "fs2_grpc:render_context_as_implicit"
       }
     }