Merge pull request #4 from ChetanBhasin/drop-null-values

Drop Null Values In Json Outputs To HTTP Requests

Author: ChetanBhasin

openapi-http4s-lib/src/main/scala/com/enfore/apis/http4s/ErrorHandler.scala

@@ -50,28 +50,28 @@ class ErrorHandlerImplementation(convertThrowableToServiceExceptionFn: Throwable
     err match {
       case e: ServiceError =>
         logger.error("ServiceError", err)
-        InternalServerError(e.asJson)
+        InternalServerError(e.asJson.dropNullValues)
       case e: ItemAlreadyExists =>
         logger.info("ItemAlreadyExists", err)
-        Conflict(e.asJson)
+        Conflict(e.asJson.dropNullValues)
       case e: ServiceObjectLocked =>
         logger.info("ObjectLocked", err)
-        Locked(e.asJson)
+        Locked(e.asJson.dropNullValues)
       case e: ItemDoesNotExist =>
         logger.info("ItemDoesNotExist", err)
-        NotFound(e.asJson)
+        NotFound(e.asJson.dropNullValues)
       case e: RequestConflict =>
         logger.warn("RequestConflict", err)
-        Conflict(e.asJson)
+        Conflict(e.asJson.dropNullValues)
       case e: PermissionRequired =>
         logger.info("PermissionRequired", err)
-        Forbidden(e.asJson)
+        Forbidden(e.asJson.dropNullValues)
       case e: WrongRequestContent =>
         logger.info("WrongRequestContent", err)
-        BadRequest(e.asJson)
+        BadRequest(e.asJson.dropNullValues)
       case e: UnprocessableContent =>
         logger.info("UnprocessableContent", err)
-        UnprocessableEntity(e.asJson)
+        UnprocessableEntity(e.asJson.dropNullValues)
     }
 
 }

openapi-scala/src/main/scala/com/enfore/apis/generator/ScalaGenerator.scala

@@ -196,7 +196,7 @@ object ScalaGenerator {
       .map(_.typeName)
       .map(
         member =>
-          s"""implicit def case${member} = at[$member](_.asJson.deepMerge(Json.obj("$discriminator" -> Json.fromString("$member"))))"""
+          s"""implicit def case${member} = at[$member](_.asJson.dropNullValues.deepMerge(Json.obj("$discriminator" -> Json.fromString("$member"))))"""
       )
       .mkString(s"\n$margin")
 

openapi-scala/src/main/scala/com/enfore/apis/generator/http4s/RouteGenerator.scala

@@ -315,7 +315,7 @@ object RouteGenerator {
     if (response.isEmpty) {
       s"(_: ${firstResponseType(response)}) => EmptyGenerator($status)()"
     } else {
-      s"(x: ${firstResponseType(response)}) => EntityGenerator($status)(x.asJson)"
+      s"(x: ${firstResponseType(response)}) => EntityGenerator($status)(x.asJson.dropNullValues)"
     }
 
   private def getResponseStatus(route: RouteDefinition): String =

openapi-scala/src/test/scala/com/enfore/apis/generator/ComponentsTypeReprSpec.scala

@@ -425,8 +425,8 @@ class ComponentsTypeReprSpec extends AnyFlatSpec with Matchers {
         | type Union = IndividualCustomer :+: OrganizationCustomer :+: CNil
         |
         | object jsonConversions extends Poly1 {
-        |   implicit def caseIndividualCustomer = at[IndividualCustomer](_.asJson.deepMerge(Json.obj("@type" -> Json.fromString("IndividualCustomer"))))
-        |   implicit def caseOrganizationCustomer = at[OrganizationCustomer](_.asJson.deepMerge(Json.obj("@type" -> Json.fromString("OrganizationCustomer"))))
+        |   implicit def caseIndividualCustomer = at[IndividualCustomer](_.asJson.dropNullValues.deepMerge(Json.obj("@type" -> Json.fromString("IndividualCustomer"))))
+        |   implicit def caseOrganizationCustomer = at[OrganizationCustomer](_.asJson.dropNullValues.deepMerge(Json.obj("@type" -> Json.fromString("OrganizationCustomer"))))
         | }
         |
         | implicit val customEncoders: Encoder[Customer] = new Encoder[Customer] {

openapi-scala/src/test/scala/com/enfore/apis/generator/http4s/Http4sGeneratorSpec.scala

@@ -89,7 +89,7 @@ class Http4sGeneratorSpec extends AnyFreeSpec with Matchers {
       |
       |    HttpRoutes.of[F] {
       |      case request @ GET -> Root / "contacts" / "individual" =>
-      |        errorHandler.resolve(impl.`dummyFunction`(request), (x: IndividualContact) => EntityGenerator(200)(x.asJson))
+      |        errorHandler.resolve(impl.`dummyFunction`(request), (x: IndividualContact) => EntityGenerator(200)(x.asJson.dropNullValues))
       |    }
       |  }
       |}