increased coverage and fixing duplicate issue in sonar

Author: RanjeethKbb

boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatWebhooksCodeGen.java

@@ -127,6 +127,26 @@ public String toApiName(String name) {
     }
 
 
+    /**
+     * Centralizes the handling of configuration booleans and updates additionalProperties accordingly.
+     */
+    private void handleConfigBooleans() {
+        this.useClassLevelBeanValidation = convertPropertyToBoolean(USE_CLASS_LEVEL_BEAN_VALIDATION);
+        this.addServletRequest = convertPropertyToBoolean(ADD_SERVLET_REQUEST);
+        this.addBindingResult = convertPropertyToBoolean(ADD_BINDING_RESULT);
+        this.useLombokAnnotations = convertPropertyToBoolean(USE_LOMBOK_ANNOTATIONS);
+        this.useWithModifiers = convertPropertyToBoolean(USE_WITH_MODIFIERS);
+        this.useProtectedFields = convertPropertyToBoolean(USE_PROTECTED_FIELDS);
+
+        this.additionalProperties.put(USE_CLASS_LEVEL_BEAN_VALIDATION, this.useClassLevelBeanValidation);
+        this.additionalProperties.put(ADD_SERVLET_REQUEST, this.addServletRequest);
+        this.additionalProperties.put(ADD_BINDING_RESULT, this.addBindingResult);
+        this.additionalProperties.put(USE_LOMBOK_ANNOTATIONS, this.useLombokAnnotations);
+        this.additionalProperties.put(USE_WITH_MODIFIERS, this.useWithModifiers);
+        this.additionalProperties.put(USE_PROTECTED_FIELDS, this.useProtectedFields);
+        this.additionalProperties.put("modelFieldsVisibility", this.useProtectedFields ? "protected" : "private");
+    }
+
     @Override
     public void processOpts() {
         super.processOpts();
@@ -137,7 +157,6 @@ public void processOpts() {
         // <supportingFilesToGenerate>ApiUtil.java present or not</supportingFilesToGenerate>
         // <generateSupportingFiles>true or false</generateSupportingFiles>
         final String supFiles = GlobalSettings.getProperty(CodegenConstants.SUPPORTING_FILES);
-        // cleared by <generateSuportingFiles>false</generateSuportingFiles>
         final boolean useApiUtil = supFiles != null && (supFiles.isEmpty()
                 ? needApiUtil() // set to empty by <generateSuportingFiles>true</generateSuportingFiles>
                 : supFiles.contains("ApiUtil.java")); // set by <supportingFilesToGenerate/>
@@ -146,37 +165,31 @@ public void processOpts() {
             this.supportingFiles
                     .removeIf(sf -> "apiUtil.mustache".equals(sf.getTemplateFile()));
         }
-
         writePropertyBack("useApiUtil", useApiUtil);
-
         final var serializerTemplate = "BigDecimalCustomSerializer";
         this.supportingFiles.add(new SupportingFile(
                 serializerTemplate + MUSTACHE_EXTENSION,
                 (sourceFolder + File.separator + modelPackage).replace(".", File.separator),
                 serializerTemplate + JAVA_EXTENSION
         ));
-
-        // Adding Webhook related models to supporting files
         final var webhookResponseTemplate = "WebhookResponse";
         this.supportingFiles.add(new SupportingFile(webhookResponseTemplate + MUSTACHE_EXTENSION,
                 (sourceFolder + File.separator + modelPackage).replace(".", File.separator),
                 webhookResponseTemplate + JAVA_EXTENSION));
-
         final var servletContentTemplate = "ServletContent";
         this.supportingFiles.add(new SupportingFile(servletContentTemplate + MUSTACHE_EXTENSION,
                 (sourceFolder + File.separator + modelPackage).replace(".", File.separator),
                 servletContentTemplate + JAVA_EXTENSION));
-
         final var posthookRequestTemplate = "PosthookRequest";
         this.supportingFiles.add(new SupportingFile(posthookRequestTemplate + MUSTACHE_EXTENSION,
                 (sourceFolder + File.separator + modelPackage).replace(".", File.separator),
                 posthookRequestTemplate + JAVA_EXTENSION));
-
         final var prehookRequestTemplate = "PrehookRequest";
         this.supportingFiles.add(new SupportingFile(prehookRequestTemplate + MUSTACHE_EXTENSION,
                 (sourceFolder + File.separator + modelPackage).replace(".", File.separator),
                 prehookRequestTemplate + JAVA_EXTENSION));
-
+        // Centralized config boolean handling
+        handleConfigBooleans();
         this.additionalProperties.put("indent4", new IndentedLambda(4, " ", true, true));
         this.additionalProperties.put("newLine4", new BoatSpringCodeGen.NewLineIndent(4, " "));
         this.additionalProperties.put("indent8", new IndentedLambda(8, " ", true, true));

boat-scaffold/src/test/java/com/backbase/oss/codegen/java/BoatWebhooksCodeGenTests.java

@@ -10,12 +10,13 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.openapitools.codegen.CodegenModel;;
+import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.DefaultGenerator;
 import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.CodegenParameter;
 
 import java.io.File;
 import java.io.IOException;
@@ -59,7 +60,7 @@ void newLineIndent() throws IOException {
     }
 
     @Test
-    void addServletRequestTestFromOperation(){
+    void addServletRequestTestFromOperation() {
         final BoatWebhooksCodeGen gen = new BoatWebhooksCodeGen();
         gen.addServletRequest = true;
         CodegenOperation co = gen.fromOperation("/test", "POST", new Operation(), null);
@@ -103,7 +104,7 @@ void testReplaceBeanValidationCollectionType() {
         codegenProperty.baseName = "request"; // not a response
 
         String result = codegen.replaceBeanValidationCollectionType(
-                codegenProperty,"Set<com.backbase.dbs.arrangement.commons.model.TranslationItemDto>");
+                codegenProperty, "Set<com.backbase.dbs.arrangement.commons.model.TranslationItemDto>");
         assertEquals("Set<@Valid com.backbase.dbs.arrangement.commons.model.TranslationItemDto>", result);
     }
 
@@ -184,7 +185,7 @@ void postProcessModelProperty_shouldNotAddAnnotationForNonBigDecimal() {
         CodegenProperty property = new CodegenProperty();
         property.baseType = "String";
         property.openApiType = "string";
-        property.dataFormat = "string";
+        property.dataFormat = "number";
 
         codegen.postProcessModelProperty(model, property);
 
@@ -221,5 +222,18 @@ void processOpts_shouldRemoveApiUtilSupportingFileWhenNotUsed() {
         }
     }
 
+    @Test
+    void postProcessParameter_setsBaseTypeForContainer() {
+        BoatWebhooksCodeGen codeGen = new BoatWebhooksCodeGen();
+        codeGen.setReactive(false);
+        CodegenParameter param = new CodegenParameter();
+        param.isContainer = true;
+        param.isMap = false;
+        param.dataType = "List<String>";
+        param.baseType = null;
 
+        codeGen.postProcessParameter(param);
+
+        assertEquals("List", param.baseType, "Base type should be extracted from dataType for containers");
+    }
 }