feat: add support for Kotlin+SpringBoot ProjectTemplates

Author: ivangsa

.github/workflows/publish-maven-central.yml

@@ -54,6 +54,7 @@ jobs:
             ./plugins/java-to-jdl/target/site/jacoco/jacoco.csv
             ./plugins/java-to-asyncapi/target/site/jacoco/jacoco.csv
             ./plugins/backend-application-default/target/site/jacoco/jacoco.csv
+            ./plugins/backend-application-kotlin/target/site/jacoco/jacoco.csv
             ./plugins/openapi-controllers/target/site/jacoco/jacoco.csv
             ./plugins/zdl-to-openapi/target/site/jacoco/jacoco.csv
             ./plugins/jdl-to-asyncapi/target/site/jacoco/jacoco.csv

.github/workflows/publish-maven-snapshots.yml

@@ -47,6 +47,7 @@ jobs:
             ./plugins/java-to-jdl/target/site/jacoco/jacoco.csv
             ./plugins/java-to-asyncapi/target/site/jacoco/jacoco.csv
             ./plugins/backend-application-default/target/site/jacoco/jacoco.csv
+            ./plugins/backend-application-kotlin/target/site/jacoco/jacoco.csv
             ./plugins/openapi-controllers/target/site/jacoco/jacoco.csv
             ./plugins/zdl-to-openapi/target/site/jacoco/jacoco.csv
             ./plugins/jdl-to-asyncapi/target/site/jacoco/jacoco.csv

plugins/backend-application-default/src/main/java/io/zenwave360/sdk/plugins/BackendApplicationDefaultPlugin.java

@@ -3,6 +3,7 @@
 import io.zenwave360.sdk.Plugin;
 import io.zenwave360.sdk.doc.DocumentedPlugin;
 import io.zenwave360.sdk.formatters.JavaFormatter;
+import io.zenwave360.sdk.formatters.KotlinFormatter;
 import io.zenwave360.sdk.parsers.ZDLParser;
 import io.zenwave360.sdk.processors.ZDLProcessor;
 import io.zenwave360.sdk.writers.TemplateFileWriter;
@@ -40,7 +41,7 @@ public class BackendApplicationDefaultPlugin extends Plugin {
 
     public BackendApplicationDefaultPlugin() {
         super();
-        withChain(ZDLParser.class, ZDLProcessor.class, BackendApplicationDefaultGenerator.class, JavaFormatter.class, TemplateFileWriter.class);
+        withChain(ZDLParser.class, ZDLProcessor.class, BackendApplicationDefaultGenerator.class, JavaFormatter.class, KotlinFormatter.class, TemplateFileWriter.class);
     }
 
     @Override

plugins/backend-application-default/src/test/resources/jpa-elasticsearch-scs3-pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.5.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>tests</groupId>
@@ -19,7 +19,7 @@
         <spring-boot.version>${project.parent.version}</spring-boot.version>
         <archunit-junit5.version>1.0.1</archunit-junit5.version>
         <mapstruct.version>1.5.1.Final</mapstruct.version>
-        <spring-cloud.version>2021.0.3</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <avro.version>1.11.1</avro.version>
         <testcontainers.version>1.17.2</testcontainers.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
@@ -132,13 +132,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream</artifactId>
-            <scope>test</scope>
-            <classifier>test-binder</classifier>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>

plugins/backend-application-default/src/test/resources/mongodb-elasticsearch-scs3-pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.5.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>tests</groupId>
@@ -19,7 +19,7 @@
         <spring-boot.version>${project.parent.version}</spring-boot.version>
         <archunit-junit5.version>1.0.1</archunit-junit5.version>
         <mapstruct.version>1.5.1.Final</mapstruct.version>
-        <spring-cloud.version>2021.0.3</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <avro.version>1.11.1</avro.version>
         <testcontainers.version>1.17.2</testcontainers.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
@@ -126,13 +126,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream</artifactId>
-            <scope>test</scope>
-            <classifier>test-binder</classifier>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>

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

@@ -1,10 +1,13 @@
 package io.zenwave360.sdk.plugins;
 
 import com.github.jknack.handlebars.Options;
+import io.zenwave360.sdk.options.PersistenceType;
 import io.zenwave360.sdk.utils.JSONPath;
+import io.zenwave360.sdk.zdl.utils.ZDLFindUtils;
 import io.zenwave360.sdk.zdl.utils.ZDLJavaSignatureUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class BackendApplicationKotlinHelpers {
 
@@ -19,6 +22,12 @@ public String methodParametersSignature(Map<String, Object> method, Options opti
         return ZDLJavaSignatureUtils.kotlinMethodParametersSignature(generator.getIdJavaType(), method, zdl);
     }
 
+    public String mapperInputSignature(String inputType, Options options) {
+        var zdl = (Map) options.get("zdl");
+        var signature = ZDLJavaSignatureUtils.mapperInputSignature(inputType, zdl);
+        return ZDLJavaSignatureUtils.toKotlinMethodSignature(signature);
+    }
+
     public String returnType(Map<String, Object> method, Options options) {
         return ZDLJavaSignatureUtils.methodReturnType(method).replace("void", "Unit");
     }
@@ -37,13 +46,42 @@ public String relationshipFieldType(Map field, Options options) {
     };
 
     public String relationshipFieldTypeInitializer(Map field, Options options) {
-        return fixKotlinTypeInitializers(ZDLJavaSignatureUtils.relationshipFieldTypeInitializer(field));
+        var typeInitializer = ZDLJavaSignatureUtils.relationshipFieldTypeInitializer(field);
+        if(typeInitializer.trim().isEmpty()) {
+            return " = null";
+        }
+        return fixKotlinTypeInitializers(typeInitializer);
     };
 
     public String fieldTypeInitializer(Map field, Options options) {
-        return fixKotlinTypeInitializers(ZDLJavaSignatureUtils.fieldTypeInitializer(field));
+        var typeInitializer = fixKotlinTypeInitializers(ZDLJavaSignatureUtils.fieldTypeInitializer(field));
+        if(typeInitializer.trim().isEmpty()) {
+            return " = null";
+        }
+        return typeInitializer;
     };
 
+    public String idFieldInitialization(Map method, Options options) {
+        var zdl = options.get("zdl");
+        var hasNaturalId = JSONPath.get(method, "$.naturalId", false);
+        if(hasNaturalId) {
+            var entity = (Map) JSONPath.get(zdl, "$.allEntitiesAndEnums." + method.get("entity"));
+            List<Map> fields = ZDLFindUtils.naturalIdFields(entity);
+            return fields.stream().map(field -> String.format("val %s = %s;", field.get("name"), ZDLJavaSignatureUtils.populateField(field)))
+                    .collect(Collectors.joining("\n"));
+        }
+        return "val id: " + generator.getIdJavaType() + " = " + idInitialization(generator.getIdJavaType());
+    }
+
+    private String idInitialization(String idJavaType) {
+        return switch (idJavaType) {
+            case "Long" -> "1L";
+            case "Integer" -> "1";
+            case "String" -> "\"1\"";
+            default -> "";
+        };
+    }
+
     private String fixKotlinTypeInitializers(String type) {
         return type
                 .replaceAll("new HashSet<>\\(\\)", "mutableSetOf()")

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

@@ -34,10 +34,10 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener
 data class {{entity.className}}(
 {{#unless (skipEntityId entity)~}}
     {{~> (partial 'partials/id' databaseType)}}
-    var id: {{idJavaType}}?,
+    var id: {{idJavaType}}? = null,
 
     @Version
-    var version: Int?,
+    var version: Int? = null,
 {{/unless~}}
 
 {{#each entity.fields as |field|}}

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

@@ -14,7 +14,7 @@ data class {{entity.className}}(
     {{#each field.validations as |validation|~}}
     // @{{validation.name}}("{{validation.value}}")
     {{~/each}}
-    var {{field.name}}: {{{fieldType field}}}{{#unless @last}},{{/unless}}
+    var {{field.name}}: {{{fieldType field}}}?{{#unless @last}},{{/unless}}
 {{/each}}
 ) {{addExtends entity}} : Serializable {
 
@@ -30,4 +30,4 @@ data class {{entity.className}}(
     }
     {{~/if}}
 {{/each}}
-}
+}

plugins/backend-application-kotlin/src/main/resources/io/zenwave360/sdk/plugins/BackendApplicationDefaultGenerator/src/main/kotlin/core/implementation/imperative/ServiceImpl.kt.hbs

@@ -35,7 +35,7 @@ import java.util.Optional
  */
 @Service
 @Transactional(readOnly = true)
-class {{service.name}}Impl(
+open class {{service.name}}Impl(
 {{#each entities as |entity|}}
     {{~#unless (skipEntityRepository this)}}
     private val {{entity.instanceName}}Repository: {{entity.className}}Repository{{#unless @last}},{{/unless}}

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

@@ -25,7 +25,7 @@ interface {{service.name}}Mapper {
     fun as{{entity.className}}({{mapperInputSignature input.className}}): {{entity.className}}
     {{~/if}}
     {{#unless (skipEntityId entity)~}}@Mapping(target = "id", ignore = true){{/unless~}}
-    fun update(entity: {{entity.className}}, {{mapperInputSignature input.className}}): {{entity.className}}
+    fun update(@MappingTarget entity: {{entity.className}}, {{mapperInputSignature input.className}}): {{entity.className}}
 {{~/each}}
 // output mappings
 {{~#each (serviceEntityReturnTypePairs service) as |entry|}}
@@ -48,8 +48,8 @@ interface {{service.name}}Mapper {
     @AfterMapping
     fun manageRelationships(entity: {{entity.className}}) {
         {{~#each relationships as |relationship|}}
-        entity.get{{capitalize relationship.fieldName}}()?.forEach { {{relationship.fieldName}} ->
-            {{relationship.fieldName}}.set{{capitalize relationship.otherEntityFieldName}}(entity)
+        entity.{{relationship.fieldName}}?.forEach { {{relationship.fieldName}} ->
+            {{relationship.fieldName}}.{{relationship.otherEntityFieldName}} = entity
         }
         {{~/each}}
     }