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

samples/server/petstore/kotlin-server/ktor/.openapi-generator-ignore

@@ -1,3 +1,23 @@
 # OpenAPI Generator Ignore
-pom.xml
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

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

@@ -10,8 +10,8 @@ src/main/kotlin/org/openapitools/server/apis/PetApi.kt
 src/main/kotlin/org/openapitools/server/apis/StoreApi.kt
 src/main/kotlin/org/openapitools/server/apis/UserApi.kt
 src/main/kotlin/org/openapitools/server/infrastructure/ApiKeyAuth.kt
-src/main/kotlin/org/openapitools/server/models/ApiResponse.kt
 src/main/kotlin/org/openapitools/server/models/Category.kt
+src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt
 src/main/kotlin/org/openapitools/server/models/Order.kt
 src/main/kotlin/org/openapitools/server/models/Pet.kt
 src/main/kotlin/org/openapitools/server/models/Tag.kt

samples/server/petstore/kotlin-server/ktor/README.md

@@ -74,8 +74,8 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
- - [org.openapitools.server.models.ApiResponse](docs/ApiResponse.md)
  - [org.openapitools.server.models.Category](docs/Category.md)
+ - [org.openapitools.server.models.ModelApiResponse](docs/ModelApiResponse.md)
  - [org.openapitools.server.models.Order](docs/Order.md)
  - [org.openapitools.server.models.Pet](docs/Pet.md)
  - [org.openapitools.server.models.Tag](docs/Tag.md)

samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/PetApi.kt

@@ -20,7 +20,7 @@ import org.openapitools.server.Paths
 import io.ktor.locations.*
 import io.ktor.routing.*
 import org.openapitools.server.infrastructure.ApiPrincipal
-import org.openapitools.server.models.ApiResponse
+import org.openapitools.server.models.ModelApiResponse
 import org.openapitools.server.models.Pet
 
 @KtorExperimentalLocationsAPI

samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt

@@ -19,7 +19,7 @@ import java.io.Serializable
  * @param type 
  * @param message 
  */
-data class ApiResponse(
+data class ModelApiResponse(
     val code: kotlin.Int? = null,
     val type: kotlin.String? = null,
     val message: kotlin.String? = null