Merge pull request #307 from kelnos/fix-circe-trait-discriminator-filter

Fix discriminator filter in circe protocol trait generation
guardrail-dev · May 24, 2019 · 9b41f5c · 9b41f5c
2 parents a2d7169 + a594a2d
commit 9b41f5c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/ProtocolGenerator.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/ProtocolGenerator.scala
@@ -8,7 +8,7 @@ import com.twilio.guardrail.extract.VendorExtension.VendorExtensible._
 import com.twilio.guardrail.languages.LA
 import com.twilio.guardrail.protocol.terms.protocol._
 import com.twilio.guardrail.terms.framework.FrameworkTerms
-import com.twilio.guardrail.terms.{ScalaTerms, SwaggerTerms}
+import com.twilio.guardrail.terms.{ ScalaTerms, SwaggerTerms }
 import java.util.Locale
 import scala.collection.JavaConverters._
 import scala.language.higherKinds

diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/generators/CirceProtocolGenerator.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/generators/CirceProtocolGenerator.scala
@@ -440,7 +440,7 @@ object CirceProtocolGenerator {
           testTerms <- (
             params
               .map(_.term)
-              .filter(_.name.value != discriminator)
+              .filter(_.name.value != discriminator.propertyName)
               .traverse { t =>
                 for {
                   tpe <- Target.fromOption(

diff --git a/...kkaHttp/src/test/scala/generators/AkkaHttp/Client/contentType/AkkaHttpTextPlainTest.scala b/...kkaHttp/src/test/scala/generators/AkkaHttp/Client/contentType/AkkaHttpTextPlainTest.scala
@@ -60,6 +60,9 @@ class AkkaHttpTextPlainTest extends FunSuite with Matchers with EitherValues wit
       def doBar(respond: tests.contentTypes.textPlain.server.akkaHttp.foo.FooResource.doBarResponse.type)(
           body: Option[String]
       ): scala.concurrent.Future[tests.contentTypes.textPlain.server.akkaHttp.foo.FooResource.doBarResponse] = ???
+      def doBaz(respond: FooResource.doBazResponse.type)(
+          body: Option[String]
+      ): scala.concurrent.Future[tests.contentTypes.textPlain.server.akkaHttp.foo.FooResource.doBazResponse] = ???
     })
 
     val client: HttpRequest => Future[HttpResponse] = Route.asyncHandler(route)
@@ -80,6 +83,9 @@ class AkkaHttpTextPlainTest extends FunSuite with Matchers with EitherValues wit
         } else {
           Future.successful(respond.NotAcceptable)
         }
+      def doBaz(respond: FooResource.doBazResponse.type)(
+          body: Option[String]
+      ): scala.concurrent.Future[tests.contentTypes.textPlain.server.akkaHttp.foo.FooResource.doBazResponse] = ???
     })
 
     val client: HttpRequest => Future[HttpResponse] = Route.asyncHandler(route)
@@ -100,6 +106,9 @@ class AkkaHttpTextPlainTest extends FunSuite with Matchers with EitherValues wit
         } else {
           Future.successful(respond.NotAcceptable)
         }
+      def doBaz(respond: FooResource.doBazResponse.type)(
+          body: Option[String]
+      ): scala.concurrent.Future[tests.contentTypes.textPlain.server.akkaHttp.foo.FooResource.doBazResponse] = ???
     })
 
     val client: HttpRequest => Future[HttpResponse] = Route.asyncHandler(route)

diff --git a/...mple-http4s/src/test/scala/generators/Http4s/Client/contentType/Http4sTextPlainTest.scala b/...mple-http4s/src/test/scala/generators/Http4s/Client/contentType/Http4sTextPlainTest.scala
@@ -2,12 +2,11 @@ package generators.Http4s.Client.contentType
 
 import _root_.tests.contentTypes.textPlain.client.http4s.foo.FooClient
 import _root_.tests.contentTypes.textPlain.client.{ http4s => cdefs }
-import _root_.tests.contentTypes.textPlain.server.http4s.foo.{ DoBarResponse, DoFooResponse, FooHandler, FooResource }
+import _root_.tests.contentTypes.textPlain.server.http4s.foo.{ DoBarResponse, DoBazResponse, DoFooResponse, FooHandler, FooResource }
 import _root_.tests.contentTypes.textPlain.server.{ http4s => sdefs }
 import org.scalatest.{ EitherValues, FunSuite, Matchers }
 import org.http4s.dsl.io._
 import org.http4s.headers._
-
 import cats.effect.IO
 import org.http4s.client.Client
 import org.http4s.{ Charset, HttpRoutes, MediaType }
@@ -53,6 +52,7 @@ class Http4sTextPlainTest extends FunSuite with Matchers with EitherValues {
           IO.pure(respond.NotAcceptable)
         }
       def doBar(respond: DoBarResponse.type)(body: Option[String]): IO[sdefs.foo.DoBarResponse] = ???
+      def doBaz(respond: DoBazResponse.type)(body: Option[String]): IO[sdefs.foo.DoBazResponse] = ???
     })
 
     val client: Client[IO] = Client.fromHttpApp(route.orNotFound)
@@ -69,6 +69,7 @@ class Http4sTextPlainTest extends FunSuite with Matchers with EitherValues {
         } else {
           IO.pure(respond.NotAcceptable)
         }
+      def doBaz(respond: DoBazResponse.type)(body: Option[String]): IO[sdefs.foo.DoBazResponse] = ???
     })
 
     val client: Client[IO] = Client.fromHttpApp(route.orNotFound)
@@ -85,6 +86,7 @@ class Http4sTextPlainTest extends FunSuite with Matchers with EitherValues {
         } else {
           IO.pure(respond.NotAcceptable)
         }
+      def doBaz(respond: DoBazResponse.type)(body: Option[String]): IO[sdefs.foo.DoBazResponse] = ???
     })
 
     val client: Client[IO] = Client.fromHttpApp(route.orNotFound)