[Spring-http-interface] JSpecify: fix api argument with default value

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

@@ -1 +1 @@
-{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}@Valid{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>nullableAnnotation}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}
+{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}@Valid{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>nullableAnnotation_apiArgument}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}

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

@@ -1 +1 @@
-{{#isCookieParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @CookieValue(name = "{{baseName}}"{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isCookieParam}}
+{{#isCookieParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @CookieValue(name = "{{baseName}}"{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>nullableAnnotation_apiArgument}}{{>optionalDataType}} {{paramName}}{{/isCookieParam}}

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

@@ -1 +1 @@
-{{#isHeaderParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isHeaderParam}}
+{{#isHeaderParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}} @RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{>nullableAnnotation_apiArgument}}{{>optionalDataType}} {{paramName}}{{/isHeaderParam}}

modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/nullableAnnotation_apiArgument.mustache

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

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

@@ -1 +1 @@
-{{#paramName}}{{>nullableAnnotation_default}}{{/paramName}}{{^paramName}}{{>nullableAnnotation_jspecify}}{{^useJspecify}}{{!backward compatibility}}{{>nullableAnnotation_default}}{{/useJspecify}}{{/paramName}}
+{{#useJspecify}}{{>nullableAnnotation_jspecify}}{{/useJspecify}}{{^useJspecify}}{{!backward compatibility}}{{>nullableAnnotation_default}}{{/useJspecify}}

modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_apiArgument.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

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

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

@@ -1 +1 @@
-{{#isPathParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{>paramDoc}} @PathVariable("{{baseName}}"){{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isPathParam}}
+{{#isPathParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{>paramDoc}} @PathVariable("{{baseName}}"){{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>nullableAnnotation_apiArgument}}{{>optionalDataType}} {{paramName}}{{/isPathParam}}

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

@@ -1 +1 @@
-{{#isQueryParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/isModel}}{{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isQueryParam}}
+{{#isQueryParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/isModel}}{{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>nullableAnnotation_apiArgument}}{{>optionalDataType}} {{paramName}}{{/isQueryParam}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -7224,14 +7224,29 @@ public void testJspecify(String library, int springBootVersion) throws IOExcepti
                         "javax.annotation.Nullable",
                         "jakarta.annotation.Nullable")
                 .assertMethod("getRequiredDt").assertMethodAnnotations().containsWithName("NotNull").containsWithName("Valid");
-        JavaFileAssert.assertThat(files.get("FooApi.java"))
+        JavaFileAssert fooApiAssert = JavaFileAssert.assertThat(files.get("FooApi.java"))
                 .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType()
                 .fileContains(
                         "java.time.@Nullable Instant dtParam",
                         "java.time.@Nullable Instant dtQuery",
-                        "java.time.@Nullable Instant dtCookie",
-                        " @RequestParam(value = \"color\", required = false, defaultValue = \"red\") String color"
-                );
+                        "java.time.@Nullable Instant dtCookie");
+
+        JavaFileAssert nbleApi = JavaFileAssert.assertThat(files.get("NbleApi.java"));
+        // SPRING_HTTP_INTERFACE has other requirements for default in api arguments
+        if (SPRING_HTTP_INTERFACE.equals(library)) {
+            nbleApi.fileContains(
+                    ") String mandatory",
+                    ") @Nullable String optional");
+            fooApiAssert.fileContains(
+                        "@RequestParam(value = \"color\", required = false, defaultValue = \"red\") @Nullable String color");
+        } else {
+            nbleApi.fileContains(
+                    ") String mandatory",
+                    ") @Nullable String optional");
+            fooApiAssert.fileContains(
+                    "@RequestParam(value = \"color\", required = false, defaultValue = \"red\") String color");
+        }
+
         JavaFileAssert.assertThat(files.get("RequiredAndNullable.java"))
                 .fileContains(
                         "private @Nullable String str = null;",
@@ -7314,13 +7329,7 @@ public void testJspecify_openapiNullable(String library, int springBootVersion)
                         "javax.annotation.Nullable",
                         "jakarta.annotation.Nullable")
                 .assertMethod("getRequiredDt").assertMethodAnnotations().containsWithName("NotNull").containsWithName("Valid");
-        JavaFileAssert.assertThat(files.get("FooApi.java"))
-                .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType()
-                .fileContains(
-                        "java.time.@Nullable Instant dtParam",
-                        "java.time.@Nullable Instant dtQuery",
-                        "java.time.@Nullable Instant dtCookie"
-                );
+
         JavaFileAssert.assertThat(files.get("RequiredAndNullable.java"))
                 .fileContains(
                         "private JsonNullable<String> str = JsonNullable.<String>undefined();",
@@ -7344,6 +7353,23 @@ public void testJspecify_openapiNullable(String library, int springBootVersion)
                     .doesNotContainWithName("Nullable")
                     .doesImportAnnotation("org.jspecify.annotations.Nullable");
         }
+        JavaFileAssert.assertThat(files.get("FooApi.java"))
+                .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType()
+                .fileContains(
+                        "java.time.@Nullable Instant dtParam",
+                        "java.time.@Nullable Instant dtQuery",
+                        "java.time.@Nullable Instant dtCookie");
+        JavaFileAssert nbleApi = JavaFileAssert.assertThat(files.get("NbleApi.java"));
+        if (SPRING_HTTP_INTERFACE.equals(library)) {
+            nbleApi .fileContains(
+                    "@RequestParam(value = \"mandatory\", required = true) String mandatory",
+                "@RequestParam(value = \"optional\", required = false) @Nullable String optional");
+        } else {
+            // incorrect generation for required=false, nullable=true?
+            nbleApi .fileContains(
+                    "@RequestParam(value = \"mandatory\", required = true) String mandatory",
+                    "@RequestParam(value = \"optional\", required = false) String optional");
+        }
     }
 
     @DataProvider(name = "jspecifyLibrariesUseOptional")
@@ -7439,7 +7465,10 @@ public void testJspecify_useOptional(String library, int springBootVersion, bool
                     .doesNotContainWithName("Nullable")
                     .doesImportAnnotation("org.jspecify.annotations.Nullable");
         }
-    }
+        JavaFileAssert.assertThat(files.get("NbleApi.java")).fileContains(
+                "@RequestParam(value = \"mandatory\", required = true) String mandatory",
+                "@RequestParam(value = \"optional\", required = false) Optional<String> optional");
+        }
 
     // -------------------------------------------------------------------------
     // autoXSpringPaginated tests

modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml

@@ -47,10 +47,29 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Foo'
-  /requiredAndNullable:
+  /nble:
+    get:
+      tags:
+        - nble
+      parameters:
+        - name: optional
+          in: query
+          required: false
+          schema:
+            type: string
+            nullable: true
+        - name: mandatory
+          in: query
+          required: true
+          schema:
+            type: string
+            nullable: true
+      responses:
+        default:
+          description: OK
     post:
       tags:
-        - requiredAndNullable
+        - nble
       requestBody:
         required: true
         description: bodyWithRequiredAndNullableAttributes
@@ -65,6 +84,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/RequiredAndNullable'
+
   /upload:
     post:
       tags:

samples/client/petstore/java/native-jackson3-jspecify/.openapi-generator/FILES

@@ -9,8 +9,8 @@ docs/FileApi.md
 docs/FileContent.md
 docs/Foo.md
 docs/FooApi.md
+docs/NbleApi.md
 docs/RequiredAndNullable.md
-docs/RequiredAndNullableApi.md
 docs/UploadApi.md
 git_push.sh
 gradle.properties
@@ -34,7 +34,7 @@ src/main/java/org/openapitools/client/ServerConfiguration.java
 src/main/java/org/openapitools/client/ServerVariable.java
 src/main/java/org/openapitools/client/api/FileApi.java
 src/main/java/org/openapitools/client/api/FooApi.java
-src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java
+src/main/java/org/openapitools/client/api/NbleApi.java
 src/main/java/org/openapitools/client/api/UploadApi.java
 src/main/java/org/openapitools/client/api/package-info.java
 src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java

samples/client/petstore/java/native-jackson3-jspecify/README.md

@@ -111,8 +111,10 @@ Class | Method | HTTP request | Description
 *FileApi* | [**fileIdGetWithHttpInfo**](docs/FileApi.md#fileIdGetWithHttpInfo) | **GET** /file/{id} | 
 *FooApi* | [**fooDtParamGet**](docs/FooApi.md#fooDtParamGet) | **GET** /foo/{dtParam} | 
 *FooApi* | [**fooDtParamGetWithHttpInfo**](docs/FooApi.md#fooDtParamGetWithHttpInfo) | **GET** /foo/{dtParam} | 
-*RequiredAndNullableApi* | [**requiredAndNullablePost**](docs/RequiredAndNullableApi.md#requiredAndNullablePost) | **POST** /requiredAndNullable | 
-*RequiredAndNullableApi* | [**requiredAndNullablePostWithHttpInfo**](docs/RequiredAndNullableApi.md#requiredAndNullablePostWithHttpInfo) | **POST** /requiredAndNullable | 
+*NbleApi* | [**nbleGet**](docs/NbleApi.md#nbleGet) | **GET** /nble | 
+*NbleApi* | [**nbleGetWithHttpInfo**](docs/NbleApi.md#nbleGetWithHttpInfo) | **GET** /nble | 
+*NbleApi* | [**nblePost**](docs/NbleApi.md#nblePost) | **POST** /nble | 
+*NbleApi* | [**nblePostWithHttpInfo**](docs/NbleApi.md#nblePostWithHttpInfo) | **POST** /nble | 
 *UploadApi* | [**uploadFilesPost**](docs/UploadApi.md#uploadFilesPost) | **POST** /uploadFiles | 
 *UploadApi* | [**uploadFilesPostWithHttpInfo**](docs/UploadApi.md#uploadFilesPostWithHttpInfo) | **POST** /uploadFiles | 
 *UploadApi* | [**uploadPost**](docs/UploadApi.md#uploadPost) | **POST** /upload | 

samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml

@@ -61,7 +61,32 @@ paths:
       - foo
       x-accepts:
       - application/json
-  /requiredAndNullable:
+  /nble:
+    get:
+      parameters:
+      - explode: true
+        in: query
+        name: optional
+        required: false
+        schema:
+          nullable: true
+          type: string
+        style: form
+      - explode: true
+        in: query
+        name: mandatory
+        required: true
+        schema:
+          nullable: true
+          type: string
+        style: form
+      responses:
+        default:
+          description: OK
+      tags:
+      - nble
+      x-accepts:
+      - application/json
     post:
       requestBody:
         content:
@@ -78,7 +103,7 @@ paths:
                 $ref: "#/components/schemas/RequiredAndNullable"
           description: response
       tags:
-      - requiredAndNullable
+      - nble
       x-content-type: application/json
       x-accepts:
       - application/json