Merge pull request swagger-api#875 from poculeka/enable-kotlin-client…

…-helpers Enable StringHelpers Handlebars in Kotlin client codegen
Andy-Grigg · Jun 30, 2021 · a36fd69 · a36fd69
2 parents a2ffea4 + 8f55f7e
commit a36fd69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/io/swagger/codegen/v3/generators/kotlin/AbstractKotlinCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/kotlin/AbstractKotlinCodegen.java
@@ -11,6 +11,8 @@
 import io.swagger.v3.oas.models.media.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.github.jknack.handlebars.helper.StringHelpers;
+import com.github.jknack.handlebars.Handlebars;
 
 import java.io.File;
 import java.util.Arrays;
@@ -506,6 +508,12 @@ public String toVarName(String name) {
         return super.toVarName(sanitizeKotlinSpecificNames(name));
     }
 
+    @Override
+    public void addHandlebarHelpers(Handlebars handlebars) {
+        super.addHandlebarHelpers(handlebars);
+        handlebars.registerHelpers(StringHelpers.class);
+    }
+
     /**
      * Provides a strongly typed declaration for simple arrays of some type and arrays of arrays of some type.
      *

diff --git a/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinServerCodegen.java
@@ -18,8 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import com.github.jknack.handlebars.helper.StringHelpers;
-import com.github.jknack.handlebars.Handlebars;
 import org.apache.commons.lang3.StringUtils;
 
 import static java.util.Collections.singletonMap;
@@ -228,12 +226,6 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("ApiKeyAuth.kt.mustache", infrastructureFolder, "ApiKeyAuth.kt"));
     }
 
-    @Override
-    public void addHandlebarHelpers(Handlebars handlebars) {
-        super.addHandlebarHelpers(handlebars);
-        handlebars.registerHelpers(StringHelpers.class);
-    }
-
     @Override
     public String getDefaultTemplateDir() {
         return "kotlin-server";