Merge branch 'main' into chore/0.18.1-snapshot-exampleobject-fix

Author: AnjBB72

README.md

@@ -16,11 +16,14 @@ It currently consists of
 # Release Notes
 BOAT is still under development and subject to change.
 
-## 0.18.1
+## 0.18.2
 * Spring generator: fixed `@ExampleObject` rendering in `api.mustache` by unwrapping escaped quotes in example payloads.
 * Added `unwrapEscapedQuotes` lambda to `boat-spring` generator templates to prevent malformed annotation values (for example `value = "\"{...}"`).
 * Added a regression test to verify generated Spring API interfaces include valid `@ExampleObject` annotation values and remain parseable Java code.
 
+## 0.18.1
+* Use Jackson3 imports in `BigDecimalCustomSerializer.class` when using `useJackson3` set to `true`
+
 ## 0.18.0
 * openapi-generator `7.20.0` baseline (Spring Boot 4, Jackson 3)
 * moved Java and JavaSpring templates to `7.20.0` adding remaing custom features

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

@@ -51,6 +51,7 @@ public class BoatSpringCodeGen extends SpringCodegen {
     public static final String UNWRAP_ESCAPED_QUOTES = "unwrapEscapedQuotes";
 
     private static final String VENDOR_EXTENSION_NOT_NULL = "x-not-null";
+    private static final String JSON_SERIALIZE = "JsonSerialize";
 
     static class NewLineIndent implements Mustache.Lambda {
 
@@ -224,8 +225,8 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo
     }
 
     /**
-     * "overridden" to fix invalid code when the data type is a collection of a fully qualified classname.
-     * eg. <code>Set<@Valid com.backbase.dbs.arrangement.commons.model.TranslationItemDto></code>
+     * "overridden" to fix invalid code when the data type is a collection of a fully qualified classname. eg. <code>Set<@Valid
+     * com.backbase.dbs.arrangement.commons.model.TranslationItemDto></code>
      *
      * @param itemsProperty
      * @param dataType
@@ -332,7 +333,12 @@ public void processOpts() {
             serializerTemplate + ".java"
         ));
         this.importMapping.put(serializerTemplate, modelPackage + "." + serializerTemplate);
-        this.importMapping.put("JsonSerialize", "com.fasterxml.jackson.databind.annotation.JsonSerialize");
+
+        if (this.additionalProperties.containsKey(USE_JACKSON_3)) {
+            this.importMapping.put(JSON_SERIALIZE, "tools.jackson.databind.annotation.JsonSerialize");
+        } else {
+            this.importMapping.put(JSON_SERIALIZE, "com.fasterxml.jackson.databind.annotation.JsonSerialize");
+        }
 
         if (this.additionalProperties.containsKey(ADD_SERVLET_REQUEST)) {
             this.addServletRequest = convertPropertyToBoolean(ADD_SERVLET_REQUEST);
@@ -405,7 +411,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
         if (shouldSerializeBigDecimalAsString(property)) {
             property.vendorExtensions.put("x-extra-annotation", "@JsonSerialize(using = BigDecimalCustomSerializer.class)");
             model.imports.add("BigDecimalCustomSerializer");
-            model.imports.add("JsonSerialize");
+            model.imports.add(JSON_SERIALIZE);
         }
     }
 

boat-scaffold/src/main/templates/boat-spring/BigDecimalCustomSerializer.mustache

@@ -1,6 +1,11 @@
 package {{modelPackage}};
 
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializerBase;
+{{#useJackson3}}
+  import tools.jackson.databind.ser.std.ToStringSerializerBase;
+{{/useJackson3}}
+{{^useJackson3}}
+  import com.fasterxml.jackson.databind.ser.std.ToStringSerializerBase;
+{{/useJackson3}}
 import java.math.BigDecimal;
 
 public class BigDecimalCustomSerializer extends ToStringSerializerBase {