fix enums entries, multipart support(partially), header, path and cookie serialization support

Author: Kamil-Lontkowski

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttp4JsoniterClientCodegen.java

@@ -88,8 +88,6 @@ public ScalaSttp4JsoniterClientCodegen() {
                         GlobalFeature.LinkObjects)
                 .excludeSchemaSupportFeatures(
                         SchemaSupportFeature.Polymorphism)
-                .excludeParameterFeatures(
-                        ParameterFeature.Cookie)
                 .includeClientModificationFeatures(
                         ClientModificationFeature.BasePath,
                         ClientModificationFeature.UserAgent));
@@ -117,6 +115,7 @@ public ScalaSttp4JsoniterClientCodegen() {
         additionalProperties.put("fnEnumEntry", new EnumEntryLambda());
         additionalProperties.put("fnCodecName", new CodecNameLambda());
         additionalProperties.put("fnHandleDownload", new HandleDownloadLambda());
+        additionalProperties.put("fnEnumLeaf", new EnumLeafLambda());
 
         // TODO: there is no specific sttp mapping. All Scala Type mappings should be in
         // AbstractScala
@@ -192,7 +191,7 @@ public String encodePath(String input) {
         StringBuffer buf = new StringBuffer(path.length());
         Matcher matcher = Pattern.compile("[{](.*?)[}]").matcher(path);
         while (matcher.find()) {
-            matcher.appendReplacement(buf, "\\${" + toParamName(matcher.group(0)) + "}");
+            matcher.appendReplacement(buf, "\\${" + toParamName(matcher.group(0)).replace("`", "") + "PathParam}");
         }
         matcher.appendTail(buf);
         return buf.toString();
@@ -673,13 +672,23 @@ public String formatFragment(String fragment) {
         }
     }
 
-    private class EnumEntryLambda extends CustomLambda {
+    private static class EnumEntryLambda extends CustomLambda {
         @Override
         public String formatFragment(String fragment) {
             if (fragment.isBlank()) {
                 return "NotPresent";
             }
-            return formatIdentifier(fragment, true);
+            return "`" + fragment + "`";
+        }
+    }
+
+    private static class EnumLeafLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            if (fragment.isBlank()) {
+                return "NotPresent";
+            }
+            return fragment.replace("`", "");
         }
     }
 

modules/openapi-generator/src/main/resources/scala-sttp4-jsoniter/api.mustache

@@ -7,6 +7,11 @@ import {{import}}
 import {{invokerPackage}}.JsonSupport.{*, given}
 import {{invokerPackage}}.FormSerializable
 import {{invokerPackage}}.FormStyleFormat
+import {{invokerPackage}}.HeaderSerializable
+import {{invokerPackage}}.ApiKeyLocation
+import {{invokerPackage}}.PathStyleFormat
+import {{invokerPackage}}.PathSerializable
+import {{invokerPackage}}.CookieSerializable
 import {{invokerPackage}}.Helpers.*
 import sttp.client4.jsoniter.*
 import sttp.client4.*
@@ -42,15 +47,18 @@ case class {{classname}}[Auth <: {{invokerPackage}}.Authorization] private (base
 {{>javadoc}}
 {{/javadocRenderer}}
   def {{operationId}}{{>methodParameters}}: sttp.client4.Request[{{#separateErrorChannel}}Either[ResponseException[String], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}] =
+{{#pathParams}}    val {{#fnEnumLeaf}}{{paramName}}PathParam{{/fnEnumLeaf}} = PathSerializable.serialize("{{baseName}}", {{{paramName}}}{{#style}}, PathStyleFormat.{{style.toUpperCase}}{{/style}}{{^style}}, PathStyleFormat.SIMPLE{{/style}}, {{isExplode}})
+    {{/pathParams}}
     val requestURL =
       uri"$baseUrl{{{path}}}"{{#queryParams}}
         .addParams(FormSerializable.serialize("{{baseName}}", {{{paramName}}}{{#style}}, FormStyleFormat.{{style.toUpperCase}}{{/style}}{{^style}}, FormStyleFormat.FORM{{/style}}, {{isExplode}}): _*){{/queryParams}}
 
     basicRequest
       .method(Method.{{httpMethod.toUpperCase}}, requestURL)
       .contentType({{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}}){{#headerParams}}
-      .header({{>paramCreation}}){{/headerParams}}{{#authMethods}}
-      .auth(authConfig{{#isApiKey}}, {{invokerPackage}}.{{#isKeyInQuery}}QUERY{{/isKeyInQuery}}{{#isKeyInHeader}}HEADER{{/isKeyInHeader}}{{#isKeyInCookie}}COOKIE{{/isKeyInCookie}}, "{{keyParamName}}"{{/isApiKey}}){{/authMethods}}{{#formParams.0}}{{^isMultipart}}
+      .headers(HeaderSerializable.serialize("{{baseName}}", {{paramName}}, {{isExplode}})){{/headerParams}}{{#authMethods}}{{#cookieParams}}
+      .cookies(CookieSerializable.serialize("{{baseName}}", {{paramName}}, {{isExplode}})){{/cookieParams}}
+      .auth(authConfig{{#isApiKey}}, {{invokerPackage}}.ApiKeyLocation.{{#isKeyInQuery}}QUERY{{/isKeyInQuery}}{{#isKeyInHeader}}HEADER{{/isKeyInHeader}}{{#isKeyInCookie}}COOKIE{{/isKeyInCookie}}, "{{keyParamName}}"{{/isApiKey}}){{/authMethods}}{{#formParams.0}}{{^isMultipart}}
       .body({{#formParams}}
         {{>paramFormCreation}}{{^-last}} ++ {{/-last}}{{/formParams}},
         "utf-8"