From b30f9201cbb26a024701c71849ab36b7ae0f0810 Mon Sep 17 00:00:00 2001 From: Pawel Iwanow <7759586+pwliwanow@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:36:33 +0200 Subject: [PATCH] Fix generating Tapir schemas for classes with more than 22 fields and that are recursive --- .../openapi/OpenApiZioSchemaToTapirConverter.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chopsticks-openapi/src/main/scala/dev/chopsticks/openapi/OpenApiZioSchemaToTapirConverter.scala b/chopsticks-openapi/src/main/scala/dev/chopsticks/openapi/OpenApiZioSchemaToTapirConverter.scala index fa2625af..df723c35 100644 --- a/chopsticks-openapi/src/main/scala/dev/chopsticks/openapi/OpenApiZioSchemaToTapirConverter.scala +++ b/chopsticks-openapi/src/main/scala/dev/chopsticks/openapi/OpenApiZioSchemaToTapirConverter.scala @@ -82,7 +82,7 @@ object OpenApiZioSchemaToTapirConverter { case Right(value) => value } } - addAnnotations(baseSchema, typedAnnotations) + addAnnotations(baseSchema, typedAnnotations, skipName = true) case ZioSchema.Tuple(_, _, _) => ??? @@ -352,10 +352,11 @@ object OpenApiZioSchemaToTapirConverter { private def addAnnotations[A]( baseSchema: TapirSchema[A], - metadata: OpenApiParsedAnnotations[A] + metadata: OpenApiParsedAnnotations[A], + skipName: Boolean = false ): TapirSchema[A] = { var result = baseSchema - if (metadata.entityName.isDefined) { + if (metadata.entityName.isDefined && !skipName) { result = baseSchema.copy(name = metadata.entityName.map(schemaName)) } if (metadata.description.isDefined) {