From a2b5897a739944d8e58a67b3f114998cb777a66d Mon Sep 17 00:00:00 2001 From: Hugh Simpson Date: Mon, 24 Jul 2023 08:20:02 +0100 Subject: [PATCH] slightly tidier --- .../scala/sttp/tapir/codegen/EndpointGenerator.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/EndpointGenerator.scala b/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/EndpointGenerator.scala index 36aaa2cbfa..32c0bd5c1c 100644 --- a/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/EndpointGenerator.scala +++ b/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/EndpointGenerator.scala @@ -26,7 +26,6 @@ class EndpointGenerator { |""".stripMargin } - private val legalNameRegex = """([a-zA-Z$_][0-9a-zA-Z$_]*)""".r private[codegen] def generatedEndpoints(p: OpenapiPath): Seq[(String, String)] = { p.methods.map { m => val definition = @@ -39,11 +38,12 @@ class EndpointGenerator { |""".stripMargin val name = m.operationId - .getOrElse(m.methodType + p.url.split('/').map(_.replace("{", "").replace("}", "").toLowerCase.capitalize).mkString) match { - case legalNameRegex(n) => n - case n => - n.split("[^a-zA-Z$_]").filter(_.nonEmpty).zipWithIndex.map { case (part, 0) => part; case (part, _) => part.capitalize }.mkString - } + .getOrElse(m.methodType + p.url.capitalize) + .split("[^a-zA-Z0-9$_]") + .filter(_.nonEmpty) + .zipWithIndex + .map { case (part, 0) => part; case (part, _) => part.capitalize } + .mkString (name, definition) } }