updated kotlin-server sample

Author: HugoMario

samples/server/petstore/kotlin-server/ktor/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.31-SNAPSHOT

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

@@ -2,7 +2,7 @@
 
 This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 
-Generated by Swagger Codegen 2.4.3-SNAPSHOT (2019-03-06T09:14:32.633-05:00).
+Generated by Swagger Codegen 2.4.31-SNAPSHOT (2023-03-28T23:54:30.861-05:00).
 
 ## Requires
 

samples/server/petstore/kotlin-server/ktor/build.gradle

@@ -1,18 +1,20 @@
 group 'io.swagger'
 version '1.0.0'
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.3'
+wrapper {
+    gradleVersion = '7.5'
     distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
 
 buildscript {
-    ext.kotlin_version = '1.2.10'
-    ext.ktor_version = '0.9.1-alpha-9'
-    ext.shadow_version = '2.0.2'
+    ext.kotlin_version = '1.8.0'
+    ext.ktor_version = "1.5.4"
+    ext.shadow_version = "6.1.0"
 
     repositories {
-        mavenCentral()
+        maven {
+            url "https://repo1.maven.org/maven2"
+        }
         maven {
             url "https://plugins.gradle.org/m2/"
         }
@@ -29,8 +31,6 @@ apply plugin: 'application'
 
 mainClassName = "io.ktor.server.netty.DevelopmentEngine"
 
-// Initialization order with shadow 2.0.1 and Gradle 4.3 is weird.
-// See https://github.com/johnrengelman/shadow/issues/336#issuecomment-355402508
 apply plugin: 'com.github.johnrengelman.shadow'
 
 sourceCompatibility = 1.8
@@ -43,12 +43,6 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 shadowJar {
     baseName = 'kotlin-server'
     classifier = null
@@ -62,13 +56,13 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
-    compile "io.ktor:ktor-server-netty:$ktor_version"
-    compile "io.ktor:ktor-metrics:$ktor_version"
-    compile "io.ktor:ktor-locations:$ktor_version"
-    compile "io.ktor:ktor-gson:$ktor_version"
-    compile "io.ktor:ktor-client-core:$ktor_version"
-    compile "io.ktor:ktor-client-apache:$ktor_version"
-    compile "ch.qos.logback:logback-classic:1.2.9"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "io.ktor:ktor-server-netty:$ktor_version"
+    implementation "io.ktor:ktor-metrics:$ktor_version"
+    implementation "io.ktor:ktor-locations:$ktor_version"
+    implementation "io.ktor:ktor-gson:$ktor_version"
+    implementation "io.ktor:ktor-client-core:$ktor_version"
+    implementation "io.ktor:ktor-client-apache:$ktor_version"
+    implementation "ch.qos.logback:logback-classic:1.2.9"
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }

samples/server/petstore/kotlin-server/ktor/src/main/kotlin/io/swagger/server/AppMain.kt

@@ -1,30 +1,51 @@
 package io.swagger.server
 
-import com.codahale.metrics.*
+import com.codahale.metrics.Slf4jReporter
 import com.typesafe.config.ConfigFactory
-import io.ktor.application.*
+import io.ktor.application.Application
+import io.ktor.application.ApplicationStopping
+import io.ktor.application.install
+import io.ktor.application.log
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.apache.Apache
 import io.ktor.config.HoconApplicationConfig
-import io.ktor.features.*
+import io.ktor.features.AutoHeadResponse
+import io.ktor.features.Compression
+import io.ktor.features.ContentNegotiation
+import io.ktor.features.DefaultHeaders
+import io.ktor.features.HSTS
 import io.ktor.gson.GsonConverter
 import io.ktor.http.ContentType
-import io.ktor.locations.*
-import io.ktor.metrics.*
-import io.ktor.routing.*
-import java.util.concurrent.*
-import io.swagger.server.apis.*
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Locations
+import io.ktor.routing.Routing
+import java.util.concurrent.TimeUnit
+import io.ktor.util.KtorExperimentalAPI
+import io.ktor.auth.Authentication
+import io.ktor.auth.oauth
+import io.ktor.auth.basic
+import io.ktor.auth.UserIdPrincipal
+import io.ktor.metrics.dropwizard.DropwizardMetrics
+import io.swagger.server.infrastructure.ApiKeyCredential
+import io.swagger.server.infrastructure.ApiPrincipal
+import io.swagger.server.infrastructure.apiKeyAuth
+import io.swagger.server.apis.PetApi
+import io.swagger.server.apis.StoreApi
+import io.swagger.server.apis.UserApi
 
 
+@KtorExperimentalAPI
 internal val settings = HoconApplicationConfig(ConfigFactory.defaultApplication(HTTP::class.java.classLoader))
 
 object HTTP {
     val client = HttpClient(Apache)
 }
 
+@KtorExperimentalAPI
+@KtorExperimentalLocationsAPI
 fun Application.main() {
     install(DefaultHeaders)
-    install(Metrics) {
+    install(DropwizardMetrics) {
         val reporter = Slf4jReporter.forRegistry(registry)
                 .outputTo(log)
                 .convertRatesTo(TimeUnit.SECONDS)
@@ -39,14 +60,34 @@ fun Application.main() {
     install(HSTS, ApplicationHstsConfiguration()) // see http://ktor.io/features/hsts.html
     install(Compression, ApplicationCompressionConfiguration()) // see http://ktor.io/features/compression.html
     install(Locations) // see http://ktor.io/features/locations.html
+    install(Authentication) {
+        // "Implement API key auth (api_key) for parameter name 'api_key'."
+        apiKeyAuth("api_key") {
+            validate { apikeyCredential: ApiKeyCredential ->
+                when {
+                    apikeyCredential.value == "keyboardcat" -> ApiPrincipal(apikeyCredential)
+                    else -> null
+                }
+            }
+        }
+        oauth("petstore_auth") {
+            client = HttpClient(Apache)
+            providerLookup = { ApplicationAuthProviders["petstore_auth"] }
+            urlProvider = { _ ->
+            // TODO: define a callback url here.
+            "/"
+            }
+        }
+    }
     install(Routing) {
         PetApi()
         StoreApi()
         UserApi()
     }
 
+
     environment.monitor.subscribe(ApplicationStopping)
     {
         HTTP.client.close()
     }
-}
+}

samples/server/petstore/kotlin-server/ktor/src/main/kotlin/io/swagger/server/Configuration.kt

@@ -2,8 +2,14 @@ package io.swagger.server
 
 // Use this file to hold package-level internal functions that return receiver object passed to the `install` method.
 import io.ktor.auth.OAuthServerSettings
-import io.ktor.features.*
-import io.ktor.http.*
+import io.ktor.features.Compression
+import io.ktor.features.HSTS
+import io.ktor.features.deflate
+import io.ktor.features.gzip
+import io.ktor.features.maxAge
+import io.ktor.features.minimumSize
+import io.ktor.http.HttpMethod
+import io.ktor.util.KtorExperimentalAPI
 import java.time.Duration
 import java.util.concurrent.Executors
 
@@ -13,7 +19,7 @@ import io.swagger.server.settings
 /**
  * Application block for [HSTS] configuration.
  *
- * This file may be excluded in .swagger-codegen-ignore,
+ * This file may be excluded in .openapi-generator-ignore,
  * and application specific configuration can be applied in this function.
  *
  * See http://ktor.io/features/hsts.html
@@ -32,7 +38,7 @@ internal fun ApplicationHstsConfiguration(): HSTS.Configuration.() -> Unit {
 /**
  * Application block for [Compression] configuration.
  *
- * This file may be excluded in .swagger-codegen-ignore,
+ * This file may be excluded in .openapi-generator-ignore,
  * and application specific configuration can be applied in this function.
  *
  * See http://ktor.io/features/compression.html
@@ -50,6 +56,7 @@ internal fun ApplicationCompressionConfiguration(): Compression.Configuration.()
 }
 
 // Defines authentication mechanisms used throughout the application.
+@KtorExperimentalAPI
 val ApplicationAuthProviders: Map<String, OAuthServerSettings> = listOf<OAuthServerSettings>(
         OAuthServerSettings.OAuth2ServerSettings(
             name = "petstore_auth",

samples/server/petstore/kotlin-server/ktor/src/main/kotlin/io/swagger/server/Paths.kt

@@ -13,11 +13,13 @@ package io.swagger.server
 
 import io.ktor.application.ApplicationCall
 import io.ktor.http.HttpMethod
-import io.ktor.locations.*
-import io.ktor.pipeline.PipelineContext
+import io.ktor.locations.handle
+import io.ktor.locations.location
+import io.ktor.locations.Location
+import io.ktor.util.pipeline.PipelineContext
 import io.ktor.routing.Route
 import io.ktor.routing.method
-import io.swagger.server.models.*
+
 
 
 // NOTE: [email protected] is missing extension for Route.delete. This includes it.
@@ -30,81 +32,104 @@ inline fun <reified T : Any> Route.delete(noinline body: suspend PipelineContext
 }
 
 object Paths {
+    /**
+     * Add a new pet to the store
+     * 
+     */
+    @Location("/pet") class addPet()
     /**
      * Deletes a pet
      * 
-     * @param petId Pet id to delete 
-     * @param apiKey  (optional)
      */
-    @Location("/pet/{petId}") class deletePet(val petId: kotlin.Long, val apiKey: kotlin.String)
-
+    @Location("/pet/{petId}") class deletePet()
     /**
      * Finds Pets by status
      * Multiple status values can be provided with comma separated strings
-     * @param status Status values that need to be considered for filter 
      */
-    @Location("/pet/findByStatus") class findPetsByStatus(val status: kotlin.Array<kotlin.String>)
-
+    @Location("/pet/findByStatus") class findPetsByStatus()
     /**
      * Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * @param tags Tags to filter by 
      */
-    @Location("/pet/findByTags") class findPetsByTags(val tags: kotlin.Array<kotlin.String>)
-
+    @Location("/pet/findByTags") class findPetsByTags()
     /**
      * Find pet by ID
      * Returns a single pet
-     * @param petId ID of pet to return 
      */
-    @Location("/pet/{petId}") class getPetById(val petId: kotlin.Long)
-
+    @Location("/pet/{petId}") class getPetById()
+    /**
+     * Update an existing pet
+     * 
+     */
+    @Location("/pet") class updatePet()
+    /**
+     * Updates a pet in the store with form data
+     * 
+     */
+    @Location("/pet/{petId}") class updatePetWithForm()
+    /**
+     * uploads an image
+     * 
+     */
+    @Location("/pet/{petId}/uploadImage") class uploadFile()
     /**
      * Delete purchase order by ID
      * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     * @param orderId ID of the order that needs to be deleted 
      */
-    @Location("/store/order/{orderId}") class deleteOrder(val orderId: kotlin.String)
-
+    @Location("/store/order/{orderId}") class deleteOrder()
     /**
      * Returns pet inventories by status
      * Returns a map of status codes to quantities
      */
     @Location("/store/inventory") class getInventory()
-
     /**
      * Find purchase order by ID
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     * @param orderId ID of pet that needs to be fetched 
      */
-    @Location("/store/order/{orderId}") class getOrderById(val orderId: kotlin.Long)
-
+    @Location("/store/order/{orderId}") class getOrderById()
+    /**
+     * Place an order for a pet
+     * 
+     */
+    @Location("/store/order") class placeOrder()
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     */
+    @Location("/user") class createUser()
+    /**
+     * Creates list of users with given input array
+     * 
+     */
+    @Location("/user/createWithArray") class createUsersWithArrayInput()
+    /**
+     * Creates list of users with given input array
+     * 
+     */
+    @Location("/user/createWithList") class createUsersWithListInput()
     /**
      * Delete user
      * This can only be done by the logged in user.
-     * @param username The name that needs to be deleted 
      */
-    @Location("/user/{username}") class deleteUser(val username: kotlin.String)
-
+    @Location("/user/{username}") class deleteUser()
     /**
      * Get user by user name
      * 
-     * @param username The name that needs to be fetched. Use user1 for testing. 
      */
-    @Location("/user/{username}") class getUserByName(val username: kotlin.String)
-
+    @Location("/user/{username}") class getUserByName()
     /**
      * Logs user into the system
      * 
-     * @param username The user name for login 
-     * @param password The password for login in clear text 
      */
-    @Location("/user/login") class loginUser(val username: kotlin.String, val password: kotlin.String)
-
+    @Location("/user/login") class loginUser()
     /**
      * Logs out current logged in user session
      * 
      */
     @Location("/user/logout") class logoutUser()
-
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     */
+    @Location("/user/{username}") class updateUser()
 }