refactors ProjectTemplates.java / Generator.java

Author: ivangsa

plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3Generator.java

@@ -78,7 +78,7 @@ public enum TransactionalOutboxType {
     @DocumentedOption(description = "Annotation class to mark generated code (e.g. `org.springframework.aot.generate.Generated`). When retained at runtime, this prevents code coverage tools like Jacoco from including generated classes in coverage reports.")
     public String generatedAnnotationClass;
 
-    private final HandlebarsEngine handlebarsEngine = getTemplateEngine();
+    private final HandlebarsEngine handlebarsEngine = (HandlebarsEngine) getTemplateEngine();
     {
         handlebarsEngine.getHandlebars().registerHelper("producerInterfaceName", (serviceName, options) -> {
             AbstractAsyncapiGenerator.OperationRoleType operationRoleType = options.param(0);

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

@@ -42,18 +42,8 @@ public class BackendApplicationDefaultGenerator extends ZDLProjectGenerator {
     @DocumentedOption(description = "Specifies the Java data type for the ID fields of entities. Defaults to Long for JPA and String for MongoDB if not explicitly set.")
     public String idJavaType;
 
-    public String mavenModulesPrefix;
-
-    @Override
-    public void onPropertiesSet() {
-        if (templates == null) {
-            if (StringUtils.isNotBlank(mavenModulesPrefix)) {
-                templates =new BackendApplicationMultiModuleProjectTemplates();
-            } else {
-                templates = new BackendApplicationProjectTemplates();
-            }
-        }
-        super.onPropertiesSet();
+    {
+        templates = new BackendApplicationProjectTemplates();
     }
 
     @Override

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

@@ -1,11 +1,13 @@
 package io.zenwave360.sdk.plugins;
 
+import io.zenwave360.sdk.doc.DocumentedOption;
 import io.zenwave360.sdk.zdl.layouts.ProjectLayout;
 
 import static io.zenwave360.sdk.templating.OutputFormatType.JAVA;
 
 public class BackendApplicationMultiModuleProjectTemplates extends BackendApplicationProjectTemplates {
 
+    @DocumentedOption(description = "Prefix for Maven modules")
     public String mavenModulesPrefix;
 
     public BackendApplicationMultiModuleProjectTemplates() {

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

@@ -21,10 +21,10 @@ public interface {{service.name}}Mapper {
 {{~#each (serviceParameterEntityPairs service) as |entry|}}
     // {{@key}} {{method.name}}
     {{~#if (not (eq entity.className input))}}
-        {{entity.className}} as{{entity.className}}({{mapperInputSignature input.className}});
+        {{entity.className}} as{{entity.className}}({{{mapperInputSignature input.className}}});
     {{~/if}}
     {{#unless (skipEntityId entity)~}}@Mapping(target = "id", ignore = true){{/unless~}}
-    {{entity.className}} update(@MappingTarget {{entity.className}} entity, {{mapperInputSignature input.className}});
+    {{entity.className}} update(@MappingTarget {{entity.className}} entity, {{{mapperInputSignature input.className}}});
 {{~/each}}
 // output mappings
 {{~#each (serviceEntityReturnTypePairs service) as |entry|}}

plugins/backend-application-default/src/test/java/io/zenwave360/sdk/plugins/BackendApplicationMongoImperativeGeneratorTest.java

@@ -39,6 +39,7 @@ public void test_generator_mongodb_customer_address_multimodule() throws Excepti
                 .withOption("basePackage", "io.zenwave360.example")
                 .withOption("persistence", PersistenceType.mongodb)
                 .withOption("style", ProgrammingStyle.imperative)
+                .withOption("templates", "new " + BackendApplicationMultiModuleProjectTemplates.class.getName())
                 .withOption("mavenModulesPrefix", "customer-address")
                 .withOption("includeEmitEventsImplementation", false)
                 .withOption("forceOverwrite", true)
@@ -47,11 +48,8 @@ public void test_generator_mongodb_customer_address_multimodule() throws Excepti
         new MainGenerator().generate(plugin);
 
         List<String> logs = logCaptor.getLogs();
-        // Assertions.assertTrue(logs.contains("Writing template with targetFile: io/example/integration/test/api/provider_for_commands_reactive/DoCreateProductConsumer.java"));
-        // Assertions.assertTrue(logs.contains("Writing template with targetFile: io/example/integration/test/api/provider_for_commands_reactive/DoCreateProductService.java"));
-
-        int exitCode = MavenCompiler.copyPomAndCompile("src/test/resources/mongodb-elasticsearch-scs3-pom.xml", targetFolder);
-        Assertions.assertEquals(0, exitCode);
+        Assertions.assertTrue(logs.contains("Writing template with targetFile: customer-address-domain/src/main/java/io/zenwave360/example/core/domain/Customer.java"));
+        Assertions.assertTrue(logs.contains("Writing template with targetFile: customer-address-core-impl/src/main/java/io/zenwave360/example/core/implementation/CustomerServiceImpl.java"));
     }
 
     @Test

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

@@ -1,5 +1,6 @@
 package io.zenwave360.sdk.plugins.kotlin;
 
+import io.zenwave360.sdk.doc.DocumentedOption;
 import io.zenwave360.sdk.generators.Generator;
 import io.zenwave360.sdk.plugins.BackendApplicationDefaultGenerator;
 import io.zenwave360.sdk.plugins.BackendApplicationDefaultHelpers;
@@ -21,6 +22,7 @@
 
 public class BackendApplicationKotlinTemplates extends ProjectTemplates {
 
+    @DocumentedOption(description = "Whether to add AsyncAPI/ApplicationEventPublisher as service dependencies. Depends on the naming convention of zenwave-asyncapi plugin to work.")
     public boolean includeEmitEventsImplementation = true;
 
     protected Function<Map<String, Object>, Boolean> skipEntityRepository = (model) -> is(model, "persistence") // if polyglot persistence -> skip

plugins/java-to-jdl/src/main/java/io/zenwave360/sdk/plugins/JavaToJDLGenerator.java

@@ -9,6 +9,7 @@
 import java.lang.reflect.Type;
 import java.util.*;
 
+import io.zenwave360.sdk.templating.HandlebarsEngine;
 import io.zenwave360.sdk.zdl.GeneratedProjectFiles;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToMany;
@@ -31,7 +32,7 @@
 import io.zenwave360.sdk.generators.Generator;
 import io.zenwave360.sdk.templating.TemplateOutput;
 
-public class JavaToJDLGenerator implements Generator {
+public class JavaToJDLGenerator extends Generator {
 
     private Logger log = LoggerFactory.getLogger(getClass());
 

plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIGenerator.java

@@ -18,10 +18,7 @@
 import io.zenwave360.sdk.generators.EntitiesToAvroConverter;
 import io.zenwave360.sdk.generators.EntitiesToSchemasConverter;
 import io.zenwave360.sdk.options.asyncapi.AsyncapiVersionType;
-import io.zenwave360.sdk.templating.HandlebarsEngine;
-import io.zenwave360.sdk.templating.OutputFormatType;
-import io.zenwave360.sdk.templating.TemplateInput;
-import io.zenwave360.sdk.templating.TemplateOutput;
+import io.zenwave360.sdk.templating.*;
 import io.zenwave360.sdk.utils.JSONPath;
 import io.zenwave360.sdk.zdl.GeneratedProjectFiles;
 
@@ -88,8 +85,6 @@ public JDLToAsyncAPIGenerator withSourceProperty(String sourceProperty) {
         return this;
     }
 
-    private HandlebarsEngine handlebarsEngine = new HandlebarsEngine();
-
     private final TemplateInput jdlToAsyncAPITemplate = new TemplateInput("io/zenwave360/sdk/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI{{asyncapiVersion}}.yml", "{{targetFile}}").withMimeType(OutputFormatType.YAML);
 
     protected Map<String, Object> getJDLModel(Map<String, Object> contextModel) {
@@ -225,7 +220,7 @@ public TemplateOutput generateTemplateOutput(Map<String, Object> contextModel, T
         model.put("zdlModel", zdlModel);
         model.put("schemaFormatString", schemaFormat == SchemaFormat.schema ? (asyncapiVersion == AsyncapiVersionType.v3? defaultSchemaFormatV3 : defaultSchemaFormatV2) : avroSchemaFormat);
         model.put("schemasAsString", schemasAsString);
-        return handlebarsEngine.processTemplate(model, template);
+        return getTemplateEngine().processTemplate(model, template);
     }
 
     protected boolean skipOperations(Map entity) {
@@ -244,6 +239,8 @@ protected boolean skipOperations(Map entity) {
     }
 
     {
+        var handlebarsEngine = (HandlebarsEngine) getTemplateEngine();
+
         handlebarsEngine.getHandlebars().registerHelper("skipOperations", (context, options) -> {
             return skipOperations((Map) context);
         });

plugins/openapi-controllers/src/main/java/io/zenwave360/sdk/plugins/OpenAPIControllersGenerator.java

@@ -54,9 +54,7 @@ public void onPropertiesSet() {
                 .forEach(helper -> handlebarsEngine.getHandlebars().registerHelpers(helper));
     }
 
-    public TemplateEngine getTemplateEngine() {
-        return handlebarsEngine;
-    }
+
 
     protected Map<String, Object> getZDLModel(Map<String, Object> contextModel) {
         return (Map) contextModel.get(zdlProperty);
@@ -307,6 +305,7 @@ public List<TemplateOutput> generateTemplateOutput(Map<String, Object> contextMo
         model.put("zdl", getZDLModel(contextModel));
         model.put("webFlavor", style == ProgrammingStyle.imperative ? "mvc" : "webflux");
         model.putAll(extModel);
+        model.putAll(templates.getDocumentedOptions());
         return getTemplateEngine().processTemplates(model, List.of(template));
     }
 

plugins/openapi-karate/src/main/java/io/zenwave360/sdk/plugins/OpenAPIKarateGenerator.java

@@ -36,7 +36,7 @@ enum GroupByType {
     @DocumentedOption(description = "Business Flow Feature name")
     public String businessFlowTestName;
 
-    private HandlebarsEngine handlebarsEngine = new HandlebarsEngine();
+    private HandlebarsEngine handlebarsEngine = (HandlebarsEngine) getTemplateEngine();
 
     private JsonSchemaToJsonFaker jsonSchemaToJsonFaker = new JsonSchemaToJsonFaker();
 
@@ -58,9 +58,7 @@ public void onPropertiesSet() {
         }
     }
 
-    public TemplateEngine getTemplateEngine() {
-        return handlebarsEngine;
-    }
+
 
     Model getApiModel(Map<String, Object> contextModel) {
         return (Model) contextModel.get(apiProperty);