[KOTLIN] [SPRING] Minor bug fixes to generator

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java

@@ -59,6 +59,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
     public static final String SERVICE_IMPLEMENTATION = "serviceImplementation";
 
     private String basePackage;
+    private String invokerPackage;
     private String serverPort = "8080";
     private String title = "OpenAPI Kotlin Spring";
     private String resourceFolder = "src/main/resources";
@@ -79,12 +80,12 @@ public KotlinSpringServerCodegen() {
         embeddedTemplateDir = templateDir = "kotlin-spring";
 
         artifactId = "openapi-spring";
-        basePackage = "org.openapitools";
+        basePackage = invokerPackage = "org.openapitools";
         apiPackage = "org.openapitools.api";
         modelPackage = "org.openapitools.model";
 
         addOption(TITLE, "server title name or client service name", title);
-        addOption(BASE_PACKAGE, "base package for generated code", basePackage);
+        addOption(BASE_PACKAGE, "base package (invokerPackage) for generated code", basePackage);
         addOption(SERVER_PORT, "configuration the port in which the sever is to run on", serverPort);
         addOption(CodegenConstants.MODEL_PACKAGE, "model package for generated code", modelPackage);
         addOption(CodegenConstants.API_PACKAGE, "api package for generated code", apiPackage);
@@ -123,6 +124,14 @@ public void setBasePackage(String basePackage) {
         this.basePackage = basePackage;
     }
 
+    public String getInvokerPackage() {
+        return this.invokerPackage;
+    }
+
+    public void setInvokerPackage(String invokerPackage) {
+        this.invokerPackage = invokerPackage;
+    }
+
     public String getServerPort() {
         return this.serverPort;
     }
@@ -225,13 +234,19 @@ public void processOpts() {
         // used later in recursive import in postProcessingModels
         importMapping.put("com.fasterxml.jackson.annotation.JsonProperty", "com.fasterxml.jackson.annotation.JsonCreator");
 
-        // TODO when adding invokerPackage
-        //importMapping.put("StringUtil", invokerPackage + ".StringUtil");
-
         if (!additionalProperties.containsKey(CodegenConstants.LIBRARY)) {
             additionalProperties.put(CodegenConstants.LIBRARY, library);
         }
 
+        // Set basePackage from invokerPackage
+        if (!additionalProperties.containsKey(BASE_PACKAGE)
+                && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
+            this.setBasePackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
+            this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
+            additionalProperties.put(BASE_PACKAGE, basePackage);
+            LOGGER.info("Set base package to invoker package (" + basePackage + ")");
+        }
+
         if (additionalProperties.containsKey(BASE_PACKAGE)) {
             this.setBasePackage((String) additionalProperties.get(BASE_PACKAGE));
         } else {

modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache

@@ -39,7 +39,7 @@ import kotlin.collections.Map
 @Api(value = "{{{baseName}}}", description = "The {{{baseName}}} API")
 {{/swaggerAnnotations}}
 {{=<% %>=}}
-@RequestMapping("\${openapi.<%title%>.base-path:<%contextPath%>}")
+@RequestMapping("\${api.base-path:<%contextPath%>}")
 <%={{ }}=%>
 {{#operations}}
 class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) {

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/application.mustache

@@ -1,3 +1,10 @@
-spring.application.name={{title}}
-server.port={{serverPort}}
-spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
+spring:
+  application:
+    name: {{title}}
+
+  jackson:
+    serialization:
+      WRITE_DATES_AS_TIMESTAMPS: false
+
+server:
+  port: {{serverPort}}

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache

@@ -40,6 +40,7 @@ dependencies {
 {{/swaggerAnnotations}}
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
+    compile("com.fasterxml.jackson.module:jackson-module-kotlin")
 
     testCompile("org.springframework.boot:spring-boot-starter-test") {
         exclude(module = "junit")

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache

@@ -98,6 +98,10 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+        </dependency>
         {{#useBeanValidation}}
         <!-- Bean Validation API support -->
         <dependency>

modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java

@@ -29,6 +29,7 @@ public void testInitialConfigValues() throws Exception {
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "org.openapitools.api");
         Assert.assertEquals(codegen.getBasePackage(), "org.openapitools");
         Assert.assertEquals(codegen.additionalProperties().get(KotlinSpringServerCodegen.BASE_PACKAGE), "org.openapitools");
+        Assert.assertEquals(codegen.getInvokerPackage(), "org.openapitools");
         Assert.assertEquals(codegen.getServerPort(), "8080");
         Assert.assertEquals(codegen.additionalProperties().get(KotlinSpringServerCodegen.SERVER_PORT), "8080");
     }
@@ -112,4 +113,14 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception {
         Assert.assertFalse(codegen.getUseBeanValidation());
         Assert.assertEquals(codegen.additionalProperties().get(KotlinSpringServerCodegen.USE_BEANVALIDATION), false);
     }
+
+    @Test
+    public void testSettingInvokerPackageToBasePackage() throws Exception {
+        final KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen();
+        codegen.additionalProperties().put(CodegenConstants.INVOKER_PACKAGE, "xyz.yyyyy.bbbb.invoker");
+        codegen.processOpts();
+
+        Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.bbbb.invoker");
+        Assert.assertEquals(codegen.getBasePackage(), "xyz.yyyyy.bbbb.invoker");
+    }
 }

samples/server/openapi3/petstore/kotlin-springboot/.openapi-generator/VERSION

@@ -1 +1 @@
-3.2.3-SNAPSHOT
+3.3.0-SNAPSHOT

samples/server/openapi3/petstore/kotlin-springboot/build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
     compile("io.swagger:swagger-annotations:1.5.21")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
+    compile("com.fasterxml.jackson.module:jackson-module-kotlin")
 
     testCompile("org.springframework.boot:spring-boot-starter-test") {
         exclude(module = "junit")

samples/server/openapi3/petstore/kotlin-springboot/pom.xml

@@ -96,6 +96,10 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+        </dependency>
         <!-- Bean Validation API support -->
         <dependency>
             <groupId>javax.validation</groupId>

samples/server/openapi3/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt

@@ -28,7 +28,7 @@ import kotlin.collections.Map
 @Controller
 @Validated
 @Api(value = "Pet", description = "The Pet API")
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${api.base-path:/v2}")
 class PetApiController(@Autowired(required = true) val service: PetApiService) {
 
     @ApiOperation(

samples/server/openapi3/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt

@@ -27,7 +27,7 @@ import kotlin.collections.Map
 @Controller
 @Validated
 @Api(value = "Store", description = "The Store API")
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${api.base-path:/v2}")
 class StoreApiController(@Autowired(required = true) val service: StoreApiService) {
 
     @ApiOperation(

samples/server/openapi3/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt

@@ -27,7 +27,7 @@ import kotlin.collections.Map
 @Controller
 @Validated
 @Api(value = "User", description = "The User API")
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${api.base-path:/v2}")
 class UserApiController(@Autowired(required = true) val service: UserApiService) {
 
     @ApiOperation(

samples/server/openapi3/petstore/kotlin-springboot/src/main/resources/application.yaml

@@ -1,3 +1,10 @@
-spring.application.name=openAPIPetstore
-server.port=8080
-spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
+spring:
+  application:
+    name: openAPIPetstore
+
+  jackson:
+    serialization:
+      WRITE_DATES_AS_TIMESTAMPS: false
+
+server:
+  port: 8080

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

@@ -1 +1 @@
-3.2.3-SNAPSHOT
+3.3.0-SNAPSHOT

samples/server/petstore/kotlin-springboot/build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
     compile("io.swagger:swagger-annotations:1.5.21")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
+    compile("com.fasterxml.jackson.module:jackson-module-kotlin")
 
     testCompile("org.springframework.boot:spring-boot-starter-test") {
         exclude(module = "junit")

samples/server/petstore/kotlin-springboot/pom.xml

@@ -96,6 +96,10 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+        </dependency>
         <!-- Bean Validation API support -->
         <dependency>
             <groupId>javax.validation</groupId>

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt

@@ -28,7 +28,7 @@ import kotlin.collections.Map
 @Controller
 @Validated
 @Api(value = "Pet", description = "The Pet API")
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${api.base-path:/v2}")
 class PetApiController(@Autowired(required = true) val service: PetApiService) {
 
     @ApiOperation(

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt

@@ -27,7 +27,7 @@ import kotlin.collections.Map
 @Controller
 @Validated
 @Api(value = "Store", description = "The Store API")
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${api.base-path:/v2}")
 class StoreApiController(@Autowired(required = true) val service: StoreApiService) {
 
     @ApiOperation(

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt

@@ -27,7 +27,7 @@ import kotlin.collections.Map
 @Controller
 @Validated
 @Api(value = "User", description = "The User API")
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${api.base-path:/v2}")
 class UserApiController(@Autowired(required = true) val service: UserApiService) {
 
     @ApiOperation(

samples/server/petstore/kotlin-springboot/src/main/resources/application.yaml

@@ -1,3 +1,10 @@
-spring.application.name=openAPIPetstore
-server.port=8080
-spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
+spring:
+  application:
+    name: openAPIPetstore
+
+  jackson:
+    serialization:
+      WRITE_DATES_AS_TIMESTAMPS: false
+
+server:
+  port: 8080