fix openapi generation

varshith257 · Aug 2, 2024 · 027edbd · 027edbd
1 parent 88225f9
commit 027edbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/zio-http/jvm/src/test/scala/zio/http/endpoint/openapi/OpenAPIGenSpec.scala b/zio-http/jvm/src/test/scala/zio/http/endpoint/openapi/OpenAPIGenSpec.scala
@@ -2460,21 +2460,15 @@ object OpenAPIGenSpec extends ZIOSpecDefault {
         SwaggerUI.routes("docs/openapi", OpenAPIGen.fromEndpoints(endpoint))
         assertCompletes
       },
-      // test("Ensure OpenAPI generation succeeds for Map[String, List[String]]") {
-      //   val schema        = Schema.map[String, List[String]]
-      //   val openAPISchema = JsonSchema.fromZSchemaMulti(schema, SchemaStyle.Reference)
-      //   assertTrue(openAPISchema != null)
-      // },
+      test("Ensure OpenAPI generation succeeds for Map[String, List[String]]") {
+        val schema        = Schema.map[String, List[String]]
+        val openAPISchema = JsonSchema.fromZSchemaMulti(schema, SchemaStyle.Reference)
+        assertTrue(openAPISchema != null)
+      },
       test("Failing test case for Map[String, List[String]] schema generation") {
         val schema = Schema.map[String, List[String]]
-        val result =
-          try {
-            JsonSchema.fromZSchemaMulti(schema, SchemaStyle.Reference)
-            true
-          } catch {
-            case _: NoSuchElementException => false
-          }
-        assertTrue(result == false)
+        val result = scala.util.Try(JsonSchema.fromZSchemaMulti(schema, SchemaStyle.Reference))
+        assertTrue(result.isFailure)
       },
       test("Recursive schema") {
         val endpoint     = Endpoint(RoutePattern.POST / "folder")

diff --git a/zio-http/shared/src/main/scala/zio/http/endpoint/openapi/JsonSchema.scala b/zio-http/shared/src/main/scala/zio/http/endpoint/openapi/JsonSchema.scala
@@ -387,7 +387,7 @@ object JsonSchema {
                     Chunk.empty,
                   ),
                   ref,
-                  nested.children + (nested.rootRef.get -> nested.root),
+                  nested.children ++ (nested.rootRef.map(_ -> nested.root)),
                 )
               }
             case Schema.Set(elementSchema, _)               =>