Finishing up threading CirceVersion

guardrail-dev · Feb 3, 2020 · f67e029 · f67e029
1 parent d09ad01
commit f67e029
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/generators/AkkaHttp.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/generators/AkkaHttp.scala
@@ -1,6 +1,7 @@
 package com.twilio.guardrail
 package generators
 
+import com.twilio.guardrail.circe.CirceVersion
 import com.twilio.guardrail.languages.ScalaLanguage
 import cats.~>
 
@@ -11,7 +12,7 @@ import ScalaGenerator._
 import AkkaHttpGenerator._
 
 object AkkaHttp extends (CodegenApplication[ScalaLanguage, ?] ~> Target) {
-  val interpDefinitionPM: DefinitionPM[ScalaLanguage, ?] ~> Target       = ProtocolSupportTermInterp or ModelProtocolTermInterp
+  val interpDefinitionPM: DefinitionPM[ScalaLanguage, ?] ~> Target       = ProtocolSupportTermInterp or new ModelProtocolTermInterp(CirceVersion.V012)
   val interpDefinitionPME: DefinitionPME[ScalaLanguage, ?] ~> Target     = EnumProtocolTermInterp or interpDefinitionPM
   val interpDefinitionPMEA: DefinitionPMEA[ScalaLanguage, ?] ~> Target   = ArrayProtocolTermInterp or interpDefinitionPME
   val interpDefinitionPMEAP: DefinitionPMEAP[ScalaLanguage, ?] ~> Target = PolyProtocolTermInterp or interpDefinitionPMEA
@@ -20,7 +21,7 @@ object AkkaHttp extends (CodegenApplication[ScalaLanguage, ?] ~> Target) {
 
   val interpFrameworkC: FrameworkC[ScalaLanguage, ?] ~> Target     = ClientTermInterp or interpModel
   val interpFrameworkCS: FrameworkCS[ScalaLanguage, ?] ~> Target   = ServerTermInterp or interpFrameworkC
-  val interpFrameworkCSF: FrameworkCSF[ScalaLanguage, ?] ~> Target = FrameworkInterp or interpFrameworkCS
+  val interpFrameworkCSF: FrameworkCSF[ScalaLanguage, ?] ~> Target = new FrameworkInterp(CirceVersion.V012) or interpFrameworkCS
 
   val interpFramework: ClientServerTerms[ScalaLanguage, ?] ~> Target = interpFrameworkCSF
 

diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/generators/AkkaHttpGenerator.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/generators/AkkaHttpGenerator.scala
@@ -9,7 +9,7 @@ import scala.meta._
 import com.twilio.guardrail.languages.ScalaLanguage
 
 object AkkaHttpGenerator {
-  class FrameworkInterp(circeVersion: CirceVersion = CirceVersion.V011) extends FunctionK[FrameworkTerm[ScalaLanguage, ?], Target] {
+  class FrameworkInterp(circeVersion: CirceVersion) extends FunctionK[FrameworkTerm[ScalaLanguage, ?], Target] {
     def apply[T](term: FrameworkTerm[ScalaLanguage, T]): Target[T] = term match {
       case FileType(format)   => Target.pure(format.fold[Type](t"BodyPartEntity")(Type.Name(_)))
       case ObjectType(format) => Target.pure(t"io.circe.Json")

diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/generators/Endpoints.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/generators/Endpoints.scala
@@ -1,6 +1,7 @@
 package com.twilio.guardrail
 package generators
 
+import com.twilio.guardrail.circe.CirceVersion
 import com.twilio.guardrail.languages.ScalaLanguage
 import cats.~>
 
@@ -11,7 +12,7 @@ import ScalaGenerator._
 import EndpointsGenerator._
 
 object Endpoints extends (CodegenApplication[ScalaLanguage, ?] ~> Target) {
-  val interpDefinitionPM: DefinitionPM[ScalaLanguage, ?] ~> Target       = ProtocolSupportTermInterp or ModelProtocolTermInterp
+  val interpDefinitionPM: DefinitionPM[ScalaLanguage, ?] ~> Target       = ProtocolSupportTermInterp or new ModelProtocolTermInterp(CirceVersion.V012)
   val interpDefinitionPME: DefinitionPME[ScalaLanguage, ?] ~> Target     = EnumProtocolTermInterp or interpDefinitionPM
   val interpDefinitionPMEA: DefinitionPMEA[ScalaLanguage, ?] ~> Target   = ArrayProtocolTermInterp or interpDefinitionPME
   val interpDefinitionPMEAP: DefinitionPMEAP[ScalaLanguage, ?] ~> Target = PolyProtocolTermInterp or interpDefinitionPMEA

diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/generators/Http4s.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/generators/Http4s.scala
@@ -1,6 +1,7 @@
 package com.twilio.guardrail
 package generators
 
+import com.twilio.guardrail.circe.CirceVersion
 import com.twilio.guardrail.languages.ScalaLanguage
 import cats.~>
 
@@ -11,7 +12,7 @@ import CirceProtocolGenerator._
 import ScalaGenerator._
 
 object Http4s extends (CodegenApplication[ScalaLanguage, ?] ~> Target) {
-  val interpDefinitionPM: DefinitionPM[ScalaLanguage, ?] ~> Target       = ProtocolSupportTermInterp or ModelProtocolTermInterp
+  val interpDefinitionPM: DefinitionPM[ScalaLanguage, ?] ~> Target       = ProtocolSupportTermInterp or new ModelProtocolTermInterp(CirceVersion.V012)
   val interpDefinitionPME: DefinitionPME[ScalaLanguage, ?] ~> Target     = EnumProtocolTermInterp or interpDefinitionPM
   val interpDefinitionPMEA: DefinitionPMEA[ScalaLanguage, ?] ~> Target   = ArrayProtocolTermInterp or interpDefinitionPME
   val interpDefinitionPMEAP: DefinitionPMEAP[ScalaLanguage, ?] ~> Target = PolyProtocolTermInterp or interpDefinitionPMEA

diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/generators/ScalaModule.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/generators/ScalaModule.scala
@@ -42,14 +42,20 @@ object ScalaModule extends AbstractModule[ScalaLanguage] {
     interpDefinitionPMEAP
   }
 
-  def akkaHttp(interpModel: FunctionK[ModelInterpreters[ScalaLanguage, ?], Target]): FunctionK[ClientServerTerms[ScalaLanguage, ?], Target] = {
+  def akkaHttp(
+      circeVersion: CirceVersion,
+      interpModel: FunctionK[ModelInterpreters[ScalaLanguage, ?], Target]
+  ): FunctionK[ClientServerTerms[ScalaLanguage, ?], Target] = {
     val interpFrameworkC: FunctionK[FrameworkC[ScalaLanguage, ?], Target]     = AkkaHttpClientGenerator.ClientTermInterp or interpModel
     val interpFrameworkCS: FunctionK[FrameworkCS[ScalaLanguage, ?], Target]   = AkkaHttpServerGenerator.ServerTermInterp or interpFrameworkC
-    val interpFrameworkCSF: FunctionK[FrameworkCSF[ScalaLanguage, ?], Target] = new AkkaHttpGenerator.FrameworkInterp or interpFrameworkCS
+    val interpFrameworkCSF: FunctionK[FrameworkCSF[ScalaLanguage, ?], Target] = new AkkaHttpGenerator.FrameworkInterp(circeVersion) or interpFrameworkCS
     interpFrameworkCSF
   }
 
-  def endpoints(interpModel: FunctionK[ModelInterpreters[ScalaLanguage, ?], Target]): FunctionK[ClientServerTerms[ScalaLanguage, ?], Target] = {
+  def endpoints(
+      circeVersion: CirceVersion,
+      interpModel: FunctionK[ModelInterpreters[ScalaLanguage, ?], Target]
+  ): FunctionK[ClientServerTerms[ScalaLanguage, ?], Target] = {
     val interpFrameworkC: FunctionK[FrameworkC[ScalaLanguage, ?], Target]     = EndpointsClientGenerator.ClientTermInterp or interpModel
     val interpFrameworkCS: FunctionK[FrameworkCS[ScalaLanguage, ?], Target]   = EndpointsServerGenerator.ServerTermInterp or interpFrameworkC
     val interpFrameworkCSF: FunctionK[FrameworkCSF[ScalaLanguage, ?], Target] = EndpointsGenerator.FrameworkInterp or interpFrameworkCS
@@ -65,17 +71,17 @@ object ScalaModule extends AbstractModule[ScalaLanguage] {
 
   def extract(modules: NonEmptyList[String]): CoreTarget[FunctionK[CodegenApplication[ScalaLanguage, ?], Target]] =
     (for {
-      protocolGenerator <- popModule(
+      (circeVersion, protocolGenerator) <- popModule(
         "json",
-        ("circe-java8", circeJava8(CirceVersion.V011)),
-        ("circe-0.11", circe(CirceVersion.V011)),
-        ("circe-0.12", circe(CirceVersion.V012))
+        ("circe-java8", (CirceVersion.V011, circeJava8(CirceVersion.V011))),
+        ("circe-0.11", (CirceVersion.V011, circe(CirceVersion.V011))),
+        ("circe", (CirceVersion.V012, circe(CirceVersion.V012)))
       )
       interpFramework <- popModule(
         "framework",
-        ("akka-http", akkaHttp(protocolGenerator)),
+        ("akka-http", akkaHttp(circeVersion, protocolGenerator)),
         ("http4s", http4s(protocolGenerator)),
-        ("endpoints", endpoints(protocolGenerator))
+        ("endpoints", endpoints(circeVersion, protocolGenerator))
       )
       parser             = SwaggerGenerator[ScalaLanguage] or interpFramework
       codegenApplication = ScalaGenerator.ScalaInterp or parser