fix: pass Option[String] directly to .header

Author: plaflamme

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

@@ -226,6 +226,16 @@ public ModelsMap postProcessModels(ModelsMap objs) {
         return objs;
     }
 
+    private void setParameterDefaults(CodegenParameter param) {
+        // Set default values for optional parameters
+        // Template will handle Option[] wrapping, so all defaults should be None
+        if (!param.required) {
+            param.defaultValue = "None";
+        }
+    }
+
+
+
     /**
      * Invoked by {@link DefaultGenerator} after all models have been post-processed,
      * allowing for a last pass of codegen-specific model cleanup.
@@ -445,6 +455,14 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
         }
         objs.setImports(newImports);
 
+        // Fix parameter types and defaults
+        OperationMap opsMap = objs.getOperations();
+        for (CodegenOperation operation : opsMap.getOperation()) {
+            for (CodegenParameter param : operation.allParams) {
+                setParameterDefaults(param);
+            }
+        }
+
         return super.postProcessOperationsWithModels(objs, allModels);
     }
 
@@ -498,11 +516,11 @@ public String toDefaultValue(Schema p) {
             String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return "Map[String, " + inner + "].empty ";
         } else if (ModelUtils.isArraySchema(p)) {
-            String inner = getSchemaType(ModelUtils.getSchemaItems(p));
+            // Use simple Seq.empty for cleaner code
             if (ModelUtils.isSet(p)) {
-                return "Set[" + inner + "].empty ";
+                return "Set.empty";
             }
-            return "Seq[" + inner + "].empty ";
+            return "Seq.empty";
         } else if (ModelUtils.isStringSchema(p)) {
             return null;
         } else {

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

@@ -1 +1 @@
-{{#authMethods.0}}{{#authMethods}}{{#isApiKey}}{{#isKeyInHeader}}apiKeyHeader: String{{/isKeyInHeader}}{{#isKeyInQuery}}apiKeyQuery: String{{/isKeyInQuery}}{{#isKeyInCookie}}apiKeyCookie: String{{/isKeyInCookie}}{{/isApiKey}}{{#isBasic}}{{#isBasicBasic}}username: String, password: String{{/isBasicBasic}}{{#isBasicBearer}}bearerToken: String{{/isBasicBearer}}{{/isBasic}}{{^-last}}, {{/-last}}{{/authMethods}})({{/authMethods.0}}{{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{/required}}{{^required}}{{#isContainer}}{{dataType}}{{/isContainer}}{{^isContainer}}Option[{{dataType}}]{{/isContainer}}{{/required}}{{^defaultValue}}{{^required}}{{^isContainer}} = None{{/isContainer}}{{/required}}{{/defaultValue}}{{^-last}}, {{/-last}}{{/allParams}}
+{{#authMethods.0}}{{#authMethods}}{{#isApiKey}}{{#isKeyInHeader}}apiKeyHeader: String{{/isKeyInHeader}}{{#isKeyInQuery}}apiKeyQuery: String{{/isKeyInQuery}}{{#isKeyInCookie}}apiKeyCookie: String{{/isKeyInCookie}}{{/isApiKey}}{{#isBasic}}{{#isBasicBasic}}username: String, password: String{{/isBasicBasic}}{{#isBasicBearer}}bearerToken: String{{/isBasicBearer}}{{/isBasic}}{{^-last}}, {{/-last}}{{/authMethods}})({{/authMethods.0}}{{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{/required}}{{^required}}Option[{{dataType}}]{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{^-last}}, {{/-last}}{{/allParams}}

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

@@ -1 +1 @@
-"{{baseName}}", {{#isContainer}}{{{paramName}}}.mkString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{/isContainer}}.toString
+"{{baseName}}", {{#isContainer}}{{#required}}{{{paramName}}}.mkString(","){{/required}}{{^required}}{{{paramName}}}.filter(_.nonEmpty).map(_.mkString(",")){{/required}}{{/isContainer}}{{^isContainer}}{{#required}}{{{paramName}}}.toString{{/required}}{{^required}}{{{paramName}}}{{/required}}{{/isContainer}}