Clarifying that these are not actually conditional return values

zettelmj · Oct 24, 2022 · c80415a · c80415a
1 parent b2a2841
commit c80415a
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/...-support/src/main/scala/dev/guardrail/generators/scala/circe/CirceProtocolGenerator.scala b/...-support/src/main/scala/dev/guardrail/generators/scala/circe/CirceProtocolGenerator.scala
@@ -334,11 +334,9 @@ class CirceProtocolGenerator private (circeVersion: CirceModelGenerator, applyVa
         q"$acc ++ $field"
       }
 
-      Option(
-        q"""
+      q"""
               ${circeVersion.encoderObjectCompanion}.instance[${Type.Name(clsName)}](a => _root_.io.circe.JsonObject.fromIterable($allFields))
             """
-      )
     }
     val (readOnlyDefn, readOnlyFilter) = NonEmptyList.fromList(readOnlyKeys).fold((List.empty[Stat], identity[Term] _)) { roKeys =>
       (
@@ -347,7 +345,7 @@ class CirceProtocolGenerator private (circeVersion: CirceModelGenerator, applyVa
       )
     }
 
-    Target.pure(encVal.map(encVal => q"""
+    Target.pure(Option(q"""
           implicit val ${suffixClsName("encode", clsName)}: ${circeVersion.encoderObject}[${Type.Name(clsName)}] = {
             ..${readOnlyDefn};
             ${readOnlyFilter(encVal)}
@@ -373,14 +371,12 @@ class CirceProtocolGenerator private (circeVersion: CirceModelGenerator, applyVa
       decVal <-
         if (paramCount == 0) {
           Target.pure(
-            Option[Term](
-              q"""
+            q"""
                  new _root_.io.circe.Decoder[${Type.Name(clsName)}] {
                     final def apply(c: _root_.io.circe.HCursor): _root_.io.circe.Decoder.Result[${Type.Name(clsName)}] =
                       _root_.scala.Right(${Term.Name(clsName)}())
                   }
                 """
-            )
           )
         } else {
           params.zipWithIndex
@@ -452,19 +448,17 @@ class CirceProtocolGenerator private (circeVersion: CirceModelGenerator, applyVa
             }
             .map { pairs =>
               val (terms, enumerators) = pairs.unzip
-              Option(
-                q"""
+              q"""
                   new _root_.io.circe.Decoder[${Type.Name(clsName)}] {
                     final def apply(c: _root_.io.circe.HCursor): _root_.io.circe.Decoder.Result[${Type.Name(clsName)}] =
                       for {
                         ..${enumerators}
                       } yield ${Term.Name(clsName)}(..${terms})
                   }
                 """
-              )
             }
         }
-    } yield decVal.map(decVal => q"""
+    } yield Option(q"""
             implicit val ${suffixClsName("decode", clsName)}: _root_.io.circe.Decoder[${Type.Name(clsName)}] = $decVal
           """)
   }