updated kotlin-server templates

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/kotlin/AbstractKotlinCodegen.java

@@ -1,5 +1,6 @@
 package io.swagger.codegen.v3.generators.kotlin;
 
+import com.github.jknack.handlebars.helper.ConditionalHelpers;
 import io.swagger.codegen.v3.CliOption;
 import io.swagger.codegen.v3.CodegenConstants;
 import io.swagger.codegen.v3.CodegenModel;
@@ -519,6 +520,7 @@ public String toEnumName(CodegenProperty property) {
     public void addHandlebarHelpers(Handlebars handlebars) {
         super.addHandlebarHelpers(handlebars);
         handlebars.registerHelpers(StringHelpers.class);
+        handlebars.registerHelpers(ConditionalHelpers.class);
     }
 
     /**

src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinClientCodegen.java

@@ -57,12 +57,6 @@ public KotlinClientCodegen() {
         cliOptions.add(dateLibrary);
     }
 
-    @Override
-    public void addHandlebarHelpers(Handlebars handlebars) {
-        super.addHandlebarHelpers(handlebars);
-        handlebars.registerHelpers(ConditionalHelpers.class);
-    }
-
     @Override
     public String getDefaultTemplateDir() {
         return "kotlin-client";

src/main/resources/handlebars/kotlin-server/data_class.mustache

@@ -1,25 +1,33 @@
 /**
  * {{{description}}}
-{{~#vars}} 
+{{#vars}}
  * @param {{name}} {{{description}}}
-{{~/vars~}}
+{{/vars}}
  */
-data class {{classname}} (
-{{~#requiredVars~}}
-    {{>data_class_req_var}}{{^@last}},{{/@last}}
-{{~/requiredVars~}}
-{{#has this 'required'}}{{#has this 'optional'}},{{/has}}{{/has}}
-{{~#optionalVars}}{{>data_class_opt_var}}{{^@last}},{{/@last}}{{/optionalVars}}
+{{#hasVars}}data {{/hasVars}}class {{classname}} (
+
+{{#vars}}
+{{#required}}
+{{>data_class_req_var}}{{^@last}},{{/@last}}
+{{/required}}
+{{^required}}
+{{>data_class_opt_var}}{{^@last}},{{/@last}}
+{{/required}}
+{{/vars}}
 ) {
-{{#has this 'enums'}}{{#vars}}{{#is this 'enum'}}
+{{#vars}}
+{{#baseItems this}}
+{{#isEnum}}
     /**
     * {{{description}}}
     * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^@last}},{{/@last}}{{/enumVars}}{{/allowableValues}}
     */
-    enum class {{nameInCamelCase}}(val value: {{datatype}}){
+    enum class {{{datatypeWithEnum}}}(val value: {{{datatype}}}{{#isNullable}}?{{/isNullable}}){
     {{#allowableValues}}{{#enumVars}}
-        {{&name}}({{{value}}}){{^@last}},{{/@last}}{{#@last}};{{/@last}}
+        {{&name}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},{{/@last}}{{#@last}};{{/@last}}
     {{/enumVars}}{{/allowableValues}}
     }
-{{/is}}{{/vars}}{{/has}}
+{{/isEnum}}
+{{/baseItems}}
+{{/vars}}
 }

src/main/resources/handlebars/kotlin-server/data_class_opt_var.mustache

@@ -1,4 +1,4 @@
 {{#description}}
     /* {{{description}}} */
-{{~/description}}
-    val {{{name}}}: {{#is this 'enum'}}{{classname}}.{{nameInCamelCase}}{{/is}}{{#isNot this 'enum'}}{{{datatype}}}{{/isNot}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}
+{{/description}}
+    val {{{name}}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}

src/main/resources/handlebars/kotlin-server/data_class_req_var.mustache

@@ -1,4 +1,4 @@
 {{#description}}
     /* {{{description}}} */
 {{/description}}
-    val {{{name}}}: {{#is this 'enum'}}{{classname}}.{{nameInCamelCase}}{{/is}}{{#isNot this 'enum'}}{{{datatype}}}{{/isNot}}
+    val {{{name}}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}

src/main/resources/handlebars/kotlin-server/libraries/ktor/AppMain.kt.mustache

@@ -36,6 +36,8 @@ import io.ktor.util.KtorExperimentalAPI
 {{#hasAuthMethods}}
 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
@@ -88,13 +90,14 @@ fun Application.main() {
     {{#authMethods}}
         {{#isBasic}}
         basic("{{{name}}}") {
-        validate { credentials ->
-            // TODO: "Apply your basic authentication functionality."
-            // Accessible in-method via call.principal<UserIdPrincipal>()
-            if (credentials.name == "Swagger" && "Codegen" == credentials.password) {
-                UserIdPrincipal(credentials.name)
-            } else {
-                null
+            validate { credentials ->
+                // TODO: "Apply your basic authentication functionality."
+                // Accessible in-method via call.principal<UserIdPrincipal>()
+                if (credentials.name == "Swagger" && "Codegen" == credentials.password) {
+                    UserIdPrincipal(credentials.name)
+                } else {
+                    null
+                }
             }
         }
         {{/isBasic}}

src/main/resources/handlebars/kotlin-server/libraries/ktor/_principal.mustache

@@ -1,8 +1,8 @@
 {{#authMethods}}
 {{#@first}}
-{{#isBasic}}
+{{#or isBasic isBearer}}
 val principal = call.authentication.principal<UserIdPrincipal>()
-{{/isBasic}}
+{{/or}}
 {{#isApiKey}}
 val principal = call.authentication.principal<ApiPrincipal>()
 {{/isApiKey}}

src/main/resources/handlebars/kotlin-server/libraries/ktor/api.mustache

@@ -15,6 +15,7 @@ import io.ktor.locations.delete
 import io.ktor.locations.get
 import io.ktor.locations.post
 import io.ktor.locations.put
+import io.ktor.locations.patch
 import io.ktor.response.respond
 import io.ktor.response.respondText
 import io.ktor.routing.Route

src/main/resources/handlebars/kotlin-server/libraries/ktor/build.gradle.mustache

@@ -2,16 +2,19 @@ group '{{groupId}}'
 version '{{artifactVersion}}'
 
 wrapper {
-    gradleVersion = '5.3'
+    gradleVersion = '7.5'
     distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
 
 buildscript {
-    ext.kotlin_version = '1.4.30'
-    ext.ktor_version = '1.5.1'
-    ext.shadow_version = '5.2.0'
+    ext.kotlin_version = '1.8.0'
+    ext.ktor_version = "1.5.4"
+    ext.shadow_version = "6.1.0"
 
     repositories {
+        maven {
+            url "https://repo1.maven.org/maven2"
+        }
         maven {
             url "https://plugins.gradle.org/m2/"
         }
@@ -40,12 +43,6 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 shadowJar {
     baseName = '{{artifactId}}'
     classifier = null
@@ -59,13 +56,13 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$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'
 }