[JAVA] fix jspecify in java builders and toIndentedString

.github/workflows/samples-java-client-jdk17.yaml

@@ -11,6 +11,7 @@ on:
       - samples/client/petstore/java/apache-httpclient-jackson3/**
       - samples/client/petstore/java/native-jackson3-jspecify/**
       - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/**
+      - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/**
       - samples/client/others/java/webclient-sealedInterface/**
       - samples/client/others/java/webclient-sealedInterface_3_1/**
       - samples/client/petstore/java/webclient-useSingleRequestParameter/**
@@ -30,6 +31,7 @@ on:
       - samples/client/petstore/java/apache-httpclient-jackson3/**
       - samples/client/petstore/java/native-jackson3-jspecify/**
       - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/**
+      - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/**
       - samples/client/others/java/webclient-sealedInterface/**
       - samples/client/others/java/webclient-sealedInterface_3_1/**
       - samples/client/petstore/java/webclient-useSingleRequestParameter/**
@@ -57,6 +59,7 @@ jobs:
           - samples/client/petstore/java/restclient-springBoot4-jackson2
           - samples/client/petstore/java/restclient-springBoot4-jackson3
           - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify
+          - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable
           - samples/client/petstore/java/native-jackson3-jspecify
           - samples/client/petstore/java/restclient-swagger2
           - samples/client/petstore/java/restclient-useSingleRequestParameter

.github/workflows/samples-spring-jdk17.yaml

@@ -9,6 +9,8 @@ on:
       - samples/openapi3/server/petstore/springboot-3/**
       - samples/openapi3/server/petstore/springboot-4/**
       - samples/openapi3/server/petstore/springboot-4-jspecify/**
+      - samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/**
+      - samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/**
       - samples/server/petstore/springboot-api-response-examples/**
       - samples/server/petstore/springboot-lombok-data/**
       - samples/server/petstore/springboot-lombok-tostring/**
@@ -27,6 +29,8 @@ on:
       - samples/openapi3/server/petstore/springboot-3/**
       - samples/openapi3/server/petstore/springboot-4/**
       - samples/openapi3/server/petstore/springboot-4-jspecify/**
+      - samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/**
+      - samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/**
       - samples/server/petstore/springboot-api-response-examples/**
       - samples/server/petstore/springboot-lombok-data/**
       - samples/server/petstore/springboot-lombok-tostring/**
@@ -53,6 +57,8 @@ jobs:
           - samples/openapi3/server/petstore/springboot-3
           - samples/openapi3/server/petstore/springboot-4
           - samples/openapi3/server/petstore/springboot-4-jspecify
+          - samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable
+          - samples/openapi3/server/petstore/springboot-4-jspecify-useOptional
           - samples/server/petstore/springboot-api-response-examples
           - samples/server/petstore/springboot-lombok-data
           - samples/server/petstore/springboot-lombok-tostring

bin/configs/java-native-jackson3-jspecify.yaml

@@ -7,11 +7,11 @@ validateSpec: false
 additionalProperties:
   artifactId: petstore-native-jackson3
   hideGenerationTimestamp: "true"
-  generateBuilders: true
   useReflectionEqualsHashCode: "true"
   useJackson3: "true"
   openApiNullable: "false"
   useJspecify: true
+  generateBuilders: true
 typeMappings:
   OffsetDateTime: java.time.Instant
-  BigDecimal: java.math.BigDecimal
+  BigDecimal: java.math.BigDecimal

bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml

@@ -0,0 +1,19 @@
+generatorName: java
+outputDir: samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable
+library: restclient
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+validateSpec: false
+additionalProperties:
+  artifactId: petstore-restclient
+  hideGenerationTimestamp: "true"
+  containerDefaultToNull: "true"
+  useSpringBoot4: true
+  useJackson3: true
+  openApiNullable: true
+  useJspecify: true
+  generateBuilders: true
+  generateConstructorWithAllArgs: true
+typeMappings:
+  OffsetDateTime: java.time.Instant
+  BigDecimal: java.math.BigDecimal

bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml

@@ -12,6 +12,8 @@ additionalProperties:
   useJackson3: true
   openApiNullable: false
   useJspecify: true
+  generateBuilders: true
+  generateConstructorWithAllArgs: true
 typeMappings:
   OffsetDateTime: java.time.Instant
   BigDecimal: java.math.BigDecimal

bin/configs/java-resttemplate-springBoot4-jackson2.yaml

@@ -9,4 +9,3 @@ additionalProperties:
   containerDefaultToNull: "true"
   useJakartaEe: true
   useSpringBoot4: true
-

bin/configs/java-resttemplate-springBoot4-jackson3-jspecify.yaml

@@ -13,6 +13,7 @@ additionalProperties:
   useJackson3: true
   openApiNullable: false
   useJspecify: true
+  generateBuilders: true
 typeMappings:
   OffsetDateTime: java.time.Instant
   BigDecimal: java.math.BigDecimal

bin/configs/java-webclient-springBoot4-jackson3-jspecify.yaml

@@ -12,6 +12,7 @@ additionalProperties:
   useJackson3: true
   openApiNullable: false
   useJspecify: true
+  generateBuilders: true
 typeMappings:
   OffsetDateTime: java.time.Instant
   BigDecimal: java.math.BigDecimal

bin/configs/spring-boot-4-jspecify-openapiNullable.yaml

@@ -0,0 +1,24 @@
+generatorName: spring
+library: spring-boot
+outputDir: samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+validateSpec: false
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  interfaceOnly: true
+  artifactId: springboot
+  snapshotVersion: "true"
+  useSpringBoot4: true
+  useJackson3: true
+  useBeanValidation: true
+  withXml: true
+  hideGenerationTimestamp: "true"
+  generateConstructorWithAllArgs: true
+  generateBuilders: true
+  openApiNullable: true
+  useJspecify: true
+typeMappings:
+  OffsetDateTime: java.time.Instant
+  BigDecimal: java.math.BigDecimal

bin/configs/spring-boot-4-jspecify-useOptional.yaml

@@ -0,0 +1,25 @@
+generatorName: spring
+library: spring-boot
+outputDir: samples/openapi3/server/petstore/springboot-4-jspecify-useOptional
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+validateSpec: false
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  interfaceOnly: true
+  artifactId: springboot
+  snapshotVersion: "true"
+  useSpringBoot4: true
+  useJackson3: true
+  useBeanValidation: true
+  withXml: true
+  hideGenerationTimestamp: "true"
+  generateConstructorWithAllArgs: true
+  generateBuilders: true
+  useOptional: true
+  optionalAcceptNullable: true
+  useJspecify: true
+typeMappings:
+  OffsetDateTime: java.time.Instant
+  BigDecimal: java.math.BigDecimal

bin/configs/spring-boot-4-jspecify.yaml

@@ -18,4 +18,7 @@ additionalProperties:
   generateConstructorWithAllArgs: true
   generateBuilders: true
   openApiNullable: false
-  useJspecify: true
+  useJspecify: true
+typeMappings:
+  OffsetDateTime: java.time.Instant
+  BigDecimal: java.math.BigDecimal

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -2866,7 +2866,7 @@ protected ImmutableMap.Builder<String, Mustache.Lambda> addMustacheLambdas() {
         Mustache.Lambda jSpecifyDatatypeLambda = (fragment, writer) -> {
             String dataType = fragment.execute();
             if (jSpecifyNullableLambda.isSetAndClear()) {
-                int idx = dataType.lastIndexOf('.');
+                int idx = getLastIndex(dataType);
                 if (idx > 0) {
                     // generate declaration like java.time.@Nullable Timestamp
                     writer.write(dataType.substring(0, idx + 1));
@@ -2886,6 +2886,14 @@ protected ImmutableMap.Builder<String, Mustache.Lambda> addMustacheLambdas() {
 
     }
 
+    private int getLastIndex(String dataType) {
+        int index = dataType.indexOf('<');
+        if (index >= 0) {
+            dataType = dataType.substring(0, index);
+        }
+        return dataType.lastIndexOf('.');
+    }
+
     /**
      * for Jspecify, remove @Nullable before the datatype and set keptNullable to true if done.
      */

modules/openapi-generator/src/main/resources/Java/javaBuilder.mustache

@@ -14,7 +14,7 @@ public static class Builder {{#parentModel}}extends {{classname}}.Builder {{/par
     }
 
     {{#vars}}
-    public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) {
+    public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) {
     {{#vendorExtensions.x-is-jackson-optional-nullable}}
       this.instance.{{name}} = JsonNullable.<{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}>of({{name}});
     {{/vendorExtensions.x-is-jackson-optional-nullable}}
@@ -32,7 +32,7 @@ public static class Builder {{#parentModel}}extends {{classname}}.Builder {{/par
     {{/vars}}
 
 {{#parentVars}}
-    public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) { // inherited: {{isInherited}}
+    public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) { // inherited: {{isInherited}}
       super.{{name}}({{name}});
       return this;
    }

modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache

@@ -317,7 +317,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) {
+  private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 {{#supportUrlQuery}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache

@@ -337,7 +337,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache

@@ -337,7 +337,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 

modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache

@@ -341,7 +341,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 {{#supportUrlQuery}}

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache

@@ -254,7 +254,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 

modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache

@@ -363,7 +363,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) {
+  private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 {{#supportUrlQuery}}

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache

@@ -363,7 +363,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) {
+  private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 {{#supportUrlQuery}}

modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache

@@ -363,7 +363,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) {
+  private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 {{#supportUrlQuery}}

modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache

@@ -1 +1 @@
-{{#lambda.trim}}{{>nullable_var_annotations}} {{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/lambda.trim}}
+{{#lambda.trim}}{{>nullable_var_annotations}} {{>nullableDatatypeWithEnum}}{{/lambda.trim}}

modules/openapi-generator/src/main/resources/Java/nullableArgument_builder.mustache

@@ -0,0 +1 @@
+{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/lambda.jSpecifyNullable}}{{#lambda.jSpecifyDatatype}}{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}{{/useJspecify}}

modules/openapi-generator/src/main/resources/Java/nullable_var_annotations.mustache

@@ -1 +1 @@
-{{#lambda.jSpecifyNullable}}{{#required}}{{#isNullable}}@{{javaxPackage}}.annotation.Nullable{{/isNullable}}{{^useJspecify}}{{^isNullable}}@{{javaxPackage}}.annotation.Nonnull{{/isNullable}}{{/useJspecify}}{{/required}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/lambda.jSpecifyNullable}}
+{{^useJspecify}}{{#required}}{{#isNullable}}@{{javaxPackage}}.annotation.Nullable{{/isNullable}}{{^isNullable}}@{{javaxPackage}}.annotation.Nonnull{{/isNullable}}{{/required}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/useJspecify}}{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/lambda.jSpecifyNullable}}{{/useJspecify}}

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -362,7 +362,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) {
+  private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
 {{#supportUrlQuery}}

modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache

@@ -24,7 +24,7 @@
     {{#deprecated}}
     @Deprecated
     {{/deprecated}}
-    public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) {
+    public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) {
       this.instance.{{name}}({{name}});
       return this;
     }
@@ -37,7 +37,7 @@
 {{/vars}}
 {{#parentVars}}
     @Override
-    public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) {
+    public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) {
       this.instance.{{name}}({{name}});
       return this;
     }

modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation.mustache

@@ -1 +1 @@
-{{#lambda.jSpecifyNullable}}{{^required}}{{^defaultValue}}{{^useOptional}}{{#openApiNullable}}{{^isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{^openApiNullable}}@Nullable {{/openApiNullable}}{{/useOptional}}{{/defaultValue}}{{#defaultValue}}{{^openApiNullable}}{{#isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{/defaultValue}}{{/required}}{{/lambda.jSpecifyNullable}}
+{{#paramName}}{{>nullableAnnotation_default}}{{/paramName}}{{^paramName}}{{>nullableAnnotation_jspecify}}{{^useJspecify}}{{!backward compatibility}}{{>nullableAnnotation_default}}{{/useJspecify}}{{/paramName}}

modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_default.mustache

@@ -0,0 +1 @@
+{{#lambda.jSpecifyNullable}}{{^required}}{{^defaultValue}}{{^useOptional}}{{#openApiNullable}}{{^isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{^openApiNullable}}@Nullable {{/openApiNullable}}{{/useOptional}}{{/defaultValue}}{{#defaultValue}}{{^openApiNullable}}{{#isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{/defaultValue}}{{/required}}{{/lambda.jSpecifyNullable}}

modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_jspecify.mustache

@@ -0,0 +1 @@
+{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}{{^useOptional}}{{#openApiNullable}}{{^isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{^openApiNullable}}@Nullable {{/openApiNullable}}{{/useOptional}}{{/required}}{{/lambda.jSpecifyNullable}}{{/useJspecify}}

modules/openapi-generator/src/main/resources/JavaSpring/nullableArgument_builder.mustache

@@ -0,0 +1 @@
+{{#useJspecify}}{{^required}}{{#lambda.jSpecifyNullable}}{{^useOptional}}@Nullable {{/useOptional}}{{#useOptional}}{{#optionalAcceptNullable}}@Nullable {{/optionalAcceptNullable}}{{/useOptional}}{{/lambda.jSpecifyNullable}}{{/required}}{{#lambda.jSpecifyDatatype}}{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}{{/useJspecify}}

modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache

@@ -134,7 +134,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   /**
    * Constructor with all args parameters
    */
-  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@Nullable {{/required}}{{/lambda.jSpecifyNullable}}{{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{>nullableAnnotation}}{{{datatypeWithEnum}}}{{/useJspecify}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
   {{#parent}}
       super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
   {{/parent}}
@@ -153,7 +153,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{^lombok.Data}}
 
   {{! begin feature: fluent setter methods }}
-  public {{classname}} {{name}}({{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}) {
+  public {{classname}} {{name}}({{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}{{^useOptional}}@Nullable {{/useOptional}}{{#useOptional}}{{#optionalAcceptNullable}}@Nullable {{/optionalAcceptNullable}}{{/useOptional}}{{/required}}{{/lambda.jSpecifyNullable}}{{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{>nullableAnnotation_default}}{{{datatypeWithEnum}}}{{/useJspecify}} {{name}}) {
     {{#openApiNullable}}
     this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of{{#optionalAcceptNullable}}Nullable{{/optionalAcceptNullable}}({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}};
     {{/openApiNullable}}
@@ -348,7 +348,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString({{>nullableAnnotation}}Object o) {
+  private String toIndentedString(@Nullable Object o) {
     return o == null ? "null" : o.toString().replace("\n", "\n    ");
   }
   {{/lombok.ToString}}