slightly tidier

jchyb · Jul 24, 2023 · a2b5897 · a2b5897
1 parent 97a8d3c
commit a2b5897
Showing 1 changed file with 6 additions and 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
@@ -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)
     }
   }