[Scala] enhancement to indention and null check (#3775)

* fix scala api null check and indention * minor format fix
2016-09-13 09:56:06 +08:00
parent 153397e799
commit 907db0dd5b
4 changed files with 129 additions and 176 deletions
--- a/modules/swagger-codegen/src/main/resources/scala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/api.mustache
@@ -33,14 +33,11 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
   */
  def {{operationId}}({{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{#defaultValue}} /* = {{{defaultValue}}}*/{{/defaultValue}}{{/required}}{{^required}}Option[{{dataType}}]{{#defaultValue}} /* = {{{defaultValue}}}*/{{/defaultValue}}{{^defaultValue}} = None{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}: Option[{{returnType}}]{{/returnType}} = {
    // create path and map variables
-    val path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}",apiInvoker.escape({{paramName}}))
+    val path = "{{path}}".replaceAll("\\{format\\}", "json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}",apiInvoker.escape({{paramName}})){{/pathParams}}

-    {{/pathParams}}
-
-    val contentTypes = List({{#consumes}}"{{{mediaType}}}", {{/consumes}}"application/json")
+    val contentTypes = List({{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}"application/json"{{/consumes}})
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -51,11 +48,15 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
    if ({{paramName}} == null) throw new Exception("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}")

    {{/isPrimitiveType}}
+    {{#isString}}
+    if ({{paramName}} == null) throw new Exception("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}")
+
+    {{/isString}}
    {{/required}}
    {{/allParams}}
    {{#queryParams}}
    {{#required}}
-    if(String.valueOf({{paramName}}) != "null") queryParams += "{{baseName}}" -> {{paramName}}.toString
+    queryParams += "{{baseName}}" -> {{paramName}}.toString
    {{/required}}
    {{^required}}
    {{paramName}}.map(paramVal => queryParams += "{{baseName}}" -> paramVal.toString)
@@ -73,16 +74,18 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",

    var postBody: AnyRef = {{#bodyParam}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}.map(paramVal => paramVal){{/required}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      {{#formParams}}{{#notFile}}
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
+      {{#formParams}}
+      {{#notFile}}
      {{#required}}
-      mp.field("{{baseName}}", {{paramName}}.toString(), MediaType.MULTIPART_FORM_DATA_TYPE)
+      mp.field("{{baseName}}", {{paramName}}.toString, MediaType.MULTIPART_FORM_DATA_TYPE)
      {{/required}}
      {{^required}}
      {{paramName}}.map(paramVal => mp.field("{{baseName}}", paramVal.toString, MediaType.MULTIPART_FORM_DATA_TYPE))
      {{/required}}
-      {{/notFile}}{{#isFile}}
+      {{/notFile}}
+      {{#isFile}}
      {{#required}}
      mp.field("{{baseName}}", file.getName)
      mp.bodyPart(new FileDataBodyPart("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE))
@@ -91,14 +94,14 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
      file.map(fileVal => mp.field("{{baseName}}", fileVal.getName))
      {{paramName}}.map(paramVal => mp.bodyPart(new FileDataBodyPart("{{baseName}}", paramVal, MediaType.MULTIPART_FORM_DATA_TYPE)))
      {{/required}}
-      {{/isFile}}{{/formParams}}
+      {{/isFile}}
+      {{/formParams}}
      postBody = mp
-    }
-    else {
+    } else {
      {{#formParams}}
      {{#notFile}}
      {{#required}}
-      formParams += "{{baseName}}" -> {{paramName}}.toString()
+      formParams += "{{baseName}}" -> {{paramName}}.toString
      {{/required}}
      {{^required}}
      {{paramName}}.map(paramVal => formParams += "{{baseName}}" -> paramVal.toString)
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -55,11 +55,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def addPet(body: Pet) = {
    // create path and map variables
-    val path = "/pet".replaceAll("\\{format\\}","json")
-    val contentTypes = List("application/json", "application/xml", "application/json")
+    val path = "/pet".replaceAll("\\{format\\}", "json")
+
+    val contentTypes = List("application/json", "application/xml")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -70,12 +70,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = body

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -98,13 +96,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def deletePet(petId: Long, apiKey: Option[String] = None) = {
    // create path and map variables
-    val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
-
+    val path = "/pet/{petId}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))

    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -114,12 +110,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -141,28 +135,26 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def findPetsByStatus(status: List[String]): Option[List[Pet]] = {
    // create path and map variables
-    val path = "/pet/findByStatus".replaceAll("\\{format\\}","json")
+    val path = "/pet/findByStatus".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]

    if (status == null) throw new Exception("Missing required parameter 'status' when calling PetApi->findPetsByStatus")

-    if(String.valueOf(status) != "null") queryParams += "status" -> status.toString
+    queryParams += "status" -> status.toString
    

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -185,28 +177,26 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def findPetsByTags(tags: List[String]): Option[List[Pet]] = {
    // create path and map variables
-    val path = "/pet/findByTags".replaceAll("\\{format\\}","json")
+    val path = "/pet/findByTags".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]

    if (tags == null) throw new Exception("Missing required parameter 'tags' when calling PetApi->findPetsByTags")

-    if(String.valueOf(tags) != "null") queryParams += "tags" -> tags.toString
+    queryParams += "tags" -> tags.toString
    

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -229,13 +219,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def getPetById(petId: Long): Option[Pet] = {
    // create path and map variables
-    val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
-
+    val path = "/pet/{petId}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))

    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -244,12 +232,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -272,11 +258,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def updatePet(body: Pet) = {
    // create path and map variables
-    val path = "/pet".replaceAll("\\{format\\}","json")
-    val contentTypes = List("application/json", "application/xml", "application/json")
+    val path = "/pet".replaceAll("\\{format\\}", "json")
+
+    val contentTypes = List("application/json", "application/xml")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -287,12 +273,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = body

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -316,13 +300,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def updatePetWithForm(petId: Long, name: Option[String] = None, status: Option[String] = None) = {
    // create path and map variables
-    val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
+    val path = "/pet/{petId}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))

-
-    val contentTypes = List("application/x-www-form-urlencoded", "application/json")
+    val contentTypes = List("application/x-www-form-urlencoded")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -331,16 +313,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      name.map(paramVal => mp.field("name", paramVal.toString, MediaType.MULTIPART_FORM_DATA_TYPE))
-      
      status.map(paramVal => mp.field("status", paramVal.toString, MediaType.MULTIPART_FORM_DATA_TYPE))
-      
      postBody = mp
-    }
-    else {
+    } else {
      name.map(paramVal => formParams += "name" -> paramVal.toString)
      status.map(paramVal => formParams += "status" -> paramVal.toString)
    }
@@ -366,13 +344,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def uploadFile(petId: Long, additionalMetadata: Option[String] = None, file: Option[File] = None): Option[ApiResponse] = {
    // create path and map variables
-    val path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
+    val path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))

-
-    val contentTypes = List("multipart/form-data", "application/json")
+    val contentTypes = List("multipart/form-data")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -381,17 +357,13 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      additionalMetadata.map(paramVal => mp.field("additionalMetadata", paramVal.toString, MediaType.MULTIPART_FORM_DATA_TYPE))
-      
      file.map(fileVal => mp.field("file", fileVal.getName))
      file.map(paramVal => mp.bodyPart(new FileDataBodyPart("file", paramVal, MediaType.MULTIPART_FORM_DATA_TYPE)))
-      
      postBody = mp
-    }
-    else {
+    } else {
      additionalMetadata.map(paramVal => formParams += "additionalMetadata" -> paramVal.toString)
    }

--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -53,27 +53,25 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def deleteOrder(orderId: String) = {
    // create path and map variables
-    val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
-
+    val path = "/store/order/{orderId}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))

    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]

+    if (orderId == null) throw new Exception("Missing required parameter 'orderId' when calling StoreApi->deleteOrder")
+
    

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -94,11 +92,11 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def getInventory(): Option[Map[String, Integer]] = {
    // create path and map variables
-    val path = "/store/inventory".replaceAll("\\{format\\}","json")
+    val path = "/store/inventory".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -107,12 +105,10 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -135,13 +131,11 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def getOrderById(orderId: Long): Option[Order] = {
    // create path and map variables
-    val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
-
+    val path = "/store/order/{orderId}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))

    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -150,12 +144,10 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -178,11 +170,11 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def placeOrder(body: Order): Option[Order] = {
    // create path and map variables
-    val path = "/store/order".replaceAll("\\{format\\}","json")
+    val path = "/store/order".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -193,12 +185,10 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = body

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -53,11 +53,11 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def createUser(body: User) = {
    // create path and map variables
-    val path = "/user".replaceAll("\\{format\\}","json")
+    val path = "/user".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -68,12 +68,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = body

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -95,11 +93,11 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def createUsersWithArrayInput(body: List[User]) = {
    // create path and map variables
-    val path = "/user/createWithArray".replaceAll("\\{format\\}","json")
+    val path = "/user/createWithArray".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -110,12 +108,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = body

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -137,11 +133,11 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def createUsersWithListInput(body: List[User]) = {
    // create path and map variables
-    val path = "/user/createWithList".replaceAll("\\{format\\}","json")
+    val path = "/user/createWithList".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -152,12 +148,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = body

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -179,27 +173,25 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def deleteUser(username: String) = {
    // create path and map variables
-    val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
-
+    val path = "/user/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))

    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]

+    if (username == null) throw new Exception("Missing required parameter 'username' when calling UserApi->deleteUser")
+
    

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -221,27 +213,25 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def getUserByName(username: String): Option[User] = {
    // create path and map variables
-    val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
-
+    val path = "/user/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))

    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]

+    if (username == null) throw new Exception("Missing required parameter 'username' when calling UserApi->getUserByName")
+
    

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -265,27 +255,29 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def loginUser(username: String, password: String): Option[String] = {
    // create path and map variables
-    val path = "/user/login".replaceAll("\\{format\\}","json")
+    val path = "/user/login".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]

-    if(String.valueOf(username) != "null") queryParams += "username" -> username.toString
-    if(String.valueOf(password) != "null") queryParams += "password" -> password.toString
+    if (username == null) throw new Exception("Missing required parameter 'username' when calling UserApi->loginUser")
+
+    if (password == null) throw new Exception("Missing required parameter 'password' when calling UserApi->loginUser")
+
+    queryParams += "username" -> username.toString
+    queryParams += "password" -> password.toString
    

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -307,11 +299,11 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def logoutUser() = {
    // create path and map variables
-    val path = "/user/logout".replaceAll("\\{format\\}","json")
+    val path = "/user/logout".replaceAll("\\{format\\}", "json")
+
    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]
@@ -320,12 +312,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",

    var postBody: AnyRef = null

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {
@@ -348,29 +338,27 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   */
  def updateUser(username: String, body: User) = {
    // create path and map variables
-    val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
-
+    val path = "/user/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))

    val contentTypes = List("application/json")
    val contentType = contentTypes(0)

-    // query params
    val queryParams = new HashMap[String, String]
    val headerParams = new HashMap[String, String]
    val formParams = new HashMap[String, String]

+    if (username == null) throw new Exception("Missing required parameter 'username' when calling UserApi->updateUser")
+
    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->updateUser")

    

    var postBody: AnyRef = body

-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
+    if (contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart
      postBody = mp
-    }
-    else {
+    } else {
    }

    try {