Do not get a null value from an option if it is empty, but rather keep the None value. If a value is present it is converted to an Option[String]

Author: Mattias-Sehlstedt

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

@@ -1 +1 @@
-"{{baseName}}", {{#isContainer}}ArrayValues({{{paramName}}}{{#collectionFormat}}, {{collectionFormat.toUpperCase}}{{/collectionFormat}}){{/isContainer}}{{^isContainer}}{{{paramName}}}{{/isContainer}}{{#required}}.toString{{/required}}{{^required}}.map(_.toString()).getOrElse(null){{/required}}
+"{{baseName}}", {{#isContainer}}ArrayValues({{{paramName}}}{{#collectionFormat}}, {{collectionFormat.toUpperCase}}{{/collectionFormat}}){{/isContainer}}{{^isContainer}}{{{paramName}}}{{/isContainer}}{{#required}}.toString{{/required}}{{^required}}.map(_.toString()){{/required}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpCodegenTest.java

@@ -139,11 +139,11 @@ public void headerSerialization() throws IOException {
         Path path = Paths.get(outputPath + "/src/main/scala/org/openapitools/client/api/DefaultApi.scala");
         assertFileContains(path, ".method(Method.GET, uri\"$baseUrl/ping\")\n");
         assertFileContains(path, "xOptionalHeader: Option[String] = None");
-        assertFileContains(path, ".header(\"X-Optional-Header\", xOptionalHeader.map(_.toString()).getOrElse(null))");
+        assertFileContains(path, ".header(\"X-Optional-Header\", xOptionalHeader.map(_.toString()))");
         assertFileContains(path, "xRequiredHeader: String");
         assertFileContains(path, ".header(\"X-Required-Header\", xRequiredHeader.toString)");
         assertFileContains(path, "xOptionalSchemaHeader: Option[UUID] = None");
-        assertFileContains(path, ".header(\"X-Optional-Schema-Header\", xOptionalSchemaHeader.map(_.toString()).getOrElse(null))");
+        assertFileContains(path, ".header(\"X-Optional-Schema-Header\", xOptionalSchemaHeader.map(_.toString()))");
         assertFileContains(path, "xRequiredSchemaHeader: UUID");
         assertFileContains(path, ".header(\"X-Required-Schema-Header\", xRequiredSchemaHeader.toString)");
     }

samples/client/petstore/scala-sttp-circe/src/main/scala/org/openapitools/client/api/PetApi.scala

@@ -55,7 +55,7 @@ class PetApi(baseUrl: String) {
     basicRequest
       .method(Method.DELETE, uri"$baseUrl/pet/${petId}")
       .contentType("application/json")
-      .header("api_key", apiKey.map(_.toString()).getOrElse(null))
+      .header("api_key", apiKey.map(_.toString()))
       .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
 
   /**

samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala

@@ -55,7 +55,7 @@ class PetApi(baseUrl: String) {
     basicRequest
       .method(Method.DELETE, uri"$baseUrl/pet/${petId}")
       .contentType("application/json")
-      .header("api_key", apiKey.map(_.toString()).getOrElse(null))
+      .header("api_key", apiKey.map(_.toString()))
       .response(asString.mapWithMetadata(ResponseAs.deserializeRightWithError(_ => Right(()))))
 
   /**