feat: add support for Kotlin+SpringBoot ProjectTemplates

Author: ivangsa

plugins/customizations/kotlin-backend-application/src/main/java/io/zenwave360/sdk/plugins/kotlin/OpenAPIControllersKotlinHelpers.java

@@ -1,10 +1,12 @@
 package io.zenwave360.sdk.plugins.kotlin;
 
 import com.github.jknack.handlebars.Options;
+import io.zenwave360.sdk.utils.JSONPath;
 import io.zenwave360.sdk.zdl.utils.ZDLHttpUtils;
 import io.zenwave360.sdk.zdl.utils.ZDLJavaSignatureUtils;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -21,7 +23,12 @@ public OpenAPIControllersKotlinHelpers(String openApiModelNamePrefix, String ope
     }
 
     public String kotlinMethodParametersSignature(String methodParametersSignature, Options options) {
-        return ZDLJavaSignatureUtils.toKotlinMethodSignature(methodParametersSignature);
+        return ZDLJavaSignatureUtils.toKotlinMethodSignature(methodParametersSignature)
+                .replaceAll(": Integer", ": Int");
+    }
+
+    public String voidUnit(String returnType, Options options) {
+        return returnType.replace("void", "Unit").replace("Void", "Unit");
     }
 
     public CharSequence asMethodParametersInitializer(Object operation, Options options) throws IOException {
@@ -31,9 +38,46 @@ public CharSequence asMethodParametersInitializer(Object operation, Options opti
                 return "";
             }
             return methodParams.stream()
-                    .map(param -> param.getValue() + ": " + param.getKey() + " = null;")
-                    .collect(Collectors.joining("\n"));
+                    .map(param -> "val " + param.getValue() + ": " + param.getKey() + " = " + instantiateParam((Map) operation, param.getValue(), param.getKey()))
+                    .collect(Collectors.joining("\n"))
+                    .replaceAll(" Integer ", " Int ");
         }
         return options.fn(operation);
     }
+
+    private String instantiateParam(Map operation, String paramName, String dtoName) {
+        var params = JSONPath.get(operation, "parameters[?(@.name == '" + paramName + "')]", List.of());
+        var param = params.isEmpty() ? null : params.get(0);
+        var isArray = "array".equals(JSONPath.get(param, "schema.type"));
+        var isEnum = JSONPath.get(param, "schema.enum") != null;
+        if(isEnum) {
+            return dtoName + "." + JSONPath.get(param, "schema.enum[0]");
+        }
+        if(isArray) {
+            return "mutableListOf()";
+        }
+        var isNumber = "number".equals(JSONPath.get(param, "schema.type")) || "integer".equals(JSONPath.get(param, "schema.type"));
+        var isBoolean = "boolean".equals(JSONPath.get(param, "schema.type"));
+        var isString = "string".equals(JSONPath.get(param, "schema.type"));
+        var isDate = "date".equals(JSONPath.get(param, "schema.format"));
+        var isDateTime = "date-time".equals(JSONPath.get(param, "schema.format"));
+        if(isNumber) {
+            return "0";
+        }
+        if(isDate) {
+            return "LocalDate.now()";
+        }
+        if(isDateTime) {
+            return "Instant.now()";
+        }
+        if(isBoolean) {
+            return "false";
+        }
+        if(isString) {
+            return "\"\"";
+        }
+        var requiredFields = JSONPath.get(operation, "x--request-schema.required", List.<String>of()).stream()
+                .map(it -> it + " = \"\"").collect(Collectors.joining(", "));
+        return dtoName + "(" + requiredFields + ")";
+    }
 }

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/BackendApplicationDefaultGenerator/src/main/kotlin/core/domain/jpa/Entity.kt.hbs

@@ -166,6 +166,10 @@ data class {{entity.className}}(
 {{/each}}
 
 {{#unless (skipEntityId entity)~}}
+    override fun toString(): String {
+        return this::class.java.name + "#" + id
+    }
+
     /* https://vladmihalcea.com/the-best-way-to-implement-equals-hashcode-and-tostring-with-jpa-and-hibernate/ */
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -176,5 +180,9 @@ data class {{entity.className}}(
     override fun hashCode(): Int {
         return javaClass.hashCode()
     }
+{{else}}
+    override fun toString(): String {
+        return this::class.java.name + "@" + Integer.toHexString(hashCode())
+    }
 {{~/unless}}
 }

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/BackendApplicationDefaultGenerator/src/main/kotlin/core/domain/mongodb/Entity.kt.hbs

@@ -72,6 +72,10 @@ data class {{entity.className}}(
 {{/each}}
 
 {{#unless (skipEntityId entity)~}}
+    override fun toString(): String {
+        return this::class.java.name + "#" + id
+    }
+
     /* https://vladmihalcea.com/the-best-way-to-implement-equals-hashcode-and-tostring-with-jpa-and-hibernate/ */
     override fun equals(other: Any?): Boolean {
         if (this === other) return true

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/BackendApplicationDefaultGenerator/src/main/kotlin/core/implementation/mappers/ServiceMapper.kt.hbs

@@ -46,7 +46,7 @@ interface {{service.name}}Mapper {
     {{~assign 'relationships' (findOwnedOneToManyRelationships entity)}}
     {{~#if relationships}}
     @AfterMapping
-    fun manageRelationships(entity: {{entity.className}}) {
+    fun manageRelationships(@MappingTarget entity: {{entity.className}}) {
         {{~#each relationships as |relationship|}}
         entity.{{relationship.fieldName}}?.forEach { {{relationship.fieldName}} ->
             {{relationship.fieldName}}.{{relationship.otherEntityFieldName}} = entity

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/BackendApplicationDefaultGenerator/src/test/kotlin/config/ServicesInMemoryConfig.kt.hbs

@@ -52,7 +52,7 @@ open class ServicesInMemoryConfig : RepositoriesInMemoryConfig() {
 
 {{~#each services as |service|}}
     @Bean
-    fun <T : {{service.name}}> {{asInstanceName service.name}}(): T {
+    open fun <T : {{service.name}}> {{asInstanceName service.name}}(): T {
         return {{asInstanceName service.name}} as T
     }
 {{~/each}}
@@ -79,9 +79,9 @@ open class ServicesInMemoryConfig : RepositoriesInMemoryConfig() {
 
 {{~#if (includeEmitEventsImplementation service)}}
     {{~#if (needsEventsProducer service)}}
-    fun getEventsProducerInMemoryContext(): EventsProducerInMemoryContext {
-        return eventsProducerInMemoryContext
-    }
+    // fun getEventsProducerInMemoryContext(): EventsProducerInMemoryContext {
+    //     return eventsProducerInMemoryContext
+    // }
     {{~/if}}
 {{~/if}}
 {{~#if (needsEventBus service)}}

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/OpenAPIControllersGenerator/src/main/kotlin/web/mappers/ServiceDTOsMapper.kt.hbs

@@ -6,6 +6,7 @@ import {{layout.inboundDtosPackage}}.*
 import {{openApiModelPackage}}.*
 
 import org.mapstruct.Mapper
+import org.mapstruct.Mapping
 import org.mapstruct.factory.Mappers
 import java.math.*
 import java.time.*
@@ -33,6 +34,7 @@ interface {{serviceName}}DTOsMapper {
 {{~#each mapperResponseDtoEntity as |entry|}}
     {{#if isResponsePaginated}}
     fun as{{responseDto}}List(entityList: List<{{outputType}}>): List<{{responseDto}}>
+    @Mapping(target = "content", source = "content", conditionExpression = "java(page.getContent() != null)")
     fun as{{responseEntityName}}(page: Page<{{outputType}}>): {{responseEntityName}}
     fun as{{responseDto}}Page(page: Page<{{outputType}}>): Page<{{responseDto}}> {
         return page.map { this.as{{responseDto}}(it) }

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/OpenAPIControllersGenerator/src/main/kotlin/web/mvc/ServiceApiController.kt.hbs

@@ -54,7 +54,7 @@ open class {{serviceName}}ApiController(
 {{#each serviceOperations}}
     {{~#assign "TODO"}}{{#unless serviceMethod}}null // TODO: service{{/unless}}{{/assign}}
 
-    override fun {{operationId}}({{{kotlinMethodParametersSignature methodParameters}}}): ResponseEntity<{{{responseEntityExpression}}}> {
+    override fun {{operationId}}({{{kotlinMethodParametersSignature methodParameters}}}): ResponseEntity<{{{voidUnit responseEntityExpression}}}> {
         log.debug("REST request to {{operationId}}: {{methodParameterPlaceholders}}"{{#if methodParameters}}, {{methodParameterInstances}}{{/if}})
     {{~#if (eq httpMethod 'patch')}}
     {{~else if requestBodySchema}}

plugins/customizations/kotlin-backend-application/src/test/java/io/zenwave360/sdk/plugins/kotlin/SpringWebTestClientKotlinGeneratorTest.java

@@ -12,6 +12,7 @@
 import io.zenwave360.sdk.writers.TemplateStdoutWriter;
 import io.zenwave360.sdk.writers.TemplateWriter;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 

plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/sdk/plugins/SpringWebTestClientPlugin.java

@@ -3,7 +3,9 @@
 import io.zenwave360.sdk.Plugin;
 import io.zenwave360.sdk.doc.DocumentedPlugin;
 import io.zenwave360.sdk.parsers.DefaultYamlParser;
+import io.zenwave360.sdk.parsers.ZDLParser;
 import io.zenwave360.sdk.processors.OpenApiProcessor;
+
 import io.zenwave360.sdk.writers.TemplateFileWriter;
 import io.zenwave360.sdk.writers.TemplateStdoutWriter;
 import org.apache.commons.lang3.StringUtils;
@@ -19,7 +21,7 @@ public class SpringWebTestClientPlugin extends Plugin {
     private Logger log = LoggerFactory.getLogger(getClass());
     public SpringWebTestClientPlugin() {
         super();
-        withChain(DefaultYamlParser.class, OpenApiProcessor.class, SpringWebTestClientGenerator.class, /* JavaFormatter.class, */ TemplateFileWriter.class);
+        withChain(ZDLParser.class, DefaultYamlParser.class, OpenApiProcessor.class, SpringWebTestClientGenerator.class, /* JavaFormatter.class, */ TemplateFileWriter.class);
     }
 
     @Override

zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/EntitiesToSchemasConverter.java

@@ -76,7 +76,9 @@ public Map<String, Object> convertEntityToSchema(Map<String, Object> entity, Map
             if (includeVersion) {
                 properties.put("version", Maps.of(
                         "type", "integer",
-                        "description", "Version of the document (required in PUT for concurrency control, should be null in POSTs)."));
+                        "default", "null",
+                        "description", "Version of the document (required in PUT for concurrency control, should be null in POSTs).")
+                );
             }
         }