diff --git a/modules/openapi-generator/src/main/resources/Java/api.mustache b/modules/openapi-generator/src/main/resources/Java/api.mustache index 98f6d0cbaea..8ce0ae1c463 100644 --- a/modules/openapi-generator/src/main/resources/Java/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/api.mustache @@ -44,7 +44,7 @@ public class {{classname}} { * {{summary}} * {{notes}} {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} {{#returnType}} * @return {{.}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache index ac6ffcf60ef..e3f914f1d9b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache @@ -50,7 +50,7 @@ public class {{classname}} { * {{summary}} * {{notes}} {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} {{#returnType}} * @return {{returnType}} @@ -76,7 +76,7 @@ public class {{classname}} { * {{summary}} * {{notes}} {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} * @param additionalHeaders additionalHeaders for this call {{#returnType}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache index cd1eca2b879..21b8c3edccd 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache @@ -162,7 +162,7 @@ public class {{classname}} { * {{summary}} * {{notes}} {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} {{#returnType}} * @return {{#asyncNative}}CompletableFuture<{{/asyncNative}}{{returnType}}{{#asyncNative}}>{{/asyncNative}} @@ -225,7 +225,7 @@ public class {{classname}} { * {{summary}} * {{notes}} {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} * @return {{#asyncNative}}CompletableFuture<{{/asyncNative}}ApiResponse<{{returnType}}{{^returnType}}Void{{/returnType}}>{{#asyncNative}}>{{/asyncNative}} * @throws ApiException if fails to make API call @@ -548,7 +548,7 @@ public class {{classname}} { private {{{dataType}}} {{paramName}}; // {{description}} (required) {{/requiredParams}} {{#optionalParams}} - private {{{dataType}}} {{paramName}}; // {{description}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}} + private {{{dataType}}} {{paramName}}; // {{description}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}) {{/optionalParams}} private API{{operationId}}Request(Builder builder) { diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api.mustache index f0d7ee5618a..f43195f41cf 100644 --- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api.mustache +++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api.mustache @@ -25,7 +25,7 @@ public interface {{classname}} { * {{.}} {{/notes}} {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} * @return {@code {{>operationResponseSig}}} {{#isDeprecated}} diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache index bf07918ba34..3046b480a28 100644 --- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache +++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache @@ -76,7 +76,7 @@ public class {{classname}}Impl implements {{classname}} { * Optional customization point for subclasses. * {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} * @return WebClientRequestBuilder for {{operationId}} */ @@ -161,7 +161,7 @@ public class {{classname}}Impl implements {{classname}} { * * @param webClientRequestBuilder the request builder to use for submitting the request {{#allParams}} - * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}} {{/allParams}} * @return {@code {{>operationResponseSig}}} for the submitted request */ diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java index 71cfe99bf26..2d20c165f0a 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java @@ -427,7 +427,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @return String * @throws ApiException if fails to make API call */ @@ -439,7 +439,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @param additionalHeaders additionalHeaders for this call * @return String * @throws ApiException if fails to make API call @@ -497,7 +497,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @return String * @throws ApiException if fails to make API call */ @@ -509,7 +509,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @param additionalHeaders additionalHeaders for this call * @return String * @throws ApiException if fails to make API call diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java index dedef311642..554f8cf6914 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java @@ -570,7 +570,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @return String * @throws ApiException if fails to make API call */ @@ -582,7 +582,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @return ApiResponse<String> * @throws ApiException if fails to make API call */ @@ -660,7 +660,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @return String * @throws ApiException if fails to make API call */ @@ -672,7 +672,7 @@ public class QueryApi { /** * Test query parameter(s) * Test query parameter(s) - * @param queryObject (optional + * @param queryObject (optional) * @return ApiResponse<String> * @throws ApiException if fails to make API call */ diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java index 429ada21928..a7f954df9a6 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java @@ -111,14 +111,14 @@ public interface FakeApi { /** * To test enum parameters * To test enum parameters - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumQueryModelArray (optional - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumQueryModelArray (optional) + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return {@code ApiResponse} */ diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java index 8ea61f3eb2d..8f6e7f539c0 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -690,14 +690,14 @@ public class FakeApiImpl implements FakeApi { * Creates a {@code WebClientRequestBuilder} for the testEnumParameters operation. * Optional customization point for subclasses. * - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumQueryModelArray (optional - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumQueryModelArray (optional) + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return WebClientRequestBuilder for testEnumParameters */ @@ -733,14 +733,14 @@ public class FakeApiImpl implements FakeApi { * Optional customization point for subclasses. * * @param webClientRequestBuilder the request builder to use for submitting the request - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumQueryModelArray (optional - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumQueryModelArray (optional) + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return {@code ApiResponse} for the submitted request */ @@ -998,7 +998,7 @@ public class FakeApiImpl implements FakeApi { * @param url (required) * @param context (required) * @param allowEmpty (required) - * @param language (optional + * @param language (optional) * @return WebClientRequestBuilder for testQueryParameterCollectionFormat */ protected WebClientRequestBuilder testQueryParameterCollectionFormatRequestBuilder(List pipe, List ioutil, List http, List url, List context, String allowEmpty, Map language) { @@ -1032,7 +1032,7 @@ public class FakeApiImpl implements FakeApi { * @param url (required) * @param context (required) * @param allowEmpty (required) - * @param language (optional + * @param language (optional) * @return {@code ApiResponse} for the submitted request */ protected ApiResponse testQueryParameterCollectionFormatSubmit(WebClientRequestBuilder webClientRequestBuilder, List pipe, List ioutil, List http, List url, List context, String allowEmpty, Map language) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java index f979fe92718..87df57f1cf3 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1136,14 +1136,14 @@ if (paramCallback != null) /** * To test enum parameters * To test enum parameters - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumQueryModelArray (optional - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumQueryModelArray (optional) + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException if fails to make API call */ @@ -1155,14 +1155,14 @@ if (paramCallback != null) /** * To test enum parameters * To test enum parameters - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumQueryModelArray (optional - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumQueryModelArray (optional) + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param additionalHeaders additionalHeaders for this call * @throws ApiException if fails to make API call @@ -1631,7 +1631,7 @@ if (param2 != null) * @param url (required) * @param context (required) * @param allowEmpty (required) - * @param language (optional + * @param language (optional) * @throws ApiException if fails to make API call */ public void testQueryParameterCollectionFormat(List pipe, List ioutil, List http, List url, List context, String allowEmpty, Map language) throws ApiException { @@ -1648,7 +1648,7 @@ if (param2 != null) * @param url (required) * @param context (required) * @param allowEmpty (required) - * @param language (optional + * @param language (optional) * @param additionalHeaders additionalHeaders for this call * @throws ApiException if fails to make API call */ diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index c9df76aa54b..2c3cd4b6ff9 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1353,13 +1353,13 @@ public class FakeApi { /** * To test enum parameters * To test enum parameters - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return CompletableFuture<Void> * @throws ApiException if fails to make API call @@ -1384,13 +1384,13 @@ public class FakeApi { /** * To test enum parameters * To test enum parameters - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return CompletableFuture<ApiResponse<Void>> * @throws ApiException if fails to make API call diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 9dd1e9c3bd5..5bf4c82a413 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1151,13 +1151,13 @@ public class FakeApi { /** * To test enum parameters * To test enum parameters - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException if fails to make API call */ @@ -1168,13 +1168,13 @@ public class FakeApi { /** * To test enum parameters * To test enum parameters - * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderStringArray Header parameter enum test (string array) (optional) * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryStringArray Query parameter enum test (string array) (optional) * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ApiResponse<Void> * @throws ApiException if fails to make API call