Resolving structural issues with scalameta

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

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/circe/CirceVersion.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/circe/CirceVersion.scala
@@ -1,16 +1,18 @@
 package com.twilio.guardrail.circe
 
+import scala.meta._
+
 sealed trait CirceVersion {
-  def encoderObject: String
-  def print: String
+  def encoderObject: Type
+  def print: Term.Name
 }
 object CirceVersion {
   case object V011 extends CirceVersion {
-    def encoderObject = "ObjectEncoder"
-    def print         = "pretty"
+    def encoderObject = t"ObjectEncoder"
+    def print         = q"pretty"
   }
   case object V012 extends CirceVersion {
-    def encoderObject = "Encoder.AsObject"
-    def print         = "print"
+    def encoderObject = t"Encoder.AsObject"
+    def print         = q"print"
   }
 }
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
@@ -75,7 +75,7 @@ object AkkaHttpGenerator {
                 implicit printer: Printer = Printer.noSpaces
             ): ToEntityMarshaller[${jsonType}] =
               Marshaller.withFixedContentType(MediaTypes.`application/json`) { json =>
-                HttpEntity(MediaTypes.`application/json`, printer.${circeVersion.print}(json))
+                HttpEntity(MediaTypes.`application/json`, ${Term.Select(q"printer", circeVersion.print)}(json))
               }
 
             // Translate [A: Encoder] => HttpEntity

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
@@ -252,9 +252,8 @@ object CirceProtocolGenerator {
               .to[List]
             Option(
               q"""
-              new ${circeVersion.encoderObject}[${Type.Name(clsName)}] {
-                final def encodeObject(a: ${Type
-                .Name(clsName)}): JsonObject = JsonObject.fromIterable(Vector(..${pairs}))
+              new ${Init(Type.Apply(circeVersion.encoderObject, List(Type.Name(clsName))), Name.Anonymous(), List.empty)} {
+                final def encodeObject(a: ${Type.Name(clsName)}): JsonObject = JsonObject.fromIterable(Vector(..${pairs}))
               }
             """
             )