Merge remote-tracking branch 'origin/master' into 6.0.x

samples/server/petstore/kotlin/vertx/.openapi-generator/FILES

@@ -1,7 +1,7 @@
 README.md
 pom.xml
-src/main/kotlin/org/openapitools/server/api/model/ApiResponse.kt
 src/main/kotlin/org/openapitools/server/api/model/Category.kt
+src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt
 src/main/kotlin/org/openapitools/server/api/model/Order.kt
 src/main/kotlin/org/openapitools/server/api/model/Pet.kt
 src/main/kotlin/org/openapitools/server/api/model/Tag.kt

samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION

@@ -1 +1 @@
-5.0.1-SNAPSHOT
+6.0.0-SNAPSHOT

samples/server/petstore/kotlin/vertx/README.md

@@ -51,8 +51,8 @@ This runs all tests and packages the library.
     <a name="documentation-for-models"></a>
     ## Documentation for Models
 
-         - [org.openapitools.server.api.model.ApiResponse](docs/ApiResponse.md)
          - [org.openapitools.server.api.model.Category](docs/Category.md)
+         - [org.openapitools.server.api.model.ModelApiResponse](docs/ModelApiResponse.md)
          - [org.openapitools.server.api.model.Order](docs/Order.md)
          - [org.openapitools.server.api.model.Pet](docs/Pet.md)
          - [org.openapitools.server.api.model.Tag](docs/Tag.md)

samples/server/petstore/kotlin/vertx/pom.xml

@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-kotlin-vertx-server</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-  
+
       <name>OpenAPI Petstore</name>
-      
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>

samples/server/petstore/kotlin/vertx/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt

@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonInclude
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-data class ApiResponse (
+data class ModelApiResponse (
     var code: kotlin.Int? = null,
     var type: kotlin.String? = null,
     var message: kotlin.String? = null

samples/server/petstore/kotlin/vertx/src/main/kotlin/org/openapitools/server/api/model/Order.kt

@@ -34,7 +34,7 @@ data class Order (
     var shipDate: java.time.OffsetDateTime? = null,
     /* Order Status */
     var status: Order.Status? = null,
-    var complete: kotlin.Boolean? = null
+    var complete: kotlin.Boolean? = false
 ) {
 
     /**

samples/server/petstore/kotlin/vertx/src/main/kotlin/org/openapitools/server/api/verticle/PetApi.kt

@@ -1,6 +1,6 @@
 package org.openapitools.server.api.verticle
 
-import org.openapitools.server.api.model.ApiResponse
+import org.openapitools.server.api.model.ModelApiResponse
 import org.openapitools.server.api.model.Pet
 import io.vertx.core.Vertx
 import io.vertx.core.json.JsonObject
@@ -41,7 +41,7 @@ interface PetApi  {
     suspend fun updatePetWithForm(petId:kotlin.Long?,name:kotlin.String?,status:kotlin.String?,context:OperationRequest):Response<Void>
     /* uploadFile
      * uploads an image */
-    suspend fun uploadFile(petId:kotlin.Long?,additionalMetadata:kotlin.String?,file:kotlin.collections.List<java.io.File>?,context:OperationRequest):Response<ApiResponse>
+    suspend fun uploadFile(petId:kotlin.Long?,additionalMetadata:kotlin.String?,file:kotlin.collections.List<java.io.File>?,context:OperationRequest):Response<ModelApiResponse>
     companion object {
         const val address = "PetApi-service"
         suspend fun createRouterFactory(vertx: Vertx,path:String): io.vertx.ext.web.api.contract.openapi3.OpenAPI3RouterFactory {

samples/server/petstore/kotlin/vertx/src/main/kotlin/org/openapitools/server/api/verticle/PetApiVertxProxyHandler.kt

@@ -16,7 +16,7 @@ import io.vertx.core.json.Json
 import io.vertx.core.json.JsonArray
 import com.google.gson.reflect.TypeToken
 import com.google.gson.Gson
-import org.openapitools.server.api.model.ApiResponse
+import org.openapitools.server.api.model.ModelApiResponse
 import org.openapitools.server.api.model.Pet
 
 class PetApiVertxProxyHandler(private val vertx: Vertx, private val service: PetApi, topLevel: Boolean, private val timeoutSeconds: Long) : ProxyHandler() {