|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md
index e8f88e8269e..348f689876b 100644
--- a/docs/generators/java-camel.md
+++ b/docs/generators/java-camel.md
@@ -32,6 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|basePackage|base package (invokerPackage) for generated code| |org.openapitools|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|camelDataformatProperties|list of dataformat properties separated by comma (propertyName1=propertyValue2,...| ||
|camelRestBindingMode|binding mode to be used by the REST consumer| |auto|
|camelRestClientRequestValidation|enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration| |false|
@@ -73,6 +74,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|performBeanValidation|Use Bean Validation Impl. to perform BeanValidation| |false|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|reactive|wrap responses in Mono/Flux Reactor types (spring-boot only)| |false|
+|requestMappingMode|Where to generate the class level @RequestMapping annotation.|
**api_interface**
Generate the @RequestMapping annotation on the generated Api Interface.
**controller**
Generate the @RequestMapping annotation on the generated Api Controller Implementation.
**none**
Do not add a class level @RequestMapping annotation.
|controller|
|responseWrapper|wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, RxObservable, RxSingle or fully qualified type)| |null|
|returnSuccessCode|Generated server returns 2xx code| |false|
|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
diff --git a/docs/generators/java-helidon-client.md b/docs/generators/java-helidon-client.md
index 13b1af6a314..a2c57ac695e 100644
--- a/docs/generators/java-helidon-client.md
+++ b/docs/generators/java-helidon-client.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|configKey|Config key in @RegisterRestClient. Default to none.| |null|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true|
diff --git a/docs/generators/java-helidon-server.md b/docs/generators/java-helidon-server.md
index a33de1eb380..b96f1730758 100644
--- a/docs/generators/java-helidon-server.md
+++ b/docs/generators/java-helidon-server.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true|
|discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index 52008c192a2..8dfd8797cd7 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/java-micronaut-client.md b/docs/generators/java-micronaut-client.md
index 1adf78b70f9..b0368d3ef59 100644
--- a/docs/generators/java-micronaut-client.md
+++ b/docs/generators/java-micronaut-client.md
@@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
|build|Specify for which build tool to generate files|
**gradle**
Gradle configuration is generated for the project
**all**
Both Gradle and Maven configurations are generated
**maven**
Maven configuration is generated for the project
|all|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|configureAuth|Configure all the authorization methods as specified in the file| |false|
|dateFormat|Specify the format pattern of date as a string| |null|
|dateLibrary|Option. Date library to use|
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
diff --git a/docs/generators/java-micronaut-server.md b/docs/generators/java-micronaut-server.md
index 715d9022d92..85422ca8bbc 100644
--- a/docs/generators/java-micronaut-server.md
+++ b/docs/generators/java-micronaut-server.md
@@ -29,6 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
|build|Specify for which build tool to generate files|
**gradle**
Gradle configuration is generated for the project
**all**
Both Gradle and Maven configurations are generated
**maven**
Maven configuration is generated for the project
|all|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|controllerPackage|The package in which controllers will be generated| |org.openapitools.api|
|dateFormat|Specify the format pattern of date as a string| |null|
|dateLibrary|Option. Date library to use|
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md
index b11022c8633..15ab35ba4eb 100644
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md
index 32e83edba4c..efb3e265c27 100644
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -29,6 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|basePackage|base package for java source code| |null|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md
index 3f2318a8622..65ae38fc1ac 100644
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -29,6 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|basePackage|base package for generated code| |org.openapitools|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|configPackage|configuration package for generated code| |org.openapitools.configuration|
|controllerOnly|Whether to generate only API interface stubs without the server files.| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md
index 5b579a5aa70..019efb9117a 100644
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md
index 2d00e598ba0..3a721083c20 100644
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0-SNAPSHOT|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md
index 987772f131a..d5e12fe3f3b 100644
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0-SNAPSHOT|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 2427013b0e2..1cdeb245262 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -29,6 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|asyncNative|If true, async handlers will be used, instead of the sync version| |false|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive. Available on okhttp-gson, jersey2 libraries| |false|
|configKey|Config key in @RegisterRestClient. Default to none. Only `microprofile` supports this option.| |null|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index 8c6eb15e7c8..6cd328248a4 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index 5e8f593a1fa..72cb6f71bcb 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md
index b68220e9063..e1778d3101b 100644
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -29,6 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md
index 6e77fb11f91..e54504b1ca2 100644
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -29,6 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 0797cda9618..73bf0d8f6b2 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md
index b0e66a64f86..726c44cd45c 100644
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md
index ec6f9b3ae87..aa92d499db2 100644
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index 90038fb4ecd..84aea15c97e 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md
index ee8399a2a4c..1b25cca82d3 100644
--- a/docs/generators/kotlin-server.md
+++ b/docs/generators/kotlin-server.md
@@ -18,6 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
|apiSuffix|suffix for api classes| |Api|
|artifactId|Generated artifact id (name of jar).| |kotlin-server|
|artifactVersion|Generated artifact's package version.| |1.0.0|
diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md
index a7de5eea623..cf81038ed36 100644
--- a/docs/generators/kotlin-spring.md
+++ b/docs/generators/kotlin-spring.md
@@ -18,6 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
|annotationLibrary|Select the complementary documentation annotation library.|
**none**
Do not annotate Model and Api with complementary annotations.
**swagger1**
Annotate Model and Api using the Swagger Annotations 1.x library.
**swagger2**
Annotate Model and Api using the Swagger Annotations 2.x library.
|swagger2|
|apiPackage|api package for generated code| |org.openapitools.api|
|apiSuffix|suffix for api classes| |Api|
diff --git a/docs/generators/kotlin-vertx.md b/docs/generators/kotlin-vertx.md
index 7a25d890a72..4bd4958a90a 100644
--- a/docs/generators/kotlin-vertx.md
+++ b/docs/generators/kotlin-vertx.md
@@ -18,6 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
|apiSuffix|suffix for api classes| |Api|
|artifactId|Generated artifact id (name of jar).| |null|
|artifactVersion|Generated artifact's package version.| |1.0.0|
diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md
index 7f562302f28..4c6b25ad394 100644
--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -18,6 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
|apiSuffix|suffix for api classes| |Api|
|artifactId|Generated artifact id (name of jar).| |kotlin-client|
|artifactVersion|Generated artifact's package version.| |1.0.0|
@@ -27,7 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|generateRoomModels|Generate Android Room database models in addition to API models (JVM Volley library only)| |false|
|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
|idea|Add IntellJ Idea plugin and mark Kotlin main and test folders as source folders.| |false|
-|library|Library template (sub-template) to use|
Platform: Java Virtual Machine. HTTP client: Vert.x Web Client. JSON processing: Moshi, Gson or Jackson.
|jvm-okhttp4|
|modelMutable|Create mutable models| |false|
|moshiCodeGen|Whether to enable codegen with the Moshi library. Refer to the [official Moshi doc](https://github.com/square/moshi#codegen) for more info.| |false|
|omitGradlePluginVersions|Whether to declare Gradle plugin versions in build files.| |false|
diff --git a/docs/generators/ktorm-schema.md b/docs/generators/ktorm-schema.md
index b4b5b1b6162..f279a112e66 100644
--- a/docs/generators/ktorm-schema.md
+++ b/docs/generators/ktorm-schema.md
@@ -19,6 +19,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
|addSurrogateKey|Adds the surrogate key for all models that don't already have a primary key (named by the above convention)| |false|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
|artifactId|Generated artifact id (name of jar).| |ktorm|
|artifactVersion|Generated artifact's package version.| |1.0.0|
|defaultDatabaseName|Default database name for all queries| |sqlite.db|
diff --git a/docs/generators/ruby.md b/docs/generators/ruby.md
index 7e88dbc2cf3..2200cadf241 100644
--- a/docs/generators/ruby.md
+++ b/docs/generators/ruby.md
@@ -33,7 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|gemVersion|gem version.| |1.0.0|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
**true**
The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true|
-|library|HTTP library template (sub-template) to use|
|typhoeus|
|moduleName|top module name (convention: CamelCase, usually corresponding to gem name).| |OpenAPIClient|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/spring.md b/docs/generators/spring.md
index 4abe7440838..9d28e7915e7 100644
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -32,6 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|basePackage|base package (invokerPackage) for generated code| |org.openapitools|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|configPackage|configuration package for generated code| |org.openapitools.configuration|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
|delegatePattern|Whether to generate the server files using the delegate pattern| |false|
@@ -66,6 +67,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|performBeanValidation|Use Bean Validation Impl. to perform BeanValidation| |false|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|reactive|wrap responses in Mono/Flux Reactor types (spring-boot only)| |false|
+|requestMappingMode|Where to generate the class level @RequestMapping annotation.|
**api_interface**
Generate the @RequestMapping annotation on the generated Api Interface.
**controller**
Generate the @RequestMapping annotation on the generated Api Controller Implementation.
**none**
Do not add a class level @RequestMapping annotation.
|controller|
|responseWrapper|wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, RxObservable, RxSingle or fully qualified type)| |null|
|returnSuccessCode|Generated server returns 2xx code| |false|
|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
diff --git a/docs/generators/typescript.md b/docs/generators/typescript.md
index be714cbd096..2a0df3ca3ab 100644
--- a/docs/generators/typescript.md
+++ b/docs/generators/typescript.md
@@ -87,6 +87,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
char
class
const
+
constructor
continue
debugger
default
diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
index 82fe7e761e8..a610baa80e6 100644
--- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
+++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
@@ -21,6 +21,7 @@ import org.gradle.api.GradleException
import org.gradle.api.provider.Property
import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Optional
@@ -98,7 +99,8 @@ open class GenerateTask : DefaultTask() {
* The template directory holding a custom template.
*/
@Optional
- @Input
+ @InputDirectory
+ @PathSensitive(PathSensitivity.RELATIVE)
val templateDir = project.objects.property()
/**
@@ -122,7 +124,8 @@ open class GenerateTask : DefaultTask() {
* Supported options can be different for each language. Run config-help -g {generator name} command for language specific config options.
*/
@Optional
- @Input
+ @InputFile
+ @PathSensitive(PathSensitivity.RELATIVE)
val configFile = project.objects.property()
/**
@@ -320,7 +323,8 @@ open class GenerateTask : DefaultTask() {
* Specifies an override location for the .openapi-generator-ignore file. Most useful on initial generation.
*/
@Optional
- @Input
+ @InputFile
+ @PathSensitive(PathSensitivity.RELATIVE)
val ignoreFileOverride = project.objects.property()
/**
diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt
new file mode 100644
index 00000000000..2f573c94a11
--- /dev/null
+++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt
@@ -0,0 +1,200 @@
+package org.openapitools.generator.gradle.plugin
+
+import org.gradle.testkit.runner.TaskOutcome
+import org.testng.annotations.BeforeMethod
+import org.testng.annotations.DataProvider
+import org.testng.annotations.Test
+import java.io.File
+import kotlin.test.assertEquals
+
+class GenerateTaskFromCacheTest : TestBase() {
+
+ private lateinit var buildCacheDir: File
+ private lateinit var projectDir1: File
+ private lateinit var projectDir2: File
+
+ @BeforeMethod
+ override fun before() {
+ initialize()
+ buildCacheDir = temp.resolve("buildCacheDir").apply { mkdir() }
+ projectDir1 = temp.resolve("projectDir1").apply { mkdir() }
+ projectDir2 = temp.resolve("projectDir2").apply { mkdir() }
+ }
+
+ @DataProvider(name = "gradle_version_provider")
+ private fun gradleVersionProvider(): Array> = arrayOf(arrayOf("6.9.2"), arrayOf("7.5.1"))
+
+ // inputSpec tests
+
+ private val inputSpecExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ """.trimIndent()
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `inputSpec - same directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ runCacheabilityTestUsingSameDirectory(gradleVersion, inputSpecExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `inputSpec - different directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ runCacheabilityTestUsingDifferentDirectories(gradleVersion, inputSpecExtensionContents)
+ }
+
+ // templateDir tests
+
+ private val templateDirExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ templateDir = file("templateDir").absolutePath
+ """.trimIndent()
+
+ private fun initializeTemplateDirTest() {
+ projectDir1.resolve("templateDir").mkdir()
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `templateDir - same directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ initializeTemplateDirTest()
+ runCacheabilityTestUsingSameDirectory(gradleVersion, templateDirExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `templateDir - different directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ initializeTemplateDirTest()
+ runCacheabilityTestUsingDifferentDirectories(gradleVersion, templateDirExtensionContents)
+ }
+
+ // configFile tests
+
+ private val configFileExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ configFile = file("configFile").absolutePath
+ """.trimIndent()
+
+ private fun initializeConfigFileTest() {
+ val configFile = projectDir1.resolve("configFile")
+ configFile.createNewFile()
+ configFile.writeText("""{"foo":"bar"}""")
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `configFile - same directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ initializeConfigFileTest()
+ runCacheabilityTestUsingSameDirectory(gradleVersion, configFileExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `configFile - different directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ initializeConfigFileTest()
+ runCacheabilityTestUsingDifferentDirectories(gradleVersion, configFileExtensionContents)
+ }
+
+ // ignoreFileOverride tests
+
+ private val ignoreFileOverrideExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ ignoreFileOverride = file(".openapi-generator-ignore").absolutePath
+ """.trimIndent()
+
+ private fun initializeIgnoreFileTest() {
+ projectDir1.resolve(".openapi-generator-ignore").createNewFile()
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `ignoreFileOverride - same directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ initializeIgnoreFileTest()
+ runCacheabilityTestUsingSameDirectory(gradleVersion, ignoreFileOverrideExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `ignoreFileOverride - different directory - openApiGenerate task output should come from cache`(gradleVersion: String) {
+ initializeIgnoreFileTest()
+ runCacheabilityTestUsingDifferentDirectories(gradleVersion, ignoreFileOverrideExtensionContents)
+ }
+
+ // Helper methods & test fixtures
+
+ private fun runCacheabilityTestUsingSameDirectory(gradleVersion: String, extensionContents: String) {
+ // Arrange
+ withProject(extensionContents)
+
+ // Act
+ val result1 = build {
+ withProjectDir(projectDir1)
+ withArguments("--build-cache", "clean", "openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ val expectedRelativeFilePathSet = projectDir1.toRelativeFilePathSet()
+
+ val result2 = build {
+ withProjectDir(projectDir1)
+ withArguments("--build-cache", "clean", "openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ // Assert
+ assertEquals(TaskOutcome.SUCCESS, result1.task(":openApiGenerate")?.outcome)
+ assertEquals(TaskOutcome.FROM_CACHE, result2.task(":openApiGenerate")?.outcome)
+ assertEquals(expectedRelativeFilePathSet, projectDir1.toRelativeFilePathSet())
+ }
+
+ private fun runCacheabilityTestUsingDifferentDirectories(gradleVersion: String, extensionContents: String) {
+ // Arrange
+ withProject(extensionContents)
+ projectDir1.copyRecursively(projectDir2)
+
+ // Act
+ val result1 = build {
+ withProjectDir(projectDir1)
+ withArguments("--build-cache", "clean", "openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ val result2 = build {
+ withProjectDir(projectDir2)
+ withArguments("--build-cache", "clean", "openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ // Assert
+ assertEquals(TaskOutcome.SUCCESS, result1.task(":openApiGenerate")?.outcome)
+ assertEquals(TaskOutcome.FROM_CACHE, result2.task(":openApiGenerate")?.outcome)
+ assertEquals(projectDir1.toRelativeFilePathSet(), projectDir2.toRelativeFilePathSet())
+ }
+
+ private fun File.toRelativeFilePathSet() =
+ resolve("build").walk().map { it.toRelativeString(resolve("build")) }.toSet()
+
+ private fun withProject(extensionContents: String) {
+ val settingsContents = """
+ buildCache {
+ local {
+ directory = file("${buildCacheDir.toURI()}")
+ }
+ }
+ rootProject.name = "openapi-generator"
+ """.trimIndent()
+ val buildContents = """
+ plugins {
+ id 'base'
+ id 'org.openapi.generator'
+ }
+ openApiGenerate {
+ $extensionContents
+ }
+ """.trimIndent()
+ val projectFiles = mapOf(
+ "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0.yaml")!!
+ )
+ withProject(
+ projectDir = projectDir1,
+ settingsContents = settingsContents,
+ buildContents = buildContents,
+ projectFiles = projectFiles
+ )
+ }
+}
diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt
new file mode 100644
index 00000000000..8510135b0d1
--- /dev/null
+++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt
@@ -0,0 +1,173 @@
+package org.openapitools.generator.gradle.plugin
+
+import org.gradle.testkit.runner.TaskOutcome
+import org.testng.annotations.DataProvider
+import org.testng.annotations.Test
+import java.io.File
+import kotlin.test.assertEquals
+
+class GenerateTaskUpToDateTest : TestBase() {
+
+ @DataProvider(name = "gradle_version_provider")
+ private fun gradleVersionProvider(): Array> = arrayOf(arrayOf("6.9.2"), arrayOf("7.5.1"))
+
+ // inputSpec tests
+
+ private val inputSpecExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ """.trimIndent()
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `inputSpec - no file changes - should be up-to-date`(gradleVersion: String) {
+ runShouldBeUpToDateTest(gradleVersion, inputSpecExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `inputSpec - has file changes - should execute`(gradleVersion: String) {
+ runShouldExecuteTest(gradleVersion, inputSpecExtensionContents) {
+ val inputSpec = File(temp, "spec.yaml")
+ val newContents = inputSpec.readText().replace("version: 1.0.0", "version: 1.0.1")
+ inputSpec.writeText(newContents)
+ }
+ }
+
+ // templateDir tests
+
+ private val templateDirExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ templateDir = file("templateDir").absolutePath
+ """.trimIndent()
+
+ private fun initializeTemplateDirTest(): File {
+ val templateDir = temp.resolve("templateDir")
+ templateDir.mkdir()
+ return templateDir.resolve("templateFile").apply { writeText("contents") }
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `templateDir - no file changes - should be up-to-date`(gradleVersion: String) {
+ initializeTemplateDirTest()
+ runShouldBeUpToDateTest(gradleVersion, templateDirExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `templateDir - has file changes - should execute`(gradleVersion: String) {
+ val templateFile = initializeTemplateDirTest()
+ runShouldExecuteTest(gradleVersion, templateDirExtensionContents) {
+ templateFile.writeText("new contents")
+ }
+ }
+
+ // configFile tests
+
+ private val configFileExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ configFile = file("configFile").absolutePath
+ """.trimIndent()
+
+ private fun initializeConfigFileTest(): File {
+ return temp.resolve("configFile").apply { writeText("""{"foo":"bar"}""") }
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `configFile - no file changes - should be up-to-date`(gradleVersion: String) {
+ initializeConfigFileTest()
+ runShouldBeUpToDateTest(gradleVersion, configFileExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `configFile - has file changes - should execute`(gradleVersion: String) {
+ val configFile = initializeConfigFileTest()
+ runShouldExecuteTest(gradleVersion, configFileExtensionContents) {
+ configFile.writeText("""{"foo":"baz"}""")
+ }
+ }
+
+ // ignoreFileOverride tests
+
+ private val ignoreFileOverrideExtensionContents = """
+ generatorName = "kotlin"
+ inputSpec = file("spec.yaml").absolutePath
+ ignoreFileOverride = file(".openapi-generator-ignore").absolutePath
+ """.trimIndent()
+
+ private fun initializeIgnoreFileTest(): File {
+ return temp.resolve(".openapi-generator-ignore").apply { writeText(".some_file_to_ignore") }
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `ignoreFileOverride - no file changes - should be up-to-date`(gradleVersion: String) {
+ initializeIgnoreFileTest()
+ runShouldBeUpToDateTest(gradleVersion, ignoreFileOverrideExtensionContents)
+ }
+
+ @Test(dataProvider = "gradle_version_provider")
+ fun `ignoreFileOverride - has file changes - should execute`(gradleVersion: String) {
+ val ignoreFileOverride = initializeIgnoreFileTest()
+ runShouldExecuteTest(gradleVersion, ignoreFileOverrideExtensionContents) {
+ ignoreFileOverride.writeText(".new_file_to_ignore")
+ }
+ }
+
+ // Helper methods & test fixtures
+
+ private fun runShouldBeUpToDateTest(gradleVersion: String, extensionContents: String) {
+ // Arrange
+ withProject(extensionContents)
+
+ // Act
+ val result1 = build {
+ withArguments("clean", "openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ val result2 = build {
+ withArguments("openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ // Assert
+ assertEquals(TaskOutcome.SUCCESS, result1.task(":openApiGenerate")?.outcome)
+ assertEquals(TaskOutcome.UP_TO_DATE, result2.task(":openApiGenerate")?.outcome)
+ }
+
+ private fun runShouldExecuteTest(gradleVersion: String, extensionContents: String, action: () -> Unit) {
+ // Arrange
+ withProject(extensionContents)
+
+ // Act
+ val result1 = build {
+ withArguments("clean", "openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ action()
+
+ val result2 = build {
+ withArguments("openApiGenerate")
+ withGradleVersion(gradleVersion)
+ }
+
+ // Assert
+ assertEquals(TaskOutcome.SUCCESS, result1.task(":openApiGenerate")?.outcome)
+ assertEquals(TaskOutcome.SUCCESS, result2.task(":openApiGenerate")?.outcome)
+ }
+
+ private fun withProject(extensionContents: String) {
+ val buildContents = """
+ plugins {
+ id 'base'
+ id 'org.openapi.generator'
+ }
+ openApiGenerate {
+ $extensionContents
+ }
+ """.trimIndent()
+ File(temp, "build.gradle").writeText(buildContents)
+ File(javaClass.classLoader.getResource("specs/petstore-v3.0.yaml")!!.toURI())
+ .copyTo(File(temp, "spec.yaml"))
+ }
+}
diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/TestBase.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/TestBase.kt
index c676686db50..b7abfb5d718 100644
--- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/TestBase.kt
+++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/TestBase.kt
@@ -1,5 +1,6 @@
package org.openapitools.generator.gradle.plugin
+import org.gradle.testkit.runner.GradleRunner
import org.testng.annotations.AfterMethod
import org.testng.annotations.BeforeMethod
import java.io.File
@@ -10,7 +11,11 @@ abstract class TestBase {
protected open lateinit var temp: File
@BeforeMethod
- protected fun before() {
+ protected open fun before() {
+ initialize()
+ }
+
+ protected fun initialize() {
temp = createTempDirectory(javaClass.simpleName).toFile()
temp.deleteOnExit()
}
@@ -20,12 +25,28 @@ abstract class TestBase {
temp.deleteRecursively()
}
- protected fun withProject(buildContents: String, projectFiles: Map = mapOf()) {
- File(temp, "build.gradle").writeText(buildContents)
+ protected fun withProject(
+ buildContents: String,
+ projectFiles: Map = mapOf(),
+ projectDir: File? = temp,
+ settingsContents: String? = null
+ ) {
+ File(projectDir, "build.gradle").writeText(buildContents)
+ if (!settingsContents.isNullOrEmpty()) {
+ File(projectDir, "settings.gradle").writeText(settingsContents)
+ }
projectFiles.forEach { entry ->
- val target = File(temp, entry.key)
+ val target = File(projectDir, entry.key)
entry.value.copyTo(target.outputStream())
}
}
+
+ protected fun build(configure: GradleRunner.() -> Unit = {}) =
+ GradleRunner.create()
+ .withProjectDir(temp)
+ .withPluginClasspath()
+ .forwardOutput()
+ .apply(configure)
+ .build()!!
}
\ No newline at end of file
diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
index da8dd1cc914..edea61cc879 100644
--- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
+++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
@@ -147,7 +147,7 @@
com.github.scribejavascribejava-apis
- 6.9.0
+ 8.3.1org.tomitribe
diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index f8d3fa08301..3d04d22fb6e 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -377,7 +377,7 @@
com.fasterxml.jackson.corejackson-databind
- ${jackson.version}
+ ${jackson-databind.version}com.fasterxml.jackson.datatype
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index d6eef2a4222..0159ca2c8da 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -90,7 +90,7 @@ public class DefaultCodegen implements CodegenConfig {
// A cache of sanitized words. The sanitizeName() method is invoked many times with the same
// arguments, this cache is used to optimized performance.
- private static Cache sanitizedNameCache;
+ private static final Cache sanitizedNameCache;
private static final String xSchemaTestExamplesKey = "x-schema-test-examples";
private static final String xSchemaTestExamplesRefPrefix = "#/components/x-schema-test-examples/";
protected static Schema falseSchema;
@@ -161,9 +161,9 @@ public class DefaultCodegen implements CodegenConfig {
protected Set reservedWords;
protected Set languageSpecificPrimitives = new HashSet<>();
protected Map importMapping = new HashMap<>();
- // a map to store the mappping between a schema and the new one
+ // a map to store the mapping between a schema and the new one
protected Map schemaMapping = new HashMap<>();
- // a map to store the mappping between inline schema and the name provided by the user
+ // a map to store the mapping between inline schema and the name provided by the user
protected Map inlineSchemaNameMapping = new HashMap<>();
// a map to store the inline schema naming conventions
protected Map inlineSchemaNameDefault = new HashMap<>();
@@ -3715,7 +3715,7 @@ public class DefaultCodegen implements CodegenConfig {
} else {
property.openApiType = p.getType();
}
- property.nameInCamelCase = camelize(property.name, false);
+ property.nameInCamelCase = camelize(property.name);
property.nameInSnakeCase = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, property.nameInCamelCase);
property.description = escapeText(p.getDescription());
property.unescapedDescription = p.getDescription();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
index ef684023d35..40ebf90595a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -903,7 +903,7 @@ public class InlineModelResolver {
addGenerated(name, schema);
openAPI.getComponents().addSchemas(name, schema);
if (!name.equals(schema.getTitle()) && !inlineSchemaNameMappingValues.contains(name)) {
- LOGGER.info("Inline schema created as {}. To have complete control of the model name, set the `title` field or use the inlineSchemaNameMapping option (--inline-schema-name-mapping in CLI).", name);
+ LOGGER.info("Inline schema created as {}. To have complete control of the model name, set the `title` field or use the inlineSchemaNameMapping option (--inline-schema-name-mappings in CLI).", name);
}
uniqueNames.add(name);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
index 2965605fd3c..dd67f9f4b57 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
abstract public class AbstractAdaCodegen extends DefaultCodegen implements CodegenConfig {
@@ -826,7 +827,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
// method with only the scope that it requires. We have to create a new auth method
// instance because the original object must not be modified.
List opScopes = (scopes == null) ? null : scopes.get(authMethod.name);
- authMethod.name = camelize(sanitizeName(authMethod.name), true);
+ authMethod.name = camelize(sanitizeName(authMethod.name), LOWERCASE_FIRST_LETTER);
if (opScopes != null) {
CodegenSecurity opSecurity = new CodegenSecurity();
opSecurity.name = authMethod.name;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
index 8f96a4bd34e..d64a2d56714 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public abstract class AbstractApexCodegen extends DefaultCodegen implements CodegenConfig {
@@ -111,7 +112,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -422,11 +423,11 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index 4281abea4fe..610322f0cf4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -41,6 +41,7 @@ import java.io.IOException;
import java.io.Writer;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public abstract class AbstractCSharpCodegen extends DefaultCodegen implements CodegenConfig {
@@ -521,6 +522,16 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
property.isMap = composedProperty.isMap;
property.isContainer = composedProperty.isContainer;
}
+
+ // fix incorrect data types for maps of maps
+ if (property.datatypeWithEnum.contains("List>") && property.items != null) {
+ property.datatypeWithEnum = property.datatypeWithEnum.replace("List>", property.items.datatypeWithEnum + ">");
+ property.dataType = property.datatypeWithEnum;
+ }
+ if (property.datatypeWithEnum.contains("Dictionary>") && property.items != null) {
+ property.datatypeWithEnum = property.datatypeWithEnum.replace("Dictionary>", property.items.datatypeWithEnum + ">");
+ property.dataType = property.datatypeWithEnum;
+ }
}
@Override
@@ -964,7 +975,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// camelize(lower) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
index 5559d7f3ebe..11495fd7672 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -28,6 +28,7 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public abstract class AbstractDartCodegen extends DefaultCodegen {
@@ -373,7 +374,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
if (name.matches("^\\d.*")) {
name = "n" + name;
@@ -721,18 +722,18 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
public String toOperationId(String operationId) {
operationId = super.toOperationId(operationId);
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, newOperationId);
operationId = newOperationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
index 5e179068c5d..112861cbb8f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -343,7 +344,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- String sanitizedOperationId = camelize(sanitizeName(operationId), true);
+ String sanitizedOperationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(sanitizedOperationId)) {
@@ -354,7 +355,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
- sanitizedOperationId = camelize("call_" + sanitizedOperationId, true);
+ sanitizedOperationId = camelize("call_" + sanitizedOperationId, LOWERCASE_FIRST_LETTER);
}
// method name from updateSomething to update_Something.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
index b8a44efe931..0b66281495b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
@@ -38,6 +38,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -661,7 +662,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -707,7 +708,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
// camelize(lower) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index e024a49f143..d436a01c42f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -34,6 +34,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -232,7 +233,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
// params should be lowerCamelCase. E.g. "person Person", instead of
// "Person Person".
//
- name = camelize(toVarName(name), true);
+ name = camelize(toVarName(name), LOWERCASE_FIRST_LETTER);
// REVISIT: Actually, for idiomatic go, the param name should
// really should just be a letter, e.g. "p Person"), but we'll get
@@ -626,11 +627,39 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
iterator.remove();
}
- boolean addedTimeImport = false;
- boolean addedOSImport = false;
for (ModelMap m : objs.getModels()) {
+ boolean addedTimeImport = false;
+ boolean addedOSImport = false;
CodegenModel model = m.getModel();
- for (CodegenProperty cp : model.vars) {
+
+ List inheritedProperties = new ArrayList<>();
+ if (model.getComposedSchemas() != null) {
+ if (model.getComposedSchemas().getAllOf() != null) {
+ inheritedProperties.addAll(model.getComposedSchemas().getAllOf());
+ }
+ if (model.getComposedSchemas().getAnyOf() != null) {
+ inheritedProperties.addAll(model.getComposedSchemas().getAnyOf());
+ }
+ if (model.getComposedSchemas().getOneOf() != null) {
+ inheritedProperties.addAll(model.getComposedSchemas().getOneOf());
+ }
+ }
+
+ List codegenProperties = new ArrayList<>();
+ if(model.getIsModel() || model.getComposedSchemas() == null) {
+ // If the model is a model, use model.vars as it only
+ // contains properties the generated struct will own itself.
+ // If model is no model and it has no composed schemas use
+ // model.vars.
+ codegenProperties.addAll(model.vars);
+ } else {
+ // If the model is no model, but is a
+ // allOf, anyOf or oneOf, add all first level options
+ // from allOf, anyOf or oneOf.
+ codegenProperties.addAll(inheritedProperties);
+ }
+
+ for (CodegenProperty cp : codegenProperties) {
if (!addedTimeImport && ("time.Time".equals(cp.dataType) ||
(cp.items != null && "time.Time".equals(cp.items.dataType)))) {
imports.add(createMapping("import", "time"));
@@ -647,6 +676,11 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
imports.add(createMapping("import", "fmt"));
}
+ // if oneOf contains "time.Time" type
+ if (!addedTimeImport && model.oneOf != null && model.oneOf.contains("time.Time")) {
+ imports.add(createMapping("import", "time"));
+ }
+
// if oneOf contains "null" type
if (model.oneOf != null && !model.oneOf.isEmpty() && model.oneOf.contains("nil")) {
model.isNullable = true;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
index 1966b054827..b72b574e89a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -160,7 +161,7 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C
if (name.matches("^[A-Z_]*$"))
return name;
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name))
@@ -326,7 +327,7 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C
sanitizedOperationId = "call_" + sanitizedOperationId;
}
- return camelize(sanitizedOperationId, false);
+ return camelize(sanitizedOperationId);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index ea6fa237fb0..572575e0882 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -40,6 +40,7 @@ import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
+import org.openapitools.codegen.utils.CamelizeOption;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,6 +56,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import static org.openapitools.codegen.utils.CamelizeOption.*;
import static org.openapitools.codegen.utils.StringUtils.*;
public abstract class AbstractJavaCodegen extends DefaultCodegen implements CodegenConfig,
@@ -81,6 +83,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
public static final String IMPLICIT_HEADERS = "implicitHeaders";
public static final String IMPLICIT_HEADERS_REGEX = "implicitHeadersRegex";
+ public static final String CAMEL_CASE_DOLLAR_SIGN = "camelCaseDollarSign";
+
public static final String DEFAULT_TEST_FOLDER = "${project.build.directory}/generated-test-sources/openapi";
protected String dateLibrary = "java8";
@@ -130,6 +134,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
protected boolean implicitHeaders = false;
protected String implicitHeadersRegex = null;
+ protected boolean camelCaseDollarSign = false;
+
private Map schemaKeyToModelNameCache = new HashMap<>();
public AbstractJavaCodegen() {
@@ -262,6 +268,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
cliOptions.add(CliOption.newBoolean(OPENAPI_NULLABLE, "Enable OpenAPI Jackson Nullable library", this.openApiNullable));
cliOptions.add(CliOption.newBoolean(IMPLICIT_HEADERS, "Skip header parameters in the generated API methods using @ApiImplicitParams annotation.", implicitHeaders));
cliOptions.add(CliOption.newString(IMPLICIT_HEADERS_REGEX, "Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true"));
+ cliOptions.add(CliOption.newBoolean(CAMEL_CASE_DOLLAR_SIGN, "Fix camelCase when starting with $ sign. when true : $Value when false : $value"));
cliOptions.add(CliOption.newString(CodegenConstants.PARENT_GROUP_ID, CodegenConstants.PARENT_GROUP_ID_DESC));
cliOptions.add(CliOption.newString(CodegenConstants.PARENT_ARTIFACT_ID, CodegenConstants.PARENT_ARTIFACT_ID_DESC));
@@ -549,6 +556,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
this.setImplicitHeadersRegex(additionalProperties.get(IMPLICIT_HEADERS_REGEX).toString());
}
+ if (additionalProperties.containsKey(CAMEL_CASE_DOLLAR_SIGN)) {
+ this.setCamelCaseDollarSign(Boolean.parseBoolean(additionalProperties.get(CAMEL_CASE_DOLLAR_SIGN).toString()));
+ }
+
if (!StringUtils.isEmpty(parentGroupId) && !StringUtils.isEmpty(parentArtifactId) && !StringUtils.isEmpty(parentVersion)) {
additionalProperties.put("parentOverridden", true);
}
@@ -795,7 +806,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ if (camelCaseDollarSign) {
+ name = camelize(name, LOWERCASE_FIRST_CHAR);
+ } else {
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
+ }
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -1261,11 +1276,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
@@ -1273,7 +1288,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize("call_" + operationId), true);
- operationId = camelize("call_" + operationId, true);
+ operationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
}
return operationId;
@@ -1902,6 +1917,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
this.implicitHeadersRegex = implicitHeadersRegex;
}
+ public void setCamelCaseDollarSign(boolean camelCaseDollarSign) {
+ this.camelCaseDollarSign = camelCaseDollarSign;
+ }
+
@Override
public String escapeQuotationMark(String input) {
// remove " to avoid code injection
@@ -1984,7 +2003,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
*/
@Override
public String getterAndSetterCapitalize(String name) {
- boolean lowercaseFirstLetter = false;
+ CamelizeOption camelizeOption = UPPERCASE_FIRST_CHAR;
if (name == null || name.length() == 0) {
return name;
}
@@ -1996,9 +2015,9 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
// http://download.oracle.com/otn-pub/jcp/7224-javabeans-1.01-fr-spec-oth-JSpec/beans.101.pdf)
//
if (name.length() > 1 && Character.isLowerCase(name.charAt(0)) && Character.isUpperCase(name.charAt(1))) {
- lowercaseFirstLetter = true;
+ camelizeOption = LOWERCASE_FIRST_LETTER;
}
- return camelize(name, lowercaseFirstLetter);
+ return camelize(name, camelizeOption);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index bd3b2279d19..399e9f61f99 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -39,6 +39,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public abstract class AbstractKotlinCodegen extends DefaultCodegen implements CodegenConfig {
@@ -49,6 +50,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
public static final String MODEL_MUTABLE = "modelMutable";
public static final String MODEL_MUTABLE_DESC = "Create mutable models";
+ public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS = "additionalModelTypeAnnotations";
private final Logger LOGGER = LoggerFactory.getLogger(AbstractKotlinCodegen.class);
@@ -60,12 +62,12 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
protected String sourceFolder = "src/main/kotlin";
protected String testFolder = "src/test/kotlin";
+ protected String resourcesFolder = "src/main/resources";
protected String apiDocPath = "docs/";
protected String modelDocPath = "docs/";
protected boolean parcelizeModels = false;
protected boolean serializableModel = false;
- protected boolean needsDataClassBody = false;
protected boolean nonPublicApi = false;
@@ -76,7 +78,8 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
// ref: https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-hash-map/
protected Set propertyAdditionalKeywords = new HashSet<>(Arrays.asList("entries", "keys", "size", "values"));
- private Map schemaKeyToModelNameCache = new HashMap<>();
+ private final Map schemaKeyToModelNameCache = new HashMap<>();
+ protected List additionalModelTypeAnnotations = new LinkedList<>();
public AbstractKotlinCodegen() {
super();
@@ -262,6 +265,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
cliOptions.add(new CliOption(CodegenConstants.SORT_MODEL_PROPERTIES_BY_REQUIRED_FLAG, CodegenConstants.SORT_MODEL_PROPERTIES_BY_REQUIRED_FLAG_DESC));
cliOptions.add(CliOption.newBoolean(MODEL_MUTABLE, MODEL_MUTABLE_DESC, false));
+ cliOptions.add(CliOption.newString(ADDITIONAL_MODEL_TYPE_ANNOTATIONS, "Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)"));
}
@Override
@@ -398,6 +402,21 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
}
+ @Override
+ public Map postProcessAllModels(Map objs) {
+ objs = super.postProcessAllModels(objs);
+ objs = super.updateAllModels(objs);
+
+ if (!additionalModelTypeAnnotations.isEmpty()) {
+ for (String modelName : objs.keySet()) {
+ Map models = (Map) objs.get(modelName);
+ models.put(ADDITIONAL_MODEL_TYPE_ANNOTATIONS, additionalModelTypeAnnotations);
+ }
+ }
+
+ return objs;
+ }
+
@Override
public ModelsMap postProcessModels(ModelsMap objs) {
objs = super.postProcessModelsEnum(objs);
@@ -506,6 +525,11 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
additionalProperties.put(CodegenConstants.NON_PUBLIC_API, nonPublicApi);
}
+ if (additionalProperties.containsKey(ADDITIONAL_MODEL_TYPE_ANNOTATIONS)) {
+ String additionalAnnotationsList = additionalProperties.get(ADDITIONAL_MODEL_TYPE_ANNOTATIONS).toString();
+ this.setAdditionalModelTypeAnnotations(Arrays.asList(additionalAnnotationsList.trim().split("\\s*(;|\\r?\\n)\\s*")));
+ }
+
additionalProperties.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, getSortParamsByRequiredFlag());
additionalProperties.put(CodegenConstants.SORT_MODEL_PROPERTIES_BY_REQUIRED_FLAG, getSortModelPropertiesByRequiredFlag());
@@ -578,14 +602,6 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
this.nonPublicApi = nonPublicApi;
}
- public boolean isNeedsDataClassBody() {
- return needsDataClassBody;
- }
-
- public void setNeedsDataClassBody(boolean needsDataClassBody) {
- this.needsDataClassBody = needsDataClassBody;
- }
-
/**
* Return the sanitized variable name for enum
*
@@ -610,7 +626,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
break;
case camelCase:
// NOTE: Removes hyphens and underscores
- modified = camelize(modified, true);
+ modified = camelize(modified, LOWERCASE_FIRST_LETTER);
break;
case PascalCase:
// NOTE: Removes hyphens and underscores
@@ -673,9 +689,8 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
@Override
public String toModelName(final String name) {
// memoization
- String origName = name;
- if (schemaKeyToModelNameCache.containsKey(origName)) {
- return schemaKeyToModelNameCache.get(origName);
+ if (schemaKeyToModelNameCache.containsKey(name)) {
+ return schemaKeyToModelNameCache.get(name);
}
// Allow for explicitly configured kotlin.* and java.* types
@@ -695,9 +710,8 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
}
String modifiedName = name.replaceAll("\\.", "");
- String sanitizedName = sanitizeKotlinSpecificNames(modifiedName);
- String nameWithPrefixSuffix = sanitizedName;
+ String nameWithPrefixSuffix = sanitizeKotlinSpecificNames(modifiedName);
if (!StringUtils.isEmpty(modelNamePrefix)) {
// add '_' so that model name can be camelized correctly
nameWithPrefixSuffix = modelNamePrefix + "_" + nameWithPrefixSuffix;
@@ -726,8 +740,8 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
return modelName;
}
- schemaKeyToModelNameCache.put(origName, titleCase(modifiedName));
- return schemaKeyToModelNameCache.get(origName);
+ schemaKeyToModelNameCache.put(name, titleCase(modifiedName));
+ return schemaKeyToModelNameCache.get(name);
}
/**
@@ -742,19 +756,19 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
if (StringUtils.isEmpty(operationId))
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
- operationId = camelize("call_" + operationId, true);
+ LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), LOWERCASE_FIRST_LETTER);
+ operationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
}
return operationId;
@@ -843,10 +857,9 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
@Override
protected boolean needToImport(String type) {
// provides extra protection against improperly trying to import language primitives and java types
- boolean imports = !type.startsWith("kotlin.") && !type.startsWith("java.") &&
+ return !type.startsWith("kotlin.") && !type.startsWith("java.") &&
!defaultIncludes.contains(type) && !languageSpecificPrimitives.contains(type) &&
!type.contains(".");
- return imports;
}
@Override
@@ -909,7 +922,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
public String toVarName(String name) {
name = toVariableName(name);
if (propertyAdditionalKeywords.contains(name)) {
- return camelize("property_" + name, true);
+ return camelize("property_" + name, LOWERCASE_FIRST_LETTER);
} else {
return name;
}
@@ -938,7 +951,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
}
// If name contains special chars -> replace them.
- if ((name.chars().anyMatch(character -> specialCharReplacements.keySet().contains(String.valueOf((char) character))))) {
+ if ((name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character))))) {
List allowedCharacters = new ArrayList<>();
allowedCharacters.add("_");
allowedCharacters.add("$");
@@ -947,7 +960,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number or containing dollar symbol, escape it
if (isReservedWord(name) || name.matches("(^\\d.*)|(.*[$].*)")) {
@@ -1017,15 +1030,17 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
@Override
public String toDefaultValue(Schema schema) {
- Schema p = ModelUtils.getReferencedSchema(this.openAPI, schema);
+ Schema p = ModelUtils.getReferencedSchema(this.openAPI, schema);
if (ModelUtils.isBooleanSchema(p)) {
if (p.getDefault() != null) {
return p.getDefault().toString();
}
} else if (ModelUtils.isDateSchema(p)) {
// TODO
+ return null;
} else if (ModelUtils.isDateTimeSchema(p)) {
// TODO
+ return null;
} else if (ModelUtils.isNumberSchema(p)) {
if (p.getDefault() != null) {
return fixNumberValue(p.getDefault().toString(), p);
@@ -1071,7 +1086,6 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
}
return null;
}
-
return null;
}
@@ -1082,7 +1096,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
@Override
protected void updateModelForObject(CodegenModel m, Schema schema) {
- /**
+ /*
* we have a custom version of this function so we only set isMap to true if
* ModelUtils.isMapSchema
* In other generators, isMap is true for all type object schemas
@@ -1105,4 +1119,12 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
// process 'additionalProperties'
setAddProps(schema, m);
}
+
+ public List getAdditionalModelTypeAnnotations() {
+ return additionalModelTypeAnnotations;
+ }
+
+ public void setAdditionalModelTypeAnnotations(final List additionalModelTypeAnnotations) {
+ this.additionalModelTypeAnnotations = additionalModelTypeAnnotations;
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
index 98fd8f92217..cdf154aefd8 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
@@ -35,6 +35,9 @@ import java.io.IOException;
import java.util.*;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
+
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
+import static org.openapitools.codegen.utils.CamelizeOption.UPPERCASE_FIRST_CHAR;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -413,9 +416,9 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
if ("camelCase".equals(variableNamingConvention)) {
// return the name in camelCase style
// phone_number => phoneNumber
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
} else if ("PascalCase".equals(variableNamingConvention)) {
- name = camelize(name, false);
+ name = camelize(name, UPPERCASE_FIRST_CHAR);
} else { // default to snake case
// return the name in underscore style
// PhoneNumber => phone_number
@@ -542,17 +545,17 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, camelize(sanitizeName("call_" + operationId), true));
+ LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, camelize(sanitizeName("call_" + operationId), LOWERCASE_FIRST_LETTER));
operationId = "call_" + operationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, camelize(sanitizeName("call_" + operationId), true));
+ LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, camelize(sanitizeName("call_" + operationId), LOWERCASE_FIRST_LETTER));
operationId = "call_" + operationId;
}
- return camelize(sanitizeName(operationId), true);
+ return camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
}
/**
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
index 5f0f932c8d9..88ae7be78fd 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
@@ -313,7 +313,7 @@ public abstract class AbstractPythonConnexionServerCodegen extends AbstractPytho
if (name == null || name.length() == 0) {
return "DefaultController";
}
- return camelize(name, false) + "Controller";
+ return camelize(name) + "Controller";
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
index 9d8541fc641..3fa7e4c9368 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
@@ -19,6 +19,7 @@ package org.openapitools.codegen.languages;
import com.samskivert.mustache.Escapers;
import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
@@ -27,15 +28,20 @@ import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.*;
import org.openapitools.codegen.model.ModelsMap;
+import org.openapitools.codegen.utils.CamelizeOption;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
import java.util.*;
import static org.openapitools.codegen.languages.AbstractJavaCodegen.DATE_LIBRARY;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
+import static org.openapitools.codegen.utils.CamelizeOption.UPPERCASE_FIRST_CHAR;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -293,7 +299,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -527,7 +533,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
if (specialCharReplacements.containsKey(name)) {
name = specialCharReplacements.get(name);
}
- String identifier = camelize(sanitizeName(name), true);
+ String identifier = camelize(sanitizeName(name), LOWERCASE_FIRST_LETTER);
if (capitalized) {
identifier = StringUtils.capitalize(identifier);
}
@@ -588,11 +594,11 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
@@ -600,7 +606,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
- operationId = camelize("call_" + operationId, true);
+ operationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
}
return operationId;
@@ -614,4 +620,32 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
public GeneratorLanguage generatorLanguage() {
return GeneratorLanguage.SCALA;
}
+
+ protected static abstract class CustomLambda implements Mustache.Lambda {
+ @Override
+ public void execute(Template.Fragment frag, Writer out) throws IOException {
+ final StringWriter tempWriter = new StringWriter();
+ frag.execute(tempWriter);
+ out.write(formatFragment(tempWriter.toString()));
+ }
+
+ public abstract String formatFragment(String fragment);
+ }
+
+ protected static class CamelizeLambda extends CustomLambda {
+ private final CamelizeOption option;
+
+ public CamelizeLambda(boolean capitalizeFirst) {
+ if (capitalizeFirst) {
+ option = UPPERCASE_FIRST_CHAR;
+ } else {
+ option = LOWERCASE_FIRST_LETTER;
+ }
+ }
+
+ @Override
+ public String formatFragment(String fragment) {
+ return camelize(fragment, option);
+ }
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
index 91c7bb1accd..779a71ccf60 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -47,6 +47,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.openapitools.codegen.languages.AbstractTypeScriptClientCodegen.ParameterExpander.ParamStyle.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -757,7 +758,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
throw new RuntimeException("Empty method name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
operationId = toSafeIdentifier(operationId);
return operationId;
@@ -802,7 +803,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -820,7 +821,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -911,7 +912,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
case original:
return name;
case camelCase:
- return camelize(underscore(name), true);
+ return camelize(underscore(name), LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(underscore(name));
case snake_case:
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
index b0bbe14c92e..597e94fd510 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
@@ -30,6 +30,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -267,7 +268,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -394,11 +395,11 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
throw new RuntimeException("Empty method name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
index 65efb273c70..64980677c15 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -807,7 +808,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
public String toOperationId(String operationId) {
// rename to empty_method_name_1 (e.g.) if method name is empty
if (StringUtils.isEmpty(operationId)) {
- operationId = camelize("empty_method_name_" + emptyMethodNameCounter++, true);
+ operationId = camelize("empty_method_name_" + emptyMethodNameCounter++, LOWERCASE_FIRST_LETTER);
LOGGER.warn("Empty method name (operationId) found. Renamed to {}", operationId);
return operationId;
}
@@ -825,7 +826,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
operationId = "call_" + operationId;
}
- return camelize(sanitizeName(operationId), true);
+ return camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
index c0c49772095..16436597ffc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
@@ -32,6 +32,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -733,19 +734,19 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize(sanitizeName("call_" + operationId), true);
+ String newOperationId = camelize(sanitizeName("call_" + operationId), LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- String newOperationId = camelize(sanitizeName("call_" + operationId), true);
+ String newOperationId = camelize(sanitizeName("call_" + operationId), LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
- return camelize(sanitizeName(operationId), true);
+ return camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 6700545a65f..153d9b4b471 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -31,6 +31,7 @@ import java.io.File;
import java.util.*;
import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -835,7 +836,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
index 82975676024..5275022545e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
@@ -42,6 +42,7 @@ import java.util.Comparator;
import java.util.List;
import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -84,10 +85,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
private static FrameworkStrategy defaultFramework = FrameworkStrategy.NETSTANDARD_2_0;
protected final Map frameworks;
protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
- protected String clientPackage = "Org.OpenAPITools.Client";
+ protected String clientPackage = "Client";
protected String authFolder = "Auth";
- protected String apiDocPath = "docs/";
- protected String modelDocPath = "docs/";
+ protected String apiDocPath = "docs" + File.separator;
+ protected String modelDocPath = "docs" + File.separator;
// Defines TargetFrameworkVersion in csproj files
protected String targetFramework = defaultFramework.name;
@@ -490,7 +491,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -547,6 +548,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
postProcessPattern(property.pattern, property.vendorExtensions);
postProcessEmitDefaultValue(property.vendorExtensions);
+ // remove once https://github.com/OpenAPITools/openapi-generator/pull/13681 is merged
if (GENERICHOST.equals(getLibrary())) {
// all c# libraries should want this, but avoid breaking changes for now
// a class cannot contain a property with the same name
@@ -664,8 +666,6 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
setModelPackage("Model");
}
- clientPackage = "Client";
-
if (GENERICHOST.equals(getLibrary())) {
setLibrary(GENERICHOST);
additionalProperties.put("useGenericHost", true);
@@ -679,7 +679,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
additionalProperties.put("useHttpClient", true);
needsUriBuilder = true;
} else {
- throw new RuntimeException("Invalid HTTP library " + getLibrary() + ". Only restsharp, httpclient are supported.");
+ throw new RuntimeException("Invalid HTTP library " + getLibrary() + ". Only restsharp, httpclient, and generichost are supported.");
}
String inputFramework = (String) additionalProperties.getOrDefault(CodegenConstants.DOTNET_FRAMEWORK, defaultFramework.name);
@@ -742,7 +742,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
final AtomicReference excludeTests = new AtomicReference<>();
syncBooleanProperty(additionalProperties, CodegenConstants.EXCLUDE_TESTS, excludeTests::set, false);
- syncStringProperty(additionalProperties, "clientPackage", (s) -> { }, clientPackage);
+ syncStringProperty(additionalProperties, "clientPackage", this::setClientPackage, clientPackage);
syncStringProperty(additionalProperties, CodegenConstants.API_PACKAGE, this::setApiPackage, apiPackage);
syncStringProperty(additionalProperties, CodegenConstants.MODEL_PACKAGE, this::setModelPackage, modelPackage);
@@ -809,6 +809,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
addTestInstructions();
}
+ public void setClientPackage(String clientPackage) {
+ this.clientPackage = clientPackage;
+ }
+
@Override
public CodegenOperation fromOperation(String path,
String httpMethod,
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java
index 4d4495fda4d..e9b09f0acb9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java
@@ -37,6 +37,7 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -415,7 +416,7 @@ public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java
index a60e1cdb6be..5c6381a0884 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java
@@ -32,6 +32,7 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class CppTizenClientCodegen extends AbstractCppCodegen implements CodegenConfig {
@@ -311,7 +312,7 @@ public class CppTizenClientCodegen extends AbstractCppCodegen implements Codegen
}
// add_pet_by_id => addPetById
- return camelize(operationId, true);
+ return camelize(operationId, LOWERCASE_FIRST_LETTER);
}
/**
* Output the Getter name for boolean property, e.g. getActive
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
index 09f7808f119..cec3f30a402 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
@@ -485,7 +485,7 @@ public class CppUE4ClientCodegen extends AbstractCppCodegen {
languageSpecificPrimitives.contains(type)) {
return type;
} else {
- return modelNamePrefix + camelize(sanitizeName(type), false);
+ return modelNamePrefix + camelize(sanitizeName(type));
}
}
@@ -500,7 +500,7 @@ public class CppUE4ClientCodegen extends AbstractCppCodegen {
}
//Unreal variable names are CamelCase
- String camelCaseName = camelize(name, false);
+ String camelCaseName = camelize(name);
//Avoid empty variable name at all costs
if(!camelCaseName.isEmpty()) {
@@ -527,7 +527,7 @@ public class CppUE4ClientCodegen extends AbstractCppCodegen {
@Override
public String toApiName(String type) {
- return modelNamePrefix + camelize(type, false) + "Api";
+ return modelNamePrefix + camelize(type) + "Api";
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java
index 2bad546e9bd..bef91d6e735 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java
@@ -84,27 +84,21 @@ public class CrystalClientCodegen extends DefaultCodegen {
SecurityFeature.BasicAuth,
SecurityFeature.BearerToken,
SecurityFeature.ApiKey,
- SecurityFeature.OAuth2_Implicit
- ))
+ SecurityFeature.OAuth2_Implicit))
.excludeGlobalFeatures(
GlobalFeature.XMLStructureDefinitions,
GlobalFeature.Callbacks,
GlobalFeature.LinkObjects,
GlobalFeature.ParameterStyling,
GlobalFeature.ParameterizedServer,
- GlobalFeature.MultiServer
- )
+ GlobalFeature.MultiServer)
.includeSchemaSupportFeatures(
- SchemaSupportFeature.Polymorphism
- )
+ SchemaSupportFeature.Polymorphism)
.excludeParameterFeatures(
- ParameterFeature.Cookie
- )
+ ParameterFeature.Cookie)
.includeClientModificationFeatures(
ClientModificationFeature.BasePath,
- ClientModificationFeature.UserAgent
- )
- );
+ ClientModificationFeature.UserAgent));
generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
.stability(Stability.BETA)
@@ -128,13 +122,14 @@ public class CrystalClientCodegen extends DefaultCodegen {
apiTestTemplateFiles.put("api_test.mustache", ".cr");
// TODO support auto-generated doc
- //modelDocTemplateFiles.put("model_doc.mustache", ".md");
- //apiDocTemplateFiles.put("api_doc.mustache", ".md");
+ // modelDocTemplateFiles.put("model_doc.mustache", ".md");
+ // apiDocTemplateFiles.put("api_doc.mustache", ".md");
// default HIDE_GENERATION_TIMESTAMP to true
hideGenerationTimestamp = Boolean.TRUE;
- // reserved word. Ref: https://github.com/crystal-lang/crystal/wiki/Crystal-for-Rubyists#available-keywords
+ // reserved word. Ref:
+ // https://github.com/crystal-lang/crystal/wiki/Crystal-for-Rubyists#available-keywords
reservedWords = new HashSet<>(
Arrays.asList(
"abstract", "annotation", "do", "if", "nil?", "select", "union",
@@ -146,8 +141,7 @@ public class CrystalClientCodegen extends DefaultCodegen {
"break", "extend", "macro", "require", "true", "with",
"case", "false", "module", "rescue", "type", "yield",
"class", "for", "next", "responds_to?", "typeof",
- "def", "fun", "nil", "return", "uninitialized")
- );
+ "def", "fun", "nil", "return", "uninitialized"));
languageSpecificPrimitives.clear();
languageSpecificPrimitives.add("String");
@@ -180,6 +174,7 @@ public class CrystalClientCodegen extends DefaultCodegen {
typeMapping.put("set", "Set");
typeMapping.put("map", "Hash");
typeMapping.put("object", "Object");
+ typeMapping.put("AnyType", "Object");
typeMapping.put("file", "::File");
typeMapping.put("binary", "String");
typeMapping.put("ByteArray", "String");
@@ -194,29 +189,25 @@ public class CrystalClientCodegen extends DefaultCodegen {
cliOptions.removeIf(opt -> CodegenConstants.MODEL_PACKAGE.equals(opt.getOpt()) ||
CodegenConstants.API_PACKAGE.equals(opt.getOpt()));
- cliOptions.add(new CliOption(SHARD_NAME, "shard name (e.g. twitter_client").
- defaultValue("openapi_client"));
+ cliOptions.add(new CliOption(SHARD_NAME, "shard name (e.g. twitter_client").defaultValue("openapi_client"));
- cliOptions.add(new CliOption(MODULE_NAME, "module name (e.g. TwitterClient").
- defaultValue("OpenAPIClient"));
+ cliOptions.add(new CliOption(MODULE_NAME, "module name (e.g. TwitterClient").defaultValue("OpenAPIClient"));
cliOptions.add(new CliOption(SHARD_VERSION, "shard version.").defaultValue("1.0.0"));
- cliOptions.add(new CliOption(SHARD_LICENSE, "shard license.").
- defaultValue("unlicense"));
+ cliOptions.add(new CliOption(SHARD_LICENSE, "shard license.").defaultValue("unlicense"));
- cliOptions.add(new CliOption(SHARD_HOMEPAGE, "shard homepage.").
- defaultValue("http://org.openapitools"));
+ cliOptions.add(new CliOption(SHARD_HOMEPAGE, "shard homepage.").defaultValue("http://org.openapitools"));
- cliOptions.add(new CliOption(SHARD_DESCRIPTION, "shard description.").
- defaultValue("This shard maps to a REST API"));
+ cliOptions.add(
+ new CliOption(SHARD_DESCRIPTION, "shard description.").defaultValue("This shard maps to a REST API"));
cliOptions.add(new CliOption(SHARD_AUTHOR, "shard author (only one is supported)."));
cliOptions.add(new CliOption(SHARD_AUTHOR_EMAIL, "shard author email (only one is supported)."));
- cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC).
- defaultValue(Boolean.TRUE.toString()));
+ cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP,
+ CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC).defaultValue(Boolean.TRUE.toString()));
}
@Override
@@ -224,7 +215,8 @@ public class CrystalClientCodegen extends DefaultCodegen {
super.processOpts();
if (StringUtils.isEmpty(System.getenv("CRYSTAL_POST_PROCESS_FILE"))) {
- LOGGER.info("Hint: Environment variable 'CRYSTAL_POST_PROCESS_FILE' (optional) not defined. E.g. to format the source code, please try 'export CRYSTAL_POST_PROCESS_FILE=\"/usr/local/bin/crystal tool format\"' (Linux/Mac)");
+ LOGGER.info(
+ "Hint: Environment variable 'CRYSTAL_POST_PROCESS_FILE' (optional) not defined. E.g. to format the source code, please try 'export CRYSTAL_POST_PROCESS_FILE=\"/usr/local/bin/crystal tool format\"' (Linux/Mac)");
}
if (additionalProperties.containsKey(SHARD_NAME)) {
@@ -313,12 +305,14 @@ public class CrystalClientCodegen extends DefaultCodegen {
@Override
public String apiFileFolder() {
- return outputFolder + File.separator + srcFolder + File.separator + shardName + File.separator + apiPackage.replace("/", File.separator);
+ return outputFolder + File.separator + srcFolder + File.separator + shardName + File.separator
+ + apiPackage.replace("/", File.separator);
}
@Override
public String modelFileFolder() {
- return outputFolder + File.separator + srcFolder + File.separator + shardName + File.separator + modelPackage.replace("/", File.separator);
+ return outputFolder + File.separator + srcFolder + File.separator + shardName + File.separator
+ + modelPackage.replace("/", File.separator);
}
@Override
@@ -364,7 +358,7 @@ public class CrystalClientCodegen extends DefaultCodegen {
@Override
public String toModelName(final String name) {
String modelName;
- modelName = sanitizeName(name);
+ modelName = sanitizeModelName(name);
if (!StringUtils.isEmpty(modelNamePrefix)) {
modelName = modelNamePrefix + "_" + modelName;
@@ -393,6 +387,15 @@ public class CrystalClientCodegen extends DefaultCodegen {
return camelize(modelName);
}
+ public String sanitizeModelName(String modelName) {
+ String[] parts = modelName.split("::");
+ ArrayList new_parts = new ArrayList();
+ for (String part : parts) {
+ new_parts.add(sanitizeName(part));
+ }
+ return String.join("::", new_parts);
+ }
+
@Override
public String toModelFilename(String name) {
return underscore(toModelName(name));
@@ -510,7 +513,8 @@ public class CrystalClientCodegen extends DefaultCodegen {
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, underscore(sanitizeName("call_" + operationId)));
+ LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId,
+ underscore(sanitizeName("call_" + operationId)));
operationId = "call_" + operationId;
}
@@ -609,7 +613,8 @@ public class CrystalClientCodegen extends DefaultCodegen {
return objs;
}
- private String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps, HashMap processedModelMap) {
+ private String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps,
+ HashMap processedModelMap) {
if (codegenParameter.isArray) { // array
if (codegenParameter.items == null) {
return "[]";
@@ -669,13 +674,15 @@ public class CrystalClientCodegen extends DefaultCodegen {
if (modelMaps.containsKey(codegenParameter.dataType)) {
return constructExampleCode(modelMaps.get(codegenParameter.dataType), modelMaps, processedModelMap);
} else {
- //LOGGER.error("Error in constructing examples. Failed to look up the model " + codegenParameter.dataType);
+ // LOGGER.error("Error in constructing examples. Failed to look up the model " +
+ // codegenParameter.dataType);
return "TODO";
}
}
}
- private String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps, HashMap processedModelMap) {
+ private String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps,
+ HashMap processedModelMap) {
if (codegenProperty.isArray) { // array
return "[" + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + "]";
} else if (codegenProperty.isMap) {
@@ -735,14 +742,17 @@ public class CrystalClientCodegen extends DefaultCodegen {
if (modelMaps.containsKey(codegenProperty.dataType)) {
return constructExampleCode(modelMaps.get(codegenProperty.dataType), modelMaps, processedModelMap);
} else {
- //LOGGER.error("Error in constructing examples. Failed to look up the model " + codegenParameter.dataType);
+ // LOGGER.error("Error in constructing examples. Failed to look up the model " +
+ // codegenParameter.dataType);
return "TODO";
}
}
}
- private String constructExampleCode(CodegenModel codegenModel, HashMap modelMaps, HashMap processedModelMap) {
- // break infinite recursion. Return, in case a model is already processed in the current context.
+ private String constructExampleCode(CodegenModel codegenModel, HashMap modelMaps,
+ HashMap processedModelMap) {
+ // break infinite recursion. Return, in case a model is already processed in the
+ // current context.
String model = codegenModel.name;
if (processedModelMap.containsKey(model)) {
int count = processedModelMap.get(model);
@@ -754,7 +764,8 @@ public class CrystalClientCodegen extends DefaultCodegen {
throw new RuntimeException("Invalid count when constructing example: " + count);
}
} else if (codegenModel.isEnum) {
- List> enumVars = (List>) codegenModel.allowableValues.get("enumVars");
+ List> enumVars = (List>) codegenModel.allowableValues
+ .get("enumVars");
return moduleName + "::" + codegenModel.classname + "::" + enumVars.get(0).get("name");
} else if (codegenModel.oneOf != null && !codegenModel.oneOf.isEmpty()) {
String subModel = (String) codegenModel.oneOf.toArray()[0];
@@ -766,7 +777,8 @@ public class CrystalClientCodegen extends DefaultCodegen {
List propertyExamples = new ArrayList<>();
for (CodegenProperty codegenProperty : codegenModel.requiredVars) {
- propertyExamples.add(codegenProperty.name + ": " + constructExampleCode(codegenProperty, modelMaps, processedModelMap));
+ propertyExamples.add(
+ codegenProperty.name + ": " + constructExampleCode(codegenProperty, modelMaps, processedModelMap));
}
String example = moduleName + "::" + toModelName(model) + ".new";
if (!propertyExamples.isEmpty()) {
@@ -826,7 +838,8 @@ public class CrystalClientCodegen extends DefaultCodegen {
LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
return "Date.parse(\"" + String.format(Locale.ROOT, localDate.toString(), "") + "\")";
} else if (p.getDefault() instanceof java.time.OffsetDateTime) {
- return "Time.parse(\"" + String.format(Locale.ROOT, ((java.time.OffsetDateTime) p.getDefault()).atZoneSameInstant(ZoneId.systemDefault()).toString(), "") + "\")";
+ return "Time.parse(\"" + String.format(Locale.ROOT, ((java.time.OffsetDateTime) p.getDefault())
+ .atZoneSameInstant(ZoneId.systemDefault()).toString(), "") + "\")";
} else {
return "\"" + escapeText((String.valueOf(p.getDefault()))) + "\"";
}
@@ -901,14 +914,16 @@ public class CrystalClientCodegen extends DefaultCodegen {
Process p = Runtime.getRuntime().exec(command);
int exitValue = p.waitFor();
if (exitValue != 0) {
- try (InputStreamReader inputStreamReader = new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8);
- BufferedReader br = new BufferedReader(inputStreamReader)) {
+ try (InputStreamReader inputStreamReader = new InputStreamReader(p.getErrorStream(),
+ StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(inputStreamReader)) {
StringBuilder sb = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
sb.append(line);
}
- LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb);
+ LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command,
+ exitValue, sb);
}
} else {
LOGGER.info("Successfully executed: {}", command);
@@ -922,5 +937,7 @@ public class CrystalClientCodegen extends DefaultCodegen {
}
@Override
- public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.CRYSTAL; }
+ public GeneratorLanguage generatorLanguage() {
+ return GeneratorLanguage.CRYSTAL;
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
index 16f1a974895..89d2c4cbf04 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
@@ -43,6 +43,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -187,11 +188,11 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
@@ -199,7 +200,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
- operationId = camelize("call_" + operationId, true);
+ operationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
}
return operationId;
@@ -226,7 +227,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
@Override
public String toVarName(String name) {
- final String varName = camelize(name.replaceAll("[^a-zA-Z0-9_]", ""), true);
+ final String varName = camelize(name.replaceAll("[^a-zA-Z0-9_]", ""), LOWERCASE_FIRST_LETTER);
return isReservedWord(varName) ? escapeReservedWord(name) : varName;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
index 2b89404ce7d..05eae90beec 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
@@ -33,6 +33,7 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.Locale;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -297,7 +298,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
// underscore the variable name
// petId => pet_id
- name = camelize(dropDots(name), true);
+ name = camelize(dropDots(name), LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
index e145e4a3855..6f3dae4915c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
@@ -41,6 +41,7 @@ import java.io.IOException;
import java.io.Writer;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class GoClientCodegen extends AbstractGoCodegen {
@@ -392,7 +393,7 @@ public class GoClientCodegen extends AbstractGoCodegen {
@Override
public CodegenProperty fromProperty(String name, Schema p, boolean required) {
CodegenProperty prop = super.fromProperty(name, p, required);
- String cc = camelize(prop.name, true);
+ String cc = camelize(prop.name, LOWERCASE_FIRST_LETTER);
if (isReservedWord(cc)) {
cc = escapeReservedWord(cc);
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
index f728c766517..407e05a09af 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
@@ -43,6 +43,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
+import static org.openapitools.codegen.utils.CamelizeOption.UPPERCASE_FIRST_CHAR;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -1171,9 +1173,10 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
}
public String toVarName(String prefix, String name) {
- Boolean hasPrefix = !StringUtils.isBlank(prefix);
+ boolean hasPrefix = !StringUtils.isBlank(prefix);
name = underscore(sanitizeName(name.replaceAll("-", "_")));
- name = camelize(name, !hasPrefix);
+ name = camelize(name, hasPrefix ? UPPERCASE_FIRST_CHAR : LOWERCASE_FIRST_LETTER);
+
if (hasPrefix) {
return prefix + name;
} else {
@@ -1227,7 +1230,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
if (StringUtils.isEmpty(operationId)) {
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = escapeIdentifier("op", camelize(sanitizeName(operationId), true));
+ operationId = escapeIdentifier("op", camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER));
return operationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
index 5bc339d774f..4296074ddd1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
@@ -35,6 +35,7 @@ import java.io.IOException;
import java.util.*;
import java.util.regex.Pattern;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class HaskellServantCodegen extends DefaultCodegen implements CodegenConfig {
@@ -592,7 +593,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
op.vendorExtensions.put("x-client-type", joinStrings(" -> ", type));
op.vendorExtensions.put("x-form-name", "Form" + camelize(op.operationId));
for (CodegenParameter param : op.formParams) {
- param.vendorExtensions.put("x-form-prefix", camelize(op.operationId, true));
+ param.vendorExtensions.put("x-form-prefix", camelize(op.operationId, LOWERCASE_FIRST_LETTER));
}
return op;
}
@@ -658,7 +659,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
}
// From the model name, compute the prefix for the fields.
- String prefix = camelize(model.classname, true);
+ String prefix = camelize(model.classname, LOWERCASE_FIRST_LETTER);
for (CodegenProperty prop : model.vars) {
prop.name = toVarName(prefix + camelize(fixOperatorChars(prop.name)));
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java
index d30093ce7c9..8b8c49076fc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java
@@ -37,6 +37,7 @@ import java.io.IOException;
import java.util.*;
import java.util.regex.Pattern;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.dashize;
@@ -571,7 +572,7 @@ public class HaskellYesodServerCodegen extends DefaultCodegen implements Codegen
}
// From the model name, compute the prefix for the fields.
- String prefix = camelize(model.classname, true);
+ String prefix = camelize(model.classname, LOWERCASE_FIRST_LETTER);
for (CodegenProperty prop : model.vars) {
prop.name = toVarName(prefix + camelize(fixOperatorChars(prop.name)));
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index c2b5ad4863a..fe85946ba88 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -44,6 +44,7 @@ import java.util.regex.Pattern;
import static com.google.common.base.CaseFormat.LOWER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
import static java.util.Collections.sort;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class JavaClientCodegen extends AbstractJavaCodegen
@@ -762,7 +763,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
for (int i = 0; i < items.length; ++i) {
if (items[i].matches("^\\{(.*)\\}$")) { // wrap in {}
// camelize path variable
- items[i] = "{" + camelize(items[i].substring(1, items[i].length() - 1), true) + "}";
+ items[i] = "{" + camelize(items[i].substring(1, items[i].length() - 1), LOWERCASE_FIRST_LETTER) + "}";
}
}
op.path = StringUtils.join(items, "/");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java
index 22bd809dde6..ac6ce1e43f7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java
@@ -33,6 +33,7 @@ import java.io.File;
import java.net.URL;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
/**
@@ -512,7 +513,7 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen {
title = title.substring(0, title.length() - 3);
}
- this.title = camelize(sanitizeName(title), true);
+ this.title = camelize(sanitizeName(title), LOWERCASE_FIRST_LETTER);
}
additionalProperties.put(TITLE, this.title);
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
index 9de29a5ef90..04abfd95b93 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
@@ -34,6 +34,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements BeanValidationFeatures {
@@ -330,7 +331,7 @@ public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements Bea
Matcher match = pathVariableMatcher.matcher(operation.path);
while (match.find()) {
String completeMatch = match.group();
- String replacement = ":" + camelize(match.group(1), true);
+ String replacement = ":" + camelize(match.group(1), LOWERCASE_FIRST_LETTER);
operation.path = operation.path.replace(completeMatch, replacement);
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java
index 686542b7617..e979a72b2c1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java
@@ -40,6 +40,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public class JavascriptApolloClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -507,7 +508,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -840,18 +841,18 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
index eac98040cc6..5d388308675 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -39,6 +39,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -492,7 +493,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -825,18 +826,18 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
index f93d32affc2..b0649d5a8a1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -179,7 +180,7 @@ public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implem
// camelize the variable name
// pet_id => PetId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*"))
@@ -287,11 +288,11 @@ public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implem
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = camelize("call_" + operationId, LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
index afc56451f1c..c0dfa1c2e03 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
@@ -16,6 +16,7 @@
package org.openapitools.codegen.languages;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.dashize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -708,7 +709,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
index 6b9dd53321d..994b4b052cc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
@@ -63,6 +63,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
protected static final String JVM_RETROFIT2 = "jvm-retrofit2";
protected static final String MULTIPLATFORM = "multiplatform";
protected static final String JVM_VOLLEY = "jvm-volley";
+ protected static final String JVM_VERTX = "jvm-vertx";
public static final String USE_RX_JAVA = "useRxJava";
public static final String USE_RX_JAVA2 = "useRxJava2";
@@ -215,6 +216,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
supportedLibraries.put(JVM_RETROFIT2, "Platform: Java Virtual Machine. HTTP client: Retrofit 2.6.2.");
supportedLibraries.put(MULTIPLATFORM, "Platform: Kotlin multiplatform. HTTP client: Ktor 1.6.7. JSON processing: Kotlinx Serialization: 1.2.1.");
supportedLibraries.put(JVM_VOLLEY, "Platform: JVM for Android. HTTP client: Volley 1.2.1. JSON processing: gson 2.8.9");
+ supportedLibraries.put(JVM_VERTX, "Platform: Java Virtual Machine. HTTP client: Vert.x Web Client. JSON processing: Moshi, Gson or Jackson.");
CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "Library template (sub-template) to use");
libraryOption.setEnum(supportedLibraries);
@@ -441,6 +443,9 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
case MULTIPLATFORM:
processMultiplatformLibrary(infrastructureFolder);
break;
+ case JVM_VERTX:
+ processJVMVertXLibrary(infrastructureFolder);
+ break;
default:
break;
}
@@ -666,6 +671,22 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
supportingFiles.add(new SupportingFile("auth/OAuth.kt.mustache", authFolder, "OAuth.kt"));
}
+ /**
+ * Process Vert.x client options
+ *
+ * @param infrastructureFolder infrastructure destination folder
+ */
+ private void processJVMVertXLibrary(final String infrastructureFolder) {
+ supportingFiles.add(new SupportingFile("infrastructure/ApiAbstractions.kt.mustache", infrastructureFolder, "ApiAbstractions.kt"));
+ supportingFiles.add(new SupportingFile("infrastructure/ApiClient.kt.mustache", infrastructureFolder, "ApiClient.kt"));
+ supportingFiles.add(new SupportingFile("infrastructure/Errors.kt.mustache", infrastructureFolder, "Errors.kt"));
+ supportingFiles.add(new SupportingFile("infrastructure/ApiResponse.kt.mustache", infrastructureFolder, "ApiResponse.kt"));
+ addSupportingSerializerAdapters(infrastructureFolder);
+
+ additionalProperties.put(JVM, true);
+ additionalProperties.put(JVM_VERTX, true);
+ }
+
private void processJVMOkHttpLibrary(final String infrastructureFolder) {
commonJvmMultiplatformSupportingFiles(infrastructureFolder);
addSupportingSerializerAdapters(infrastructureFolder);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
index 67a042da6b4..ffaef1dc137 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
@@ -131,7 +131,7 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa
cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files. This option is currently supported only when using jaxrs-spec library.").defaultValue(String.valueOf(interfaceOnly)));
cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations. This option is currently supported only when using jaxrs-spec library.", useBeanValidation));
- cliOptions.add(CliOption.newBoolean(USE_COROUTINES, "Whether to use the Coroutines. This option is currently supported only when using jaxrs-spec library."));
+ cliOptions.add(CliOption.newBoolean(USE_COROUTINES, "Whether to use the Coroutines. This option is currently supported only when using jaxrs-spec library.", useCoroutines));
cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true. This option is currently supported only when using jaxrs-spec library.").defaultValue(String.valueOf(returnResponse)));
}
@@ -293,7 +293,6 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa
boolean generateApis = additionalProperties.containsKey(CodegenConstants.GENERATE_APIS) && (Boolean) additionalProperties.get(CodegenConstants.GENERATE_APIS);
String packageFolder = (sourceFolder + File.separator + packageName).replace(".", File.separator);
- String resourcesFolder = "src/main/resources"; // not sure this can be user configurable.
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerDeprecatedCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerDeprecatedCodegen.java
index bbdf6064c02..d63faee75ac 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerDeprecatedCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerDeprecatedCodegen.java
@@ -214,7 +214,6 @@ public class KotlinServerDeprecatedCodegen extends AbstractKotlinCodegen {
boolean generateApis = additionalProperties.containsKey(CodegenConstants.GENERATE_APIS) && (Boolean) additionalProperties.get(CodegenConstants.GENERATE_APIS);
String packageFolder = (sourceFolder + File.separator + packageName).replace(".", File.separator);
- String resourcesFolder = "src/main/resources"; // not sure this can be user configurable.
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
supportingFiles.add(new SupportingFile("Dockerfile.mustache", "", "Dockerfile"));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
index a7d445eb3c8..b2cf3774b87 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
@@ -42,6 +42,7 @@ import java.net.URL;
import java.util.*;
import java.util.regex.Matcher;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
@@ -75,7 +76,6 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
private String invokerPackage;
private String serverPort = "8080";
private String title = "OpenAPI Kotlin Spring";
- private String resourceFolder = "src/main/resources";
private boolean useBeanValidation = true;
private boolean exceptionHandler = true;
private boolean gradleBuildFile = true;
@@ -234,14 +234,6 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
getDocumentationProvider().equals(DocumentationProvider.SOURCE);
}
- public String getResourceFolder() {
- return this.resourceFolder;
- }
-
- public void setResourceFolder(String resourceFolder) {
- this.resourceFolder = resourceFolder;
- }
-
public String getBasePackage() {
return this.basePackage;
}
@@ -336,10 +328,6 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
this.reactive = reactive;
}
- public boolean isBeanQualifiers() {
- return beanQualifiers;
- }
-
public void setBeanQualifiers(boolean beanQualifiers) {
this.beanQualifiers = beanQualifiers;
}
@@ -569,16 +557,16 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
(sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator),
"HomeController.kt"));
supportingFiles.add(new SupportingFile("openapi.mustache",
- ("src/main/resources").replace("/", java.io.File.separator), "openapi.yaml"));
+ resourcesFolder.replace("/", java.io.File.separator), "openapi.yaml"));
}
- supportingFiles.add(new SupportingFile("application.mustache", resourceFolder, "application.yaml"));
+ supportingFiles.add(new SupportingFile("application.mustache", resourcesFolder, "application.yaml"));
supportingFiles.add(new SupportingFile("springBootApplication.mustache",
sanitizeDirectory(sourceFolder + File.separator + basePackage), "Application.kt"));
if (useSwaggerUI && selectedDocumentationProviderRequiresSwaggerUiBootstrap()) {
supportingFiles.add(new SupportingFile("swagger-ui.mustache",
- "src/main/resources/static", "swagger-ui.html"));
+ resourcesFolder + "/static", "swagger-ui.html"));
}
}
}
@@ -656,7 +644,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
if (title.toUpperCase(Locale.ROOT).endsWith("API"))
title = title.substring(0, title.length() - 3);
- this.title = camelize(sanitizeName(title), true);
+ this.title = camelize(sanitizeName(title), LOWERCASE_FIRST_LETTER);
}
additionalProperties.put(TITLE, this.title);
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java
index c524436a051..af90ec386ad 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class NimClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -253,10 +254,10 @@ public class NimClientCodegen extends DefaultCodegen implements CodegenConfig {
String sanitizedOperationId = sanitizeName(operationId);
if (isReservedWord(sanitizedOperationId)) {
- sanitizedOperationId = "call" + StringUtils.camelize(sanitizedOperationId, false);
+ sanitizedOperationId = "call" + StringUtils.camelize(sanitizedOperationId);
}
- return StringUtils.camelize(sanitizedOperationId, true);
+ return StringUtils.camelize(sanitizedOperationId, LOWERCASE_FIRST_LETTER);
}
@Override
@@ -320,7 +321,7 @@ public class NimClientCodegen extends DefaultCodegen implements CodegenConfig {
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, append _
if (isReservedWord(name)) {
@@ -350,7 +351,7 @@ public class NimClientCodegen extends DefaultCodegen implements CodegenConfig {
@Override
public String toEnumName(CodegenProperty property) {
- String name = StringUtils.camelize(property.name, false);
+ String name = StringUtils.camelize(property.name);
if (name.matches("\\d.*")) { // starts with number
return "`" + name + "`";
@@ -362,7 +363,7 @@ public class NimClientCodegen extends DefaultCodegen implements CodegenConfig {
@Override
public String toEnumVarName(String name, String datatype) {
name = name.replace(" ", "_");
- name = StringUtils.camelize(name, false);
+ name = StringUtils.camelize(name);
if (name.matches("\\d.*")) { // starts with number
return "`" + name + "`";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
index 5a2a3822477..0b7f640cba5 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -573,7 +574,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
// camelize (lower first character) the variable name
// e.g. `pet_id` to `petId`
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved word or word starting with number, prepend `_`
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -618,11 +619,12 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, camelize(sanitizeName("call_" + operationId), true));
- operationId = "call_" + operationId;
+ final String newName = "call_" + operationId;
+ LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newName);
+ operationId = newName;
}
- return camelize(sanitizeName(operationId), true);
+ return camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
}
public void setClassPrefix(String classPrefix) {
@@ -677,6 +679,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
/**
* Return the default value of the schema
+ *
* @param p OpenAPI schema object
* @return string presentation of the default value of the schema
*/
@@ -795,5 +798,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
}
@Override
- public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.OBJECTIVE_C; }
+ public GeneratorLanguage generatorLanguage() {
+ return GeneratorLanguage.OBJECTIVE_C;
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
index dadc17a6fff..16920f32fc9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
@@ -276,7 +276,7 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
return "DefaultController";
}
- return camelize(name, false) + "Controller";
+ return camelize(name) + "Controller";
}
protected String controllerFileFolder() {
@@ -298,7 +298,7 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
return "DefaultController";
}
- return camelize(name, false) + "Controller";
+ return camelize(name) + "Controller";
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
index 373381eafed..a2388a6fc12 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
@@ -32,6 +32,7 @@ import org.openapitools.codegen.meta.Stability;
import java.io.File;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -273,7 +274,7 @@ public class PhpSilexServerCodegen extends DefaultCodegen implements CodegenConf
for (int i = 0; i < items.length; ++i) {
if (items[i].matches("^\\{(.*)\\}$")) { // wrap in {}
// camelize path variable
- items[i] = "{" + camelize(items[i].substring(1, items[i].length() - 1), true) + "}";
+ items[i] = "{" + camelize(items[i].substring(1, items[i].length() - 1), LOWERCASE_FIRST_LETTER) + "}";
}
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
index 4d1fb30fa29..85331d98613 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
@@ -613,14 +613,14 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg
if (name.isEmpty()) {
return "DefaultApiInterface";
}
- return camelize(name, false) + "ApiInterface";
+ return camelize(name) + "ApiInterface";
}
protected String toControllerName(String name) {
if (name.isEmpty()) {
return "DefaultController";
}
- return camelize(name, false) + "Controller";
+ return camelize(name) + "Controller";
}
protected String toSymfonyService(String name) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
index 1328efd8ec6..5401e682152 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
@@ -43,6 +43,7 @@ import java.io.Writer;
import java.util.*;
import java.util.regex.Pattern;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -566,7 +567,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
if ("PascalCase".equals(operationIdNaming)) {
return camelize(sanitizedOperationId);
} else if ("camelCase".equals(operationIdNaming)) {
- return camelize(sanitizedOperationId, true);
+ return camelize(sanitizedOperationId, LOWERCASE_FIRST_LETTER);
} else if ("snake_case".equals(operationIdNaming)) {
return underscore(sanitizedOperationId);
} else {
@@ -829,15 +830,19 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
public String toDefaultValue(Schema p) {
if (ModelUtils.isBooleanSchema(p)) {
if (p.getDefault() != null) {
- if (Boolean.valueOf(p.getDefault().toString()) == false)
+ if (!Boolean.valueOf(p.getDefault().toString()))
return "FALSE";
else
return "TRUE";
}
} else if (ModelUtils.isDateSchema(p)) {
- // TODO
+ if (p.getDefault() != null) {
+ return "\"" + ((String.valueOf(p.getDefault()))).replaceAll("\"", "\\\"") + "\"";
+ }
} else if (ModelUtils.isDateTimeSchema(p)) {
- // TODO
+ if (p.getDefault() != null) {
+ return "\"" + ((String.valueOf(p.getDefault()))).replaceAll("\"", "\\\"") + "\"";
+ }
} else if (ModelUtils.isNumberSchema(p)) {
if (p.getDefault() != null) {
return p.getDefault().toString();
@@ -922,9 +927,9 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
public String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps) {
if (codegenParameter.isArray) { // array
- return "list(" + constructExampleCode(codegenParameter.items, modelMaps, 0) + ")";
+ return "c(" + constructExampleCode(codegenParameter.items, modelMaps, 0) + ")";
} else if (codegenParameter.isMap) { // map
- return "list(key = " + constructExampleCode(codegenParameter.items, modelMaps, 0) + ")";
+ return "c(key = " + constructExampleCode(codegenParameter.items, modelMaps, 0) + ")";
} else if (languageSpecificPrimitives.contains(codegenParameter.dataType)) { // primitive type
return codegenParameter.example;
} else { // model
@@ -943,9 +948,9 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
depth++;
if (codegenProperty.isArray) { // array
- return "list(" + constructExampleCode(codegenProperty.items, modelMaps, depth) + ")";
+ return "c(" + constructExampleCode(codegenProperty.items, modelMaps, depth) + ")";
} else if (codegenProperty.isMap) { // map
- return "list(key = " + constructExampleCode(codegenProperty.items, modelMaps, depth) + ")";
+ return "c(key = " + constructExampleCode(codegenProperty.items, modelMaps, depth) + ")";
} else if (languageSpecificPrimitives.contains(codegenProperty.dataType)) { // primitive type
if ("character".equals(codegenProperty.dataType)) {
if (StringUtils.isEmpty(codegenProperty.example)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
index 103114282ae..f4bbb55076c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
@@ -170,7 +170,7 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
cliOptions.add(CliOption.newBoolean(USE_AUTOLOAD, "Use autoload instead of require to load modules.").
defaultValue(Boolean.FALSE.toString()));
- supportedLibraries.put(FARADAY, "Faraday (https://github.com/lostisland/faraday) (Beta support)");
+ supportedLibraries.put(FARADAY, "Faraday >= 1.0.1 (https://github.com/lostisland/faraday)");
supportedLibraries.put(TYPHOEUS, "Typhoeus >= 1.0.1 (https://github.com/typhoeus/typhoeus)");
CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "HTTP library template (sub-template) to use");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
index 73559171943..bbfa8f6afbc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -450,6 +450,7 @@ public class RustClientCodegen extends AbstractRustCodegen implements CodegenCon
String schemaType = super.getSchemaType(p);
String type = typeMapping.getOrDefault(schemaType, schemaType);
+ // Implement integer type fitting (when property is enabled)
if (Objects.equals(p.getType(), "integer")) {
boolean bestFit = convertPropertyToBoolean(BEST_FIT_INT);
boolean preferUnsigned = convertPropertyToBoolean(PREFER_UNSIGNED_INT);
@@ -483,6 +484,18 @@ public class RustClientCodegen extends AbstractRustCodegen implements CodegenCon
return type;
}
+ @Override
+ public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+ super.postProcessModelProperty(model, property);
+
+ // If a property is both nullable and non-required then we represent this using a double Option
+ // which requires the `serde_with` extension crate for deserialization.
+ // See: https://docs.rs/serde_with/latest/serde_with/rust/double_option/index.html
+ if (property.isNullable && !property.required) {
+ additionalProperties.put("serdeWith", true);
+ }
+ }
+
@Override
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) {
OperationMap objectMap = objs.getOperations();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
index 5d8d88d943e..60e977633c8 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
@@ -1275,7 +1275,7 @@ public class RustServerCodegen extends AbstractRustCodegen implements CodegenCon
int position = property.dataType.lastIndexOf(":");
property.dataType = property.dataType.substring(0, position) + camelize(property.dataType.substring(position));
} else {
- property.dataType = camelize(property.dataType, false);
+ property.dataType = camelize(property.dataType);
}
property.isPrimitiveType = property.isContainer && languageSpecificPrimitives.contains(typeMapping.get(property.complexType));
} else {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
index a74eabfcfe8..9cb73a97b6e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
@@ -302,16 +302,6 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
}
}
- private static abstract class CustomLambda implements Mustache.Lambda {
- @Override
- public void execute(Template.Fragment frag, Writer out) throws IOException {
- final StringWriter tempWriter = new StringWriter();
- frag.execute(tempWriter);
- out.write(formatFragment(tempWriter.toString()));
- }
-
- public abstract String formatFragment(String fragment);
- }
private static class JavadocLambda extends CustomLambda {
@Override
@@ -334,19 +324,6 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
}
}
- private static class CamelizeLambda extends CustomLambda {
- private final boolean capitalizeFirst;
-
- public CamelizeLambda(boolean capitalizeFirst) {
- this.capitalizeFirst = capitalizeFirst;
- }
-
- @Override
- public String formatFragment(String fragment) {
- return camelize(fragment, !capitalizeFirst);
- }
- }
-
private class EnumEntryLambda extends CustomLambda {
@Override
public String formatFragment(String fragment) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java
index de887007308..f8bf338f652 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java
@@ -30,6 +30,7 @@ import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
/*
@@ -200,7 +201,7 @@ public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements Code
throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
}
- return camelize(operationId, true);
+ return camelize(operationId, LOWERCASE_FIRST_LETTER);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java
index c4d38de101c..fedb4d8a1a7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements CodegenConfig {
@@ -163,7 +164,7 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod
throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
}
- return camelize(operationId, true);
+ return camelize(operationId, LOWERCASE_FIRST_LETTER);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
index eaa7dcf08a3..fe503eb1ed0 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
@@ -41,6 +41,7 @@ import java.util.stream.Collectors;
import static org.apache.commons.lang3.StringUtils.rightPad;
import static org.openapitools.codegen.languages.AbstractJavaCodegen.DATE_LIBRARY;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implements CodegenConfig {
@@ -243,7 +244,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem
Matcher match = pathVariableMatcher.matcher(operation.path);
while (match.find()) {
String completeMatch = match.group();
- String replacement = ":" + camelize(match.group(1), true);
+ String replacement = ":" + camelize(match.group(1), LOWERCASE_FIRST_LETTER);
operation.path = operation.path.replace(completeMatch, replacement);
}
@@ -265,7 +266,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem
for (ModelMap mo : outer.getModels()) {
CodegenModel cm = mo.getModel();
postProcessModelsEnum(outer);
- cm.classVarName = camelize(cm.classVarName, true);
+ cm.classVarName = camelize(cm.classVarName, LOWERCASE_FIRST_LETTER);
modelsByClassName.put(cm.classname, cm);
boolean hasFiles = cm.vars.stream().anyMatch(var -> var.isFile);
cm.vendorExtensions.put("x-has-files", hasFiles);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java
index a5ef96adc72..dc7aaf221f4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java
@@ -32,6 +32,7 @@ import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
+import org.openapitools.codegen.utils.CamelizeOption;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,6 +45,8 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static org.openapitools.codegen.utils.CamelizeOption.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class ScalaSttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
@@ -560,17 +563,6 @@ public class ScalaSttpClientCodegen extends AbstractScalaCodegen implements Code
}
}
- private static abstract class CustomLambda implements Mustache.Lambda {
- @Override
- public void execute(Template.Fragment frag, Writer out) throws IOException {
- final StringWriter tempWriter = new StringWriter();
- frag.execute(tempWriter);
- out.write(formatFragment(tempWriter.toString()));
- }
-
- public abstract String formatFragment(String fragment);
- }
-
private static class JavadocLambda extends CustomLambda {
@Override
public String formatFragment(String fragment) {
@@ -592,19 +584,6 @@ public class ScalaSttpClientCodegen extends AbstractScalaCodegen implements Code
}
}
- private static class CamelizeLambda extends CustomLambda {
- private final boolean capitalizeFirst;
-
- public CamelizeLambda(boolean capitalizeFirst) {
- this.capitalizeFirst = capitalizeFirst;
- }
-
- @Override
- public String formatFragment(String fragment) {
- return camelize(fragment, !capitalizeFirst);
- }
- }
-
private class EnumEntryLambda extends CustomLambda {
@Override
public String formatFragment(String fragment) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java
index 8f3971bd739..fe714b2ee87 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalazClientCodegen.java
@@ -36,6 +36,7 @@ import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -152,7 +153,7 @@ public class ScalazClientCodegen extends AbstractScalaCodegen implements Codegen
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
@@ -228,7 +229,7 @@ public class ScalazClientCodegen extends AbstractScalaCodegen implements Codegen
throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
}
- return camelize(operationId, true);
+ return camelize(operationId, LOWERCASE_FIRST_LETTER);
}
private static abstract class CustomLambda implements Mustache.Lambda {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
index 7820efb9426..b43a9aa1c78 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -18,14 +18,17 @@
package org.openapitools.codegen.languages;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import com.samskivert.mustache.Mustache;
+import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.servers.Server;
+
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
@@ -40,6 +43,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.stream.Collectors;
+
import org.apache.commons.lang3.tuple.Pair;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
@@ -102,6 +106,25 @@ public class SpringCodegen extends AbstractJavaCodegen
public static final String UNHANDLED_EXCEPTION_HANDLING = "unhandledException";
public static final String USE_SPRING_BOOT3 = "useSpringBoot3";
public static final String USE_JAKARTA_EE = "useJakartaEe";
+ public static final String REQUEST_MAPPING_OPTION = "requestMappingMode";
+ public static final String USE_REQUEST_MAPPING_ON_CONTROLLER = "useRequestMappingOnController";
+ public static final String USE_REQUEST_MAPPING_ON_INTERFACE = "useRequestMappingOnInterface";
+
+ public enum RequestMappingMode {
+ api_interface("Generate the @RequestMapping annotation on the generated Api Interface."),
+ controller("Generate the @RequestMapping annotation on the generated Api Controller Implementation."),
+ none("Do not add a class level @RequestMapping annotation.");
+
+ public String getDescription() {
+ return description;
+ }
+
+ private String description;
+
+ RequestMappingMode(String description) {
+ this.description = description;
+ }
+ }
public static final String OPEN_BRACE = "{";
public static final String CLOSE_BRACE = "}";
@@ -111,7 +134,6 @@ public class SpringCodegen extends AbstractJavaCodegen
protected String basePackage = "org.openapitools";
protected boolean interfaceOnly = false;
protected boolean useFeignClientUrl = true;
- protected boolean useFeignClient = false;
protected boolean delegatePattern = false;
protected boolean delegateMethod = false;
protected boolean singleContentTypes = false;
@@ -131,6 +153,7 @@ public class SpringCodegen extends AbstractJavaCodegen
protected boolean useSpringController = false;
protected boolean useSwaggerUI = true;
protected boolean useSpringBoot3 = false;
+ protected RequestMappingMode requestMappingMode = RequestMappingMode.controller;
public SpringCodegen() {
super();
@@ -203,6 +226,15 @@ public class SpringCodegen extends AbstractJavaCodegen
cliOptions
.add(CliOption.newBoolean(RETURN_SUCCESS_CODE, "Generated server returns 2xx code", returnSuccessCode));
cliOptions.add(CliOption.newBoolean(SPRING_CONTROLLER, "Annotate the generated API as a Spring Controller", useSpringController));
+
+ CliOption requestMappingOpt = new CliOption(REQUEST_MAPPING_OPTION,
+ "Where to generate the class level @RequestMapping annotation.")
+ .defaultValue(requestMappingMode.name());
+ for (RequestMappingMode mode: RequestMappingMode.values()) {
+ requestMappingOpt.addEnum(mode.name(), mode.getDescription());
+ }
+ cliOptions.add(requestMappingOpt);
+
cliOptions.add(CliOption.newBoolean(UNHANDLED_EXCEPTION_HANDLING,
"Declare operation methods to throw a generic exception and allow unhandled exceptions (useful for Spring `@ControllerAdvice` directives).",
unhandledException));
@@ -299,6 +331,13 @@ public class SpringCodegen extends AbstractJavaCodegen
LOGGER.info("Set base package to invoker package ({})", basePackage);
}
+ if (additionalProperties.containsKey(REQUEST_MAPPING_OPTION)) {
+ RequestMappingMode optValue = RequestMappingMode.valueOf(
+ String.valueOf(additionalProperties.get(REQUEST_MAPPING_OPTION)));
+ setRequestMappingMode(optValue);
+ additionalProperties.remove(REQUEST_MAPPING_OPTION);
+ }
+
useOneOfInterfaces = true;
legacyDiscriminatorBehavior = false;
@@ -493,10 +532,15 @@ public class SpringCodegen extends AbstractJavaCodegen
additionalProperties.put(SINGLE_CONTENT_TYPES, "true");
this.setSingleContentTypes(true);
}
+ // @RequestMapping not supported with spring cloud openfeign.
+ setRequestMappingMode(RequestMappingMode.none);
additionalProperties.put(USE_FEIGN_CLIENT, "true");
- this.setUseFeignClient(true);
} else {
apiTemplateFiles.put("apiController.mustache", "Controller.java");
+ if (containsEnums()) {
+ supportingFiles.add(new SupportingFile("converter.mustache",
+ (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "EnumConverterConfiguration.java"));
+ }
supportingFiles.add(new SupportingFile("application.mustache",
("src.main.resources").replace(".", java.io.File.separator), "application.properties"));
supportingFiles.add(new SupportingFile("homeController.mustache",
@@ -573,6 +617,19 @@ public class SpringCodegen extends AbstractJavaCodegen
}
}
+ switch (getRequestMappingMode()) {
+ case api_interface:
+ additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, true);
+ break;
+ case controller:
+ additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, true);
+ break;
+ case none:
+ additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, false);
+ additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, false);
+ break;
+ }
+
// add lambda for mustache templates
additionalProperties.put("lambdaRemoveDoubleQuote", (Mustache.Lambda) (fragment, writer) -> writer
.write(fragment.execute().replaceAll("\"", Matcher.quoteReplacement(""))));
@@ -594,6 +651,20 @@ public class SpringCodegen extends AbstractJavaCodegen
}
}
+ private boolean containsEnums() {
+ if (openAPI == null) {
+ return false;
+ }
+
+ Components components = this.openAPI.getComponents();
+ if (components == null || components.getSchemas() == null) {
+ return false;
+ }
+
+ return components.getSchemas().values().stream()
+ .anyMatch(it -> it.getEnum() != null && !it.getEnum().isEmpty());
+ }
+
@Override
public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co,
Map> operations) {
@@ -639,7 +710,7 @@ public class SpringCodegen extends AbstractJavaCodegen
title = title.substring(0, title.length() - 3);
}
- this.title = camelize(sanitizeName(title), true);
+ this.title = camelize(sanitizeName(title), LOWERCASE_FIRST_LETTER);
}
additionalProperties.put(TITLE, this.title);
}
@@ -767,7 +838,7 @@ public class SpringCodegen extends AbstractJavaCodegen
final List authMethods = (List) objs.get("authMethods");
if (authMethods != null) {
for (final CodegenSecurity authMethod : authMethods) {
- authMethod.name = camelize(sanitizeName(authMethod.name), true);
+ authMethod.name = camelize(sanitizeName(authMethod.name), LOWERCASE_FIRST_LETTER);
}
}
}
@@ -850,10 +921,6 @@ public class SpringCodegen extends AbstractJavaCodegen
this.singleContentTypes = singleContentTypes;
}
- public void setUseFeignClient( boolean useFeignClient ) {
- this.useFeignClient = useFeignClient;
- }
-
public void setSkipDefaultInterface(boolean skipDefaultInterface) {
this.skipDefaultInterface = skipDefaultInterface;
}
@@ -1098,4 +1165,12 @@ public class SpringCodegen extends AbstractJavaCodegen
public void setUseSpringBoot3(boolean useSpringBoot3) {
this.useSpringBoot3 = useSpringBoot3;
}
+
+ public RequestMappingMode getRequestMappingMode() {
+ return requestMappingMode;
+ }
+
+ public void setRequestMappingMode(RequestMappingMode requestMappingMode) {
+ this.requestMappingMode = requestMappingMode;
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
index 4d430ac4ee5..a1d0dab0517 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
@@ -42,6 +42,7 @@ import java.time.Instant;
import java.time.temporal.ChronoField;
import java.util.concurrent.TimeUnit;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -827,7 +828,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
@Override
public String toOperationId(String operationId) {
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
// Throw exception if method name is empty.
// This should not happen but keep the check just in case
@@ -837,15 +838,15 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize(("call_" + operationId), true);
+ String newOperationId = camelize(("call_" + operationId), LOWERCASE_FIRST_LETTER);
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId);
return newOperationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, camelize(sanitizeName("call_" + operationId), true));
- operationId = camelize(sanitizeName("call_" + operationId), true);
+ LOGGER.warn("{} (starting with a number) cannot be used as method name. Renamed to {}", operationId, camelize(sanitizeName("call_" + operationId), LOWERCASE_FIRST_LETTER));
+ operationId = camelize(sanitizeName("call_" + operationId), LOWERCASE_FIRST_LETTER);
}
@@ -864,7 +865,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
// camelize the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved words surround with `` or append _
if (isReservedWord(name)) {
@@ -894,7 +895,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
// camelize(lower) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
// for reserved words surround with ``
if (isReservedWord(name)) {
@@ -1019,7 +1020,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
if (enumUnknownDefaultCase) {
if (name.equals(enumUnknownDefaultCaseName)) {
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
}
}
@@ -1031,18 +1032,18 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
// Prefix with underscore if name starts with number
if (name.matches("\\d.*")) {
- return "_" + replaceSpecialCharacters(camelize(name, true));
+ return "_" + replaceSpecialCharacters(camelize(name, LOWERCASE_FIRST_LETTER));
}
// for symbol, e.g. $, #
if (getSymbolName(name) != null) {
- return camelize(WordUtils.capitalizeFully(getSymbolName(name).toUpperCase(Locale.ROOT)), true);
+ return camelize(WordUtils.capitalizeFully(getSymbolName(name).toUpperCase(Locale.ROOT)), LOWERCASE_FIRST_LETTER);
}
// Camelize only when we have a structure defined below
- Boolean camelized = false;
+ boolean camelized = false;
if (name.matches("[A-Z][a-z0-9]+[a-zA-Z0-9]*")) {
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
camelized = true;
}
@@ -1062,7 +1063,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
char[] separators = {'-', '_', ' ', ':', '(', ')'};
return camelize(replaceSpecialCharacters(WordUtils.capitalizeFully(StringUtils.lowerCase(name), separators)
.replaceAll("[-_ :\\(\\)]", "")),
- true);
+ LOWERCASE_FIRST_LETTER);
}
private String replaceSpecialCharacters(String name) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
index 3457324b538..612b9502ad1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -36,6 +36,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen {
@@ -731,7 +732,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
if ("kebab-case".equals(fileNaming)) {
name = dashize(underscore(name));
} else {
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
}
return name;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java
index 73448a4cbef..2b815369955 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java
@@ -17,6 +17,7 @@
package org.openapitools.codegen.languages;
+import io.swagger.v3.oas.models.media.ComposedSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.apache.commons.lang3.StringUtils;
@@ -287,4 +288,10 @@ public class TypeScriptAxiosClientCodegen extends AbstractTypeScriptClientCodege
updatePropertyForMap(property, p);
}
}
+
+ @Override
+ protected void addImport(ComposedSchema composed, Schema childSchema, CodegenModel model, String modelName) {
+ // import everything (including child schema of a composed schema)
+ addImport(model, modelName);
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
index 934fef92462..93ef3994ec4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
@@ -54,6 +54,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -125,7 +126,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo
"varLocalPath", "queryParameters", "headerParams", "formParams", "useFormData", "varLocalDeferred",
"requestOptions", "from",
// Typescript reserved words
- "abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield"));
+ "abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "constructor", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield"));
languageSpecificPrimitives = new HashSet<>(Arrays.asList(
"string",
@@ -588,10 +589,10 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo
// method name cannot use reserved keyword, e.g. return
// append _ at the beginning, e.g. _return
if (isReservedWord(operationId)) {
- return escapeReservedWord(camelize(sanitizeName(operationId), true));
+ return escapeReservedWord(camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER));
}
- return camelize(sanitizeName(operationId), true);
+ return camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER);
}
public void setModelPropertyNaming(String naming) {
@@ -614,7 +615,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return camelize(name, LOWERCASE_FIRST_LETTER);
case PascalCase:
return camelize(name);
case snake_case:
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java
index 6fdb5f0d169..fb4c041cf93 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java
@@ -31,6 +31,7 @@ import org.openapitools.codegen.model.OperationsMap;
import java.io.File;
import java.util.*;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCodegen {
@@ -315,7 +316,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo
if (name.length() == 0) {
return "default.service";
}
- return camelize(name, true) + ".service";
+ return camelize(name, LOWERCASE_FIRST_LETTER) + ".service";
}
@Override
@@ -325,7 +326,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo
@Override
public String toModelFilename(String name) {
- return camelize(toModelName(name), true);
+ return camelize(toModelName(name), LOWERCASE_FIRST_LETTER);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java
index 19b9369bd80..bc74742e283 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java
@@ -33,6 +33,7 @@ import java.io.File;
import java.util.*;
import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public class TypeScriptNestjsClientCodegen extends AbstractTypeScriptClientCodegen {
@@ -543,7 +544,7 @@ public class TypeScriptNestjsClientCodegen extends AbstractTypeScriptClientCodeg
if ("kebab-case".equals(fileNaming)) {
name = dashize(underscore(name));
} else {
- name = camelize(name, true);
+ name = camelize(name, LOWERCASE_FIRST_LETTER);
}
return name;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java
index cd5cde237a2..953465863c3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java
@@ -35,6 +35,7 @@ import java.io.File;
import java.util.*;
import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.camelize;
public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen {
@@ -141,7 +142,7 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen
if (importMapping.containsKey(name)) {
return importMapping.get(name);
}
- return camelize(name, true) + apiSuffix;
+ return camelize(name, LOWERCASE_FIRST_LETTER) + apiSuffix;
}
@Override
@@ -159,7 +160,7 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen
return importMapping.get(name);
}
- return DEFAULT_MODEL_FILENAME_DIRECTORY_PREFIX + camelize(toModelName(name), true);
+ return DEFAULT_MODEL_FILENAME_DIRECTORY_PREFIX + camelize(toModelName(name), LOWERCASE_FIRST_LETTER);
}
@Override
@@ -168,7 +169,7 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen
return importMapping.get(name);
}
- return DEFAULT_MODEL_IMPORT_DIRECTORY_PREFIX + modelPackage() + "/" + camelize(toModelName(name), true);
+ return DEFAULT_MODEL_IMPORT_DIRECTORY_PREFIX + modelPackage() + "/" + camelize(toModelName(name), LOWERCASE_FIRST_LETTER);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
index e9091517b3b..aeaca5caf3c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
@@ -18,6 +18,7 @@
package org.openapitools.codegen.languages;
import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.media.ComposedSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.*;
import org.openapitools.codegen.meta.features.DocumentationFeature;
@@ -420,4 +421,10 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
this.hasOptionalQueryParams = false; // will be updated within addConditionalImportInformation
}
}
+
+ @Override
+ protected void addImport(ComposedSchema composed, Schema childSchema, CodegenModel model, String modelName) {
+ // import everything (including child schema of a composed schema)
+ addImport(model, modelName);
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java
index 034d0cee76d..d7b14546f19 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java
@@ -20,10 +20,13 @@ package org.openapitools.codegen.templating.mustache;
import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Template;
import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.utils.CamelizeOption;
import java.io.IOException;
import java.io.Writer;
+import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
+import static org.openapitools.codegen.utils.CamelizeOption.UPPERCASE_FIRST_CHAR;
import static org.openapitools.codegen.utils.StringUtils.camelize;
/**
@@ -42,10 +45,14 @@ import static org.openapitools.codegen.utils.StringUtils.camelize;
public class CamelCaseLambda implements Mustache.Lambda {
private CodegenConfig generator = null;
private Boolean escapeParam = false;
- private Boolean lowercaseFirstLetter = true;
+ private CamelizeOption option = LOWERCASE_FIRST_LETTER;
public CamelCaseLambda(boolean lowercaseFirstLetter) {
- this.lowercaseFirstLetter = lowercaseFirstLetter;
+ if (lowercaseFirstLetter) {
+ option = LOWERCASE_FIRST_LETTER;
+ } else {
+ option = UPPERCASE_FIRST_CHAR;
+ }
}
public CamelCaseLambda() {}
@@ -62,7 +69,7 @@ public class CamelCaseLambda implements Mustache.Lambda {
@Override
public void execute(Template.Fragment fragment, Writer writer) throws IOException {
- String text = camelize(fragment.execute().replace(" ", "_"), lowercaseFirstLetter);
+ String text = camelize(fragment.execute().replace(" ", "_"), option);
if (generator != null) {
text = generator.sanitizeName(text);
if (generator.reservedWords().contains(text)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TitlecaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TitlecaseLambda.java
index 2d94a5ad7b8..913578f8c99 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TitlecaseLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TitlecaseLambda.java
@@ -61,7 +61,15 @@ public class TitlecaseLambda implements Mustache.Lambda {
}
private String titleCase(final String input) {
- return input.substring(0, 1).toUpperCase(Locale.ROOT) + input.substring(1);
+ if(input == null || "".equals(input)){
+ return "";
+ }
+
+ String firstLetter = input.substring(0, 1).toUpperCase(Locale.ROOT);
+ if (input.length() == 1) {
+ return firstLetter;
+ }
+ return firstLetter + input.substring(1);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/CamelizeOption.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/CamelizeOption.java
new file mode 100644
index 00000000000..838b56b1f2f
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/CamelizeOption.java
@@ -0,0 +1,7 @@
+package org.openapitools.codegen.utils;
+
+public enum CamelizeOption {
+ UPPERCASE_FIRST_CHAR,
+ LOWERCASE_FIRST_LETTER,
+ LOWERCASE_FIRST_CHAR
+}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java
index afd23f24cd7..6f81ef9a327 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java
@@ -17,6 +17,8 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static org.openapitools.codegen.utils.CamelizeOption.UPPERCASE_FIRST_CHAR;
+
public class StringUtils {
/**
@@ -30,7 +32,7 @@ public class StringUtils {
// A cache of camelized words. The camelize() method is invoked many times with the same
// arguments, this cache is used to optimized performance.
- private static Cache, String> camelizedWordsCache;
+ private static Cache, String> camelizedWordsCache;
// A cache of underscored words, used to optimize the performance of the underscore() method.
private static Cache underscoreWordsCache;
@@ -111,7 +113,7 @@ public class StringUtils {
* @return camelized string
*/
public static String camelize(String word) {
- return camelize(word, false);
+ return camelize(word, UPPERCASE_FIRST_CHAR);
}
private static Pattern camelizeSlashPattern = Pattern.compile("\\/(.?)");
@@ -124,16 +126,16 @@ public class StringUtils {
/**
* Camelize name (parameter, property, method, etc)
*
- * @param inputWord string to be camelize
- * @param lowercaseFirstLetter lower case for first letter if set to true
+ * @param inputWord string to be camelize
+ * @param camelizeOption option for the camelize result
* @return camelized string
*/
- public static String camelize(final String inputWord, boolean lowercaseFirstLetter) {
- Pair key = new ImmutablePair<>(inputWord, lowercaseFirstLetter);
+ public static String camelize(final String inputWord, CamelizeOption camelizeOption) {
+ Pair key = new ImmutablePair<>(inputWord, camelizeOption);
return camelizedWordsCache.get(key, pair -> {
String word = pair.getKey();
- Boolean lowerFirstLetter = pair.getValue();
+ CamelizeOption option = pair.getValue();
// Replace all slashes with dots (package separator)
Matcher m = camelizeSlashPattern.matcher(word);
while (m.find()) {
@@ -185,15 +187,13 @@ public class StringUtils {
m = camelizeHyphenPattern.matcher(word);
}
- if (lowerFirstLetter && word.length() > 0) {
- int i = 0;
- char charAt = word.charAt(i);
- while (i + 1 < word.length() && !((charAt >= 'a' && charAt <= 'z') || (charAt >= 'A' && charAt <= 'Z'))) {
- i = i + 1;
- charAt = word.charAt(i);
- }
- i = i + 1;
- word = word.substring(0, i).toLowerCase(Locale.ROOT) + word.substring(i);
+ switch (option) {
+ case LOWERCASE_FIRST_LETTER:
+ word = lowercaseFirstLetter(word);
+ break;
+ case LOWERCASE_FIRST_CHAR:
+ word = word.substring(0, 1).toLowerCase(Locale.ROOT) + word.substring(1);
+ break;
}
// remove all underscore
@@ -202,6 +202,20 @@ public class StringUtils {
});
}
+ private static String lowercaseFirstLetter(String word) {
+ if (word.length() > 0) {
+ int i = 0;
+ char charAt = word.charAt(i);
+ while (i + 1 < word.length() && !((charAt >= 'a' && charAt <= 'z') || (charAt >= 'A' && charAt <= 'Z'))) {
+ i = i + 1;
+ charAt = word.charAt(i);
+ }
+ i = i + 1;
+ word = word.substring(0, i).toLowerCase(Locale.ROOT) + word.substring(i);
+ }
+ return word;
+ }
+
private static class EscapedNameOptions {
public EscapedNameOptions(String name, Set specialChars, List charactersToAllow, String appendToReplacement) {
this.name = name;
diff --git a/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache b/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache
index 7f640ba7475..8b4cf59ff0a 100644
--- a/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache
@@ -42,7 +42,7 @@ public class ServerConfiguration {
throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + ".");
}
}
- url = url.replaceAll("\\{" + name + "\\}", value);
+ url = url.replace("{" + name + "}", value);
}
return url;
}
diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
index d3760936834..39ef41c0339 100644
--- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
@@ -117,7 +117,7 @@ ext {
jackson_version = "2.12.6"
jackson_databind_version = "2.12.6.1"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
jersey_version = "1.19.4"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache
index 84589d91afd..911979d76a4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache
@@ -114,10 +114,10 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.22"
- jackson_version = "2.12.6"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
httpclient_version = "4.5.13"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
index e7fef245346..638d2142af1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
@@ -327,8 +327,8 @@
UTF-81.5.214.5.13
- 2.12.6
- 2.12.6.1
+ 2.13.4
+ 2.13.4.21.3.5
{{#useBeanValidation}}
2.0.2
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
index 6d320edcc9a..bb35f8689f7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -102,10 +102,10 @@ test {
ext {
swagger_annotations_version = "1.5.24"
- jackson_version = "2.12.6.1"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
feign_version = "10.11"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
index 065280d08d8..da07dcf61ae 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
@@ -16,9 +16,9 @@ lazy val root = (project in file(".")).
"io.github.openfeign" % "feign-slf4j" % "10.11" % "compile",
"io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
"io.github.openfeign" % "feign-okhttp" % "10.11" % "compile",
- "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile",
- "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1" % "compile",
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
index 2e9e1be46a3..fb8a34aa42f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
@@ -354,11 +354,11 @@
1.5.2410.113.8.0
- 2.12.5
+ 2.13.4
{{#openApiNullable}}
- 0.2.3
+ 0.2.4
{{/openApiNullable}}
- 2.12.6.1
+ 2.13.4.21.3.55.7.01.0.0
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
index 629facf2582..c14b05a571c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
@@ -98,10 +98,10 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.3"
- jackson_version = "2.12.5"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
google_api_client_version = "1.32.2"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
index c08c686ca6b..78da21f2e81 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
@@ -12,9 +12,9 @@ lazy val root = (project in file(".")).
"io.swagger" % "swagger-annotations" % "1.5.22",
"com.google.api-client" % "google-api-client" % "1.23.0",
"org.glassfish.jersey.core" % "jersey-common" % "2.25.1",
- "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
{{#withXml}}
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.10" % "compile",
{{/withXml}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
index e1d06d235e7..44cc6295a6e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
@@ -297,10 +297,10 @@
1.5.221.32.22.25.1
- 2.12.5
- 2.12.6.1
+ 2.13.4
+ 2.13.4.2
{{#openApiNullable}}
- 0.2.3
+ 0.2.4
{{/openApiNullable}}
{{#joda}}
2.9.9
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
index bf9545f34f4..2a027220da7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -524,6 +524,22 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
throw new RuntimeException("No OAuth2 authentication configured!");
}
+ /**
+ * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+ *
+ * @param clientId the client ID
+ * @return a {@link org.openapitools.client.ApiClient} object.
+ */
+ public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+ for (Authentication auth : authentications.values()) {
+ if (auth instanceof OAuth) {
+ ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+ return this;
+ }
+ }
+ throw new RuntimeException("No OAuth2 authentication configured!");
+ }
+
/**
* Helper method to set the password flow for the first OAuth2 authentication.
*
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
index b7e28e55bfc..8908aa543dd 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
@@ -158,6 +158,19 @@ public class OAuth implements Authentication {
return this;
}
+ public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+ if (Boolean.TRUE.equals(debug)) {
+ service = new ServiceBuilder(clientId)
+ .apiSecretIsEmptyStringUnsafe().debug()
+ .build(authApi);
+ } else {
+ service = new ServiceBuilder(clientId)
+ .apiSecretIsEmptyStringUnsafe()
+ .build(authApi);
+ }
+ return this;
+ }
+
public OAuth usePasswordFlow(String username, String password) {
this.flow = OAuthFlow.PASSWORD;
this.username = username;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index e12528af751..b11d0add3ca 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -99,10 +99,10 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.5"
- jackson_version = "2.13.2"
- jackson_databind_version = "2.13.2.2"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
jersey_version = "2.35"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
index 5ff4b1b0285..dc65e1b496b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
@@ -18,13 +18,13 @@ lazy val root = (project in file(".")).
"org.glassfish.jersey.connectors" % "jersey-apache-connector" % "2.35",
"com.fasterxml.jackson.core" % "jackson-core" % "2.13.2" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.2" % "compile",
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.2.2" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.1" % "compile",
{{#joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.13.2" % "compile",
{{/joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.2" % "compile",
{{#openApiNullable}}
- "org.openapitools" % "jackson-databind-nullable" % "0.2.3" % "compile",
+ "org.openapitools" % "jackson-databind-nullable" % "0.2.4" % "compile",
{{/openApiNullable}}
{{#hasOAuthMethods}}
"com.github.scribejava" % "scribejava-apis" % "8.3.1" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
index dc5a3f4a71a..aceaa42112f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -382,9 +382,9 @@
UTF-81.6.52.35
- 2.13.2
- 2.13.2.2
- 0.2.3
+ 2.13.4
+ 2.13.4.2
+ 0.2.41.3.5
{{#useBeanValidation}}
2.0.2
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
index baaa6037fab..a89642a2758 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
@@ -524,6 +524,22 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
throw new RuntimeException("No OAuth2 authentication configured!");
}
+ /**
+ * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+ *
+ * @param clientId the client ID
+ * @return a {@link org.openapitools.client.ApiClient} object.
+ */
+ public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+ for (Authentication auth : authentications.values()) {
+ if (auth instanceof OAuth) {
+ ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+ return this;
+ }
+ }
+ throw new RuntimeException("No OAuth2 authentication configured!");
+ }
+
/**
* Helper method to set the password flow for the first OAuth2 authentication.
*
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache
index 993bfdcd394..67f56597696 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache
@@ -158,6 +158,19 @@ public class OAuth implements Authentication {
return this;
}
+ public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+ if (Boolean.TRUE.equals(debug)) {
+ service = new ServiceBuilder(clientId)
+ .apiSecretIsEmptyStringUnsafe().debug()
+ .build(authApi);
+ } else {
+ service = new ServiceBuilder(clientId)
+ .apiSecretIsEmptyStringUnsafe()
+ .build(authApi);
+ }
+ return this;
+ }
+
public OAuth usePasswordFlow(String username, String password) {
this.flow = OAuthFlow.PASSWORD;
this.username = username;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
index 8c555046415..55c2dfd81af 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
@@ -99,10 +99,10 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.5"
- jackson_version = "2.13.2"
- jackson_databind_version = "2.13.2.2"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "2.1.0"
jersey_version = "3.0.4"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.sbt.mustache
index 1574b6e6df7..ee811eb8ce7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.sbt.mustache
@@ -16,15 +16,15 @@ lazy val root = (project in file(".")).
"org.glassfish.jersey.media" % "jersey-media-multipart" % "3.0.4",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "3.0.4",
"org.glassfish.jersey.connectors" % "jersey-apache-connector" % "3.0.4",
- "com.fasterxml.jackson.core" % "jackson-core" % "2.13.2" % "compile",
- "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.2" % "compile",
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.2.2" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
{{#joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.13.2" % "compile",
{{/joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.2" % "compile",
{{#openApiNullable}}
- "org.openapitools" % "jackson-databind-nullable" % "0.2.3" % "compile",
+ "org.openapitools" % "jackson-databind-nullable" % "0.2.4" % "compile",
{{/openApiNullable}}
{{#hasOAuthMethods}}
"com.github.scribejava" % "scribejava-apis" % "8.3.1" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
index 9427390e9e2..e546d4a1f7e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
@@ -382,9 +382,9 @@
UTF-81.6.53.0.4
- 2.13.2
- 2.13.2.2
- 0.2.3
+ 2.13.4
+ 2.13.4.2
+ 0.2.42.1.0
{{#useBeanValidation}}
2.0.2
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 3d15f663bf7..0255e20c1fc 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
@@ -336,7 +336,12 @@ public class {{classname}} {
{{#isExplode}}
{{#hasVars}}
{{#vars}}
+ {{#isArray}}
+ localVarQueryParams.addAll(ApiClient.parameterToPairs("multi", "{{baseName}}", {{paramName}}.{{getter}}()));
+ {{/isArray}}
+ {{^isArray}}
localVarQueryParams.addAll(ApiClient.parameterToPairs("{{baseName}}", {{paramName}}.{{getter}}()));
+ {{/isArray}}
{{/vars}}
{{/hasVars}}
{{^hasVars}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
index af793714675..ef6404095a7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
@@ -222,7 +222,7 @@
11112.13.4
- 0.2.3
+ 0.2.41.3.54.13.2
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
index 67dcd41e643..c81b9643a10 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -179,7 +179,6 @@ public class ApiClient {
this.basePath = basePath;
}
-{{#hasOAuthMethods}}
String tokenUrl = "{{{tokenUrl}}}";
if (!"".equals(tokenUrl) && !URI.create(tokenUrl).isAbsolute()) {
URI uri = URI.create(getBasePath());
@@ -196,7 +195,6 @@ public class ApiClient {
retryingOAuth
);
initHttpClient(Collections.singletonList(retryingOAuth));
-{{/hasOAuthMethods}}
// Setup authentications (key: authentication name, value: authentication).{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{^isBasicBasic}}
authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}
@@ -387,7 +385,7 @@ public class ApiClient {
* @return a {@link {{invokerPackage}}.ApiClient} object
*/
public ApiClient setDateFormat(DateFormat dateFormat) {
- this.json.setDateFormat(dateFormat);
+ JSON.setDateFormat(dateFormat);
return this;
}
@@ -398,18 +396,18 @@ public class ApiClient {
* @return a {@link {{invokerPackage}}.ApiClient} object
*/
public ApiClient setSqlDateFormat(DateFormat dateFormat) {
- this.json.setSqlDateFormat(dateFormat);
+ JSON.setSqlDateFormat(dateFormat);
return this;
}
{{#joda}}
public ApiClient setDateTimeFormat(DateTimeFormatter dateFormat) {
- this.json.setDateTimeFormat(dateFormat);
+ JSON.setDateTimeFormat(dateFormat);
return this;
}
public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
- this.json.setLocalDateFormat(dateFormat);
+ JSON.setLocalDateFormat(dateFormat);
return this;
}
@@ -422,7 +420,7 @@ public class ApiClient {
* @return a {@link {{invokerPackage}}.ApiClient} object
*/
public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
- this.json.setOffsetDateTimeFormat(dateFormat);
+ JSON.setOffsetDateTimeFormat(dateFormat);
return this;
}
@@ -433,7 +431,7 @@ public class ApiClient {
* @return a {@link {{invokerPackage}}.ApiClient} object
*/
public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
- this.json.setLocalDateFormat(dateFormat);
+ JSON.setLocalDateFormat(dateFormat);
return this;
}
@@ -445,7 +443,7 @@ public class ApiClient {
* @return a {@link {{invokerPackage}}.ApiClient} object
*/
public ApiClient setLenientOnJson(boolean lenientOnJson) {
- this.json.setLenientOnJson(lenientOnJson);
+ JSON.setLenientOnJson(lenientOnJson);
return this;
}
@@ -745,7 +743,7 @@ public class ApiClient {
return "";
} else if (param instanceof Date {{#joda}}|| param instanceof DateTime || param instanceof LocalDate{{/joda}}{{#jsr310}}|| param instanceof OffsetDateTime || param instanceof LocalDate{{/jsr310}}) {
//Serialize to json string and remove the " enclosing characters
- String jsonStr = json.serialize(param);
+ String jsonStr = JSON.serialize(param);
return jsonStr.substring(1, jsonStr.length() - 1);
} else if (param instanceof Collection) {
StringBuilder b = new StringBuilder();
@@ -753,7 +751,7 @@ public class ApiClient {
if (b.length() > 0) {
b.append(",");
}
- b.append(String.valueOf(o));
+ b.append(o);
}
return b.toString();
} else {
@@ -1045,7 +1043,7 @@ public class ApiClient {
contentType = "application/json";
}
if (isJsonMime(contentType)) {
- return json.deserialize(respBody, returnType);
+ return JSON.deserialize(respBody, returnType);
} else if (returnType.equals(String.class)) {
// Expecting string, return the raw response body.
return (T) respBody;
@@ -1079,13 +1077,13 @@ public class ApiClient {
} else if (isJsonMime(contentType)) {
String content;
if (obj != null) {
- content = json.serialize(obj);
+ content = JSON.serialize(obj);
} else {
content = null;
}
return RequestBody.create(content, MediaType.parse(contentType));
} else if (obj instanceof String) {
- return RequestBody.create(MediaType.parse(contentType), (String) obj);
+ return RequestBody.create((String) obj, MediaType.parse(contentType));
} else {
throw new ApiException("Content type \"" + contentType + "\" is not supported");
}
@@ -1583,7 +1581,7 @@ public class ApiClient {
} else {
String content;
if (obj != null) {
- content = json.serialize(obj);
+ content = JSON.serialize(obj);
} else {
content = null;
}
@@ -1661,7 +1659,7 @@ public class ApiClient {
KeyStore caKeyStore = newEmptyKeyStore(password);
int index = 0;
for (Certificate certificate : certificates) {
- String certificateAlias = "ca" + Integer.toString(index++);
+ String certificateAlias = "ca" + (index++);
caKeyStore.setCertificateEntry(certificateAlias, certificate);
}
trustManagerFactory.init(caKeyStore);
@@ -1736,7 +1734,7 @@ public class ApiClient {
if (entry.getKey().equals(param.getName())) {
switch (param.getIn()) {
case "path":
- path = path.replaceAll("\\{" + param.getName() + "\\}", escapeString(value.toString()));
+ path = path.replace("{" + param.getName() + "}", escapeString(value.toString()));
break;
case "query":
if (value instanceof Collection) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache
index 96c779fd24a..bca54f84d57 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache
@@ -9,6 +9,10 @@
/**
* Set the additional (undeclared) property with the specified name and value.
* If the property does not already exist, create it otherwise replace it.
+ *
+ * @param key name of the property
+ * @param value value of the property
+ * @return the {{classname}} instance itself
*/
public {{classname}} putAdditionalProperty(String key, Object value) {
if (this.additionalProperties == null) {
@@ -20,6 +24,8 @@
/**
* Return the additional (undeclared) property.
+ *
+ * @return a map of objects
*/
public Map getAdditionalProperties() {
return additionalProperties;
@@ -27,6 +33,9 @@
/**
* Return the additional (undeclared) property with the specified name.
+ *
+ * @param key name of the property
+ * @return an object
*/
public Object getAdditionalProperty(String key) {
if (this.additionalProperties == null) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index 52002f8c507..d39478decb6 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -137,7 +137,7 @@ public class {{classname}} {
// create path and map variables
{{^dynamicOperations}}
String localVarPath = "{{{path}}}"{{#pathParams}}
- .replaceAll("\\{" + "{{baseName}}" + "\\}", localVarApiClient.escapeString({{#collectionFormat}}localVarApiClient.collectionPathParameterToString("{{{collectionFormat}}}", {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}.toString(){{/collectionFormat}})){{/pathParams}};
+ .replace("{" + "{{baseName}}" + "}", localVarApiClient.escapeString({{#collectionFormat}}localVarApiClient.collectionPathParameterToString("{{{collectionFormat}}}", {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}.toString(){{/collectionFormat}})){{/pathParams}};
{{/dynamicOperations}}
{{#dynamicOperations}}
ApiOperation apiOperation = localVarApiClient.getOperationLookupMap().get("{{{operationId}}}");
@@ -193,7 +193,9 @@ public class {{classname}} {
{{/dynamicOperations}}
final String[] localVarAccepts = {
- {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}
+ {{#produces}}
+ "{{{mediaType}}}"{{^-last}},{{/-last}}
+ {{/produces}}
};
final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
if (localVarAccept != null) {
@@ -201,7 +203,9 @@ public class {{classname}} {
}
final String[] localVarContentTypes = {
- {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}
+ {{#consumes}}
+ "{{{mediaType}}}"{{^-last}},{{/-last}}
+ {{/consumes}}
};
final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
if (localVarContentType != null) {
@@ -218,15 +222,16 @@ public class {{classname}} {
@SuppressWarnings("rawtypes")
private okhttp3.Call {{operationId}}ValidateBeforeCall({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ApiCallback _callback) throws ApiException {
{{^performBeanValidation}}
- {{#allParams}}{{#required}}
+ {{#allParams}}
+ {{#required}}
// verify the required parameter '{{paramName}}' is set
if ({{paramName}} == null) {
throw new ApiException("Missing the required parameter '{{paramName}}' when calling {{operationId}}(Async)");
}
- {{/required}}{{/allParams}}
- okhttp3.Call localVarCall = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
- return localVarCall;
+ {{/required}}
+ {{/allParams}}
+ return {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
{{/performBeanValidation}}
{{#performBeanValidation}}
@@ -240,9 +245,7 @@ public class {{classname}} {
parameterValues);
if (violations.size() == 0) {
- okhttp3.Call localVarCall = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
- return localVarCall;
-
+ return {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
} else {
throw new BeanValidationException((Set) violations);
}
@@ -253,7 +256,6 @@ public class {{classname}} {
e.printStackTrace();
throw new ApiException(e.getMessage());
}
-
{{/performBeanValidation}}
}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
index cb0e8250550..f11b22c629d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
@@ -56,6 +56,7 @@ public class OAuthOkHttpClient implements HttpClient {
response.body().string(),
response.body().contentType().toString(),
response.code(),
+ response.headers().toMultimap(),
responseClass);
} catch (IOException e) {
throw new OAuthSystemException(e);
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache
index 53f1de15fee..8fea0d29264 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache
@@ -66,8 +66,8 @@ public class RetryingOAuth extends OAuth implements Interceptor {
.setClientSecret(clientSecret));
setFlow(flow);
if (parameters != null) {
- for (String paramName : parameters.keySet()) {
- tokenRequestBuilder.setParameter(paramName, parameters.get(paramName));
+ for (Map.Entry entry : parameters.entrySet()) {
+ tokenRequestBuilder.setParameter(entry.getKey(), entry.getValue());
}
}
}
@@ -130,8 +130,8 @@ public class RetryingOAuth extends OAuth implements Interceptor {
}
Map headers = oAuthRequest.getHeaders();
- for (String headerName : headers.keySet()) {
- requestBuilder.addHeader(headerName, headers.get(headerName));
+ for (Map.Entry entry : headers.entrySet()) {
+ requestBuilder.addHeader(entry.getKey(), entry.getValue());
}
requestBuilder.url(oAuthRequest.getLocationUri());
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index 17258d13e7a..2183fa8d790 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -15,7 +15,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.3.+'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
- classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
+ classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
}
}
@@ -69,7 +69,7 @@ if(hasProperty('target') && target == 'android') {
task.from variant.javaCompile.destinationDir
task.destinationDir = project.file("${project.buildDir}/outputs/jar")
task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
- artifacts.add('archives', task);
+ artifacts.add('archives', task)
}
}
@@ -110,19 +110,19 @@ ext {
}
dependencies {
- implementation 'io.swagger:swagger-annotations:1.6.5'
+ implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
- implementation 'com.squareup.okhttp3:okhttp:4.9.3'
- implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
- implementation 'com.google.code.gson:gson:2.9.0'
+ implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+ implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+ implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.8.5'
implementation 'javax.ws.rs:jsr311-api:1.1.1'
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
{{#openApiNullable}}
- implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
+ implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
{{/openApiNullable}}
{{#hasOAuthMethods}}
- implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
+ implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
{{/hasOAuthMethods}}
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
{{#joda}}
@@ -132,9 +132,9 @@ dependencies {
implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
{{/dynamicOperations}}
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
}
javadoc {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
index e3612cb5d9f..77d6183a97a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -10,17 +10,17 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.6.5",
- "com.squareup.okhttp3" % "okhttp" % "4.9.3",
- "com.squareup.okhttp3" % "logging-interceptor" % "4.9.3",
- "com.google.code.gson" % "gson" % "2.9.0",
+ "com.squareup.okhttp3" % "okhttp" % "4.10.0",
+ "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0",
+ "com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
"javax.ws.rs" % "jsr311-api" % "1.1.1",
"javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
{{#openApiNullable}}
- "org.openapitools" % "jackson-databind-nullable" % "0.2.3",
+ "org.openapitools" % "jackson-databind-nullable" % "0.2.4",
{{/openApiNullable}}
{{#hasOAuthMethods}}
- "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
+ "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
{{/hasOAuthMethods}}
{{#joda}}
"joda-time" % "joda-time" % "2.9.9" % "compile",
@@ -32,7 +32,8 @@ lazy val root = (project in file(".")).
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test",
- "com.novocode" % "junit-interface" % "0.10" % "test"
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+ "com.novocode" % "junit-interface" % "0.10" % "test",
+ "org.mockito" % "mockito-core" % "3.12.4" % "test"
)
)
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
index b2d6a194208..ff011f9a016 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
@@ -12,6 +12,7 @@ import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -497,10 +498,20 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/required}}
{{/items.isModel}}
{{^items.isModel}}
- // ensure the json data is an array
- if ({{#required}}(jsonObj.get("{{{baseName}}}") != null && !jsonObj.get("{{{baseName}}}").isJsonNull()) && {{/required}}!jsonObj.get("{{{baseName}}}").isJsonArray()) {
+ {{^required}}
+ // ensure the optional json data is an array if present
+ if (jsonObj.get("{{{baseName}}}") != null && !jsonObj.get("{{{baseName}}}").isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString()));
}
+ {{/required}}
+ {{#required}}
+ // ensure the required json array is present
+ if (jsonObj.get("{{{baseName}}}") == null) {
+ throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`");
+ } else if (!jsonObj.get("{{{baseName}}}").isJsonArray()) {
+ throw new IllegalArgumentException(String.format("Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString()));
+ }
+ {{/required}}
{{/items.isModel}}
{{/isArray}}
{{^isContainer}}
@@ -597,8 +608,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean());
else
throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString()));
- } else { // non-primitive type
- instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class));
+ } else if (entry.getValue().isJsonArray()) {
+ instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class));
+ } else { // JSON object
+ instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class));
}
}
}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index 992436ede09..d2a7e2cce97 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -57,7 +57,7 @@
org.apache.maven.pluginsmaven-enforcer-plugin
- 3.0.0
+ 3.1.0enforce-maven
@@ -100,6 +100,7 @@
maven-dependency-plugin
+ 3.3.0package
@@ -116,7 +117,7 @@
org.apache.maven.pluginsmaven-jar-plugin
- 3.2.0
+ 3.3.0
@@ -130,7 +131,7 @@
org.codehaus.mojobuild-helper-maven-plugin
- 3.2.0
+ 3.3.0add_sources
@@ -161,7 +162,7 @@
org.apache.maven.pluginsmaven-javadoc-plugin
- 3.3.2
+ 3.4.1attach-javadocs
@@ -184,7 +185,7 @@
org.apache.maven.pluginsmaven-source-plugin
- 3.2.0
+ 3.2.1attach-sources
@@ -299,7 +300,7 @@
org.apache.oltu.oauth2org.apache.oltu.oauth2.client
- 1.0.1
+ 1.0.2
{{/hasOAuthMethods}}
@@ -401,14 +402,14 @@
${java.version}1.8.51.6.5
- 4.9.3
- 2.9.0
+ 4.10.0
+ 2.9.13.12.0
{{#openApiNullable}}
- 0.2.3
+ 0.2.4
{{/openApiNullable}}
{{#joda}}
- 2.10.13
+ 2.12.0
{{/joda}}
1.3.5
{{#performBeanValidation}}
@@ -417,12 +418,12 @@
{{#useBeanValidation}}
2.0.2
{{/useBeanValidation}}
- 5.8.2
- 1.6.2
+ 5.9.1
+ 1.9.13.12.42.1.11.1.1UTF-8
- 2.21.0
+ 2.27.2
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
index 4c9801cfdc4..67a9e7191a4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
@@ -101,10 +101,10 @@ ext {
rest_assured_version = "4.5.1"
junit_version = "4.13.2"
{{#jackson}}
- jackson_version = "2.12.5"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
{{/jackson}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
index 47acb40b9c5..820edf8d661 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
@@ -14,19 +14,19 @@ lazy val root = (project in file(".")).
"io.rest-assured" % "scala-support" % "4.5.1",
"com.google.code.findbugs" % "jsr305" % "3.0.2",
{{#jackson}}
- "com.fasterxml.jackson.core" % "jackson-core" % "2.12.5",
- "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.5",
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1",
+ "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4",
+ "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4",
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2",
{{#openApiNullable}}
- "org.openapitools" % "jackson-databind-nullable" % "0.2.3",
+ "org.openapitools" % "jackson-databind-nullable" % "0.2.4",
{{/openApiNullable}}
{{#withXml}}
- "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.12.6.1",
+ "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.13.4.1",
{{/withXml}}
{{#joda}}
- "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.12.6.1",
+ "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.13.4.1",
{{/joda}}
- "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.12.6.1",
+ "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.4.1",
{{/jackson}}
{{#gson}}
"com.google.code.gson" % "gson" % "2.8.9",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
index b1d15a0dc80..21c5cf6d25d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -338,9 +338,9 @@
2.10.5
{{/joda}}
{{#jackson}}
- 2.12.5
- 2.12.6.1
- 0.2.3
+ 2.13.4
+ 2.13.4.2
+ 0.2.4
{{/jackson}}
1.3.5
{{#useBeanValidation}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
index 1ab85d70556..93a8b84ffc8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
@@ -98,10 +98,10 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.3"
- jackson_version = "2.10.5"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
threetenbp_version = "2.9.10"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
index 97d330b7da0..3e1de7399e1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
@@ -13,9 +13,9 @@ lazy val root = (project in file(".")).
"org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final" % "compile",
"org.jboss.resteasy" % "resteasy-multipart-provider" % "4.5.11.Final" % "compile",
"org.jboss.resteasy" % "resteasy-jackson2-provider" % "4.5.11.Final" % "compile",
- "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile",
- "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile",
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
index 12f66fe0852..51ad71c3d76 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -279,10 +279,10 @@
UTF-81.6.34.7.6.Final
- 2.10.5
- 2.12.6.1
+ 2.13.4
+ 2.13.4.2
{{#openApiNullable}}
- 0.2.3
+ 0.2.4
{{/openApiNullable}}
1.3.52.9.10
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
index edf70a6237a..ba319ebc890 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -98,10 +98,10 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.22"
- jackson_version = "2.10.5"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
spring_web_version = "5.3.18"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
index 223bc90517f..637ce128ca9 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -308,7 +308,7 @@
5.3.182.12.72.12.7
- 0.2.3
+ 0.2.41.3.5
{{#joda}}
2.9.9
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index 7f2b0569ae8..5deba46d401 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -100,10 +100,10 @@ ext {
oltu_version = "1.0.1"
retrofit_version = "2.3.0"
{{#usePlayWS}}
- jackson_version = "2.12.1"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
play_version = "2.6.7"
{{/usePlayWS}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index f19624661e5..0bc66fde845 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -18,9 +18,9 @@ lazy val root = (project in file(".")).
"com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
"jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
- "com.fasterxml.jackson.core" % "jackson-core" % "2.12.1" % "compile",
- "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.1" % "compile",
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
{{/usePlayWS}}
{{#useRxJava2}}
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
index ce5a737fd40..5ec0dd02534 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -363,11 +363,11 @@
1.8.31.6.3
{{#usePlayWS}}
- 2.12.1
- 2.12.6.1
+ 2.13.4
+ 2.13.4.22.6.7
{{#openApiNullable}}
- 0.2.3
+ 0.2.4
{{/openApiNullable}}
{{/usePlayWS}}
2.5.0
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
index 8e8a20e422d..6f9d9e6bb2c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
@@ -30,12 +30,12 @@ task execute(type:JavaExec) {
ext {
swagger_annotations_version = "1.5.21"
- jackson_version = "2.10.5"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
vertx_version = "3.4.2"
junit_version = "4.13.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
index c32d1152404..099abffe2bb 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
@@ -292,9 +292,9 @@
UTF-83.4.21.5.22
- 2.10.5
- 2.12.6.1
- 0.2.3
+ 2.13.4
+ 2.13.4.2
+ 0.2.41.3.54.13.2
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
index aeed99cbc1e..c9950a00c6a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
@@ -517,7 +517,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* @return boolean true if the MediaType represents JSON, false otherwise
*/
public boolean isJsonMime(MediaType mediaType) {
- return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*\\+json[;]?\\s*$"));
+ return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*(\\+json|ndjson)[;]?\\s*$"));
}
/**
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
index 27d2cd43e7f..5d97c7d0f1b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
@@ -114,10 +114,10 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.3"
spring_boot_version = "2.6.6"
- jackson_version = "2.12.7"
- jackson_databind_version = "2.12.7"
+ jackson_version = "2.13.4"
+ jackson_databind_version = "2.13.4.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.3"
+ jackson_databind_nullable_version = "0.2.4"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
reactor_version = "3.4.3"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
index 660e76a1d4c..22faa52f939 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
@@ -148,10 +148,10 @@
UTF-81.6.32.6.6
- 2.12.7
- 2.12.7
+ 2.13.4
+ 2.13.4.2
{{#openApiNullable}}
- 0.2.3
+ 0.2.4
{{/openApiNullable}}
1.3.54.13.2
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
index 09893b8df21..c66a9702887 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
@@ -1,6 +1,8 @@
package {{package}};
+{{#models.0}}
import {{modelPackage}}.*;
+{{/models.0}}
import {{package}}.{{classname}}Service;
import {{package}}.factories.{{classname}}ServiceFactory;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
index d395bb8ee2b..0aa3241c26d 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
@@ -1,7 +1,9 @@
package {{package}};
import {{package}}.*;
+{{#models.0}}
import {{modelPackage}}.*;
+{{/models.0}}
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
index af96791e89b..ab4aff25991 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
@@ -1,8 +1,9 @@
package {{package}}.impl;
import {{package}}.*;
+{{#models.0}}
import {{modelPackage}}.*;
-
+{{/models.0}}
{{#imports}}import {{import}};
{{/imports}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
index cf48c4834a1..d548a7be1fe 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
@@ -96,11 +96,11 @@ import javax.annotation.Generated;
{{#virtualService}}
@VirtualService
{{/virtualService}}
-{{^useFeignClient}}
+{{#useRequestMappingOnInterface}}
{{=<% %>=}}
@RequestMapping("${openapi.<%title%>.base-path:<%>defaultBasePath%>}")
<%={{ }}=%>
-{{/useFeignClient}}
+{{/useRequestMappingOnInterface}}
public interface {{classname}} {
{{#jdk8-default-interface}}
{{^isDelegate}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
index 85589bb7b67..d6be388587d 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
@@ -58,6 +58,11 @@ import javax.annotation.Generated;
{{>generatedAnnotation}}
@Controller
+{{#useRequestMappingOnController}}
+{{=<% %>=}}
+@RequestMapping("${openapi.<%title%>.base-path:<%>defaultBasePath%>}")
+<%={{ }}=%>
+{{/useRequestMappingOnController}}
{{#operations}}
public class {{classname}}Controller implements {{classname}} {
{{#isDelegate}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache
new file mode 100644
index 00000000000..a331ded633b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache
@@ -0,0 +1,34 @@
+package {{configPackage}};
+
+{{#models}}
+ {{#model}}
+ {{#isEnum}}
+import {{modelPackage}}.{{name}};
+ {{/isEnum}}
+ {{/model}}
+{{/models}}
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+@Configuration
+public class EnumConverterConfiguration {
+
+{{#models}}
+{{#model}}
+{{#isEnum}}
+ @Bean
+ Converter<{{{dataType}}}, {{name}}> {{classVarName}}Converter() {
+ return new Converter<{{{dataType}}}, {{name}}>() {
+ @Override
+ public {{name}} convert({{{dataType}}} source) {
+ return {{name}}.fromValue(source);
+ }
+ };
+ }
+{{/isEnum}}
+{{/model}}
+{{/models}}
+
+}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/apiClient.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/apiClient.mustache
index f00a6c3b6f7..adc5145d080 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/apiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/apiClient.mustache
@@ -3,8 +3,6 @@ package {{package}};
import org.springframework.cloud.openfeign.FeignClient;
import {{configPackage}}.ClientConfiguration;
-{{=<% %>=}}
-@FeignClient(name="${<%classVarName%>.name:<%classVarName%>}", url="${<%classVarName%>.url:<%basePath%>}", configuration = ClientConfiguration.class)
-<%={{ }}=%>
+@FeignClient(name="${{openbrace}}{{classVarName}}.name:{{classVarName}}{{closebrace}}", {{#useFeignClientUrl}}url="${{openbrace}}{{classVarName}}.url:{{basePath}}{{closebrace}}", {{/useFeignClientUrl}}configuration = ClientConfiguration.class)
public interface {{classname}}Client extends {{classname}} {
}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache
index 28a6ea60ac0..23dfcf6759b 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache
@@ -43,5 +43,5 @@ Mono result = Mono.empty();
{{^examples}}
exchange.getResponse().setStatusCode({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}});
{{/examples}}
- return result.then(Mono.empty());
+ return result{{#allParams}}{{#isBodyParam}}{{^isArray}}{{#paramName}}.then({{.}}){{/paramName}}{{/isArray}}{{#isArray}}{{#paramName}}.thenMany({{.}}){{/paramName}}{{/isArray}}{{/isBodyParam}}{{/allParams}}.then(Mono.empty());
{{/reactive}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache
index 8de1caf4bfa..eeafa6e8843 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache
@@ -5,6 +5,7 @@ using System.Collections;
using System.Globalization;
using System.IO;
using System.Linq;
+using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
{{#useCompareNetObjects}}
@@ -112,6 +113,8 @@ namespace {{packageName}}.Client
return boolean ? "true" : "false";
if (obj is ICollection collection)
return string.Join(",", collection.Cast
](https://www.onesignal.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
[
](https://www.virtualansoftware.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
[
](https://www.merge.dev/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[
](https://www.burkert.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[
](https://www.finbourne.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring
@@ -70,8 +72,8 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
| | Languages/Frameworks |
| -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 13.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
-| **Server stubs** | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) |
+| **API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 13.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
+| **Server stubs** | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) |
| **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML** |
| **Configuration files** | [**Apache2**](https://httpd.apache.org/) |
| **Others** | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL** |
@@ -682,6 +684,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
- [TribalScale](https://www.tribalscale.com)
- [Trifork](https://trifork.com)
- [TUI InfoTec GmbH](http://www.tui-infotec.com/)
+- [Twilio](https://www.twilio.com/)
- [Twitter](https://twitter.com)
- [unblu inc.](https://www.unblu.com/)
- [Veamly](https://www.veamly.com/)
@@ -872,6 +875,8 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
- 2022-08-01 - [Tutorial: Etsy Open API v3 (ruby)](https://blog.tjoyal.dev/etsy-open-api-v3/) by [Thierry Joyal](https://github.com/tjoyal)
- 2022-09-03 - [OpenAPI Generator For Go Web Development](https://blog.kevinhu.me/2022/09/03/03-openapi-generator/) by [Kevin Hu](https://twitter.com/Oldgunix)
- 2022-10-01 - [OpenAPI Generatorをカスタマイズしたコードを生成する（Swagger Codegenとほぼ同じ）](https://nainaistar.hatenablog.com/entry/2022/10/03/120000) by [きり丸](https://twitter.com/nainaistar)
+- 2022-10-21 - [Kotlin（Spring Boot）の API を OpenAPI Generator で自動生成](https://zenn.dev/msksgm/articles/20221021-kotlin-spring-openapi-generator) by [msksgm](https://zenn.dev/msksgm)
+- 2022-10-26 - [Quarkus Insights #106: Quarkiverse Extension Spotlight: OpenApi Generator](https://www.youtube.com/watch?v=_s_if69t2iQ) by [Quarkusio](https://www.youtube.com/c/Quarkusio)
## [6 - About Us](#table-of-contents)
@@ -942,6 +947,7 @@ Here is a list of template creators:
* Java (Rest-assured): @viclovsky
* Java (Java 11 Native HTTP client): @bbdouglas
* Java (Apache HttpClient): @harrywhite4
+ * Java (Helidon): @spericas @tjquinno @tvallin
* Javascript/NodeJS: @jfiala
* JavaScript (Apollo DataSource): @erithmetic
* JavaScript (Closure-annotated Angular) @achew22
@@ -1009,6 +1015,7 @@ Here is a list of template creators:
* Java PKMST: @anshu2185 @sanshuman @rkumar-pk @ninodpillai
* Java Vert.x: @lwlee2608
* Java Micronaut: @andriy-dmytruk
+ * Java Helidon: @spericas @tjquinno @tvallin
* JAX-RS RestEasy: @chameleon82
* JAX-RS CXF: @hiveship
* JAX-RS CXF (CDI): @nickcmaynard
diff --git a/bin/configs/kotlin-jvm-vertx-gson.yaml b/bin/configs/kotlin-jvm-vertx-gson.yaml
new file mode 100644
index 00000000000..50bfafb94dc
--- /dev/null
+++ b/bin/configs/kotlin-jvm-vertx-gson.yaml
@@ -0,0 +1,8 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-jvm-vertx-gson
+library: jvm-vertx
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+ artifactId: kotlin-petstore-jvm-vertx
+ serializationLibrary: "gson"
\ No newline at end of file
diff --git a/bin/configs/kotlin-jvm-vertx-jackson-coroutines.yaml b/bin/configs/kotlin-jvm-vertx-jackson-coroutines.yaml
new file mode 100644
index 00000000000..64693cba0e7
--- /dev/null
+++ b/bin/configs/kotlin-jvm-vertx-jackson-coroutines.yaml
@@ -0,0 +1,9 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines
+library: jvm-vertx
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+ artifactId: kotlin-petstore-jvm-vertx
+ serializationLibrary: "jackson"
+ useCoroutines: "true"
diff --git a/bin/configs/kotlin-jvm-vertx-jackson.yaml b/bin/configs/kotlin-jvm-vertx-jackson.yaml
new file mode 100644
index 00000000000..f23e8f4237c
--- /dev/null
+++ b/bin/configs/kotlin-jvm-vertx-jackson.yaml
@@ -0,0 +1,8 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-jvm-vertx-jackson
+library: jvm-vertx
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+ artifactId: kotlin-petstore-jvm-vertx
+ serializationLibrary: "jackson"
\ No newline at end of file
diff --git a/bin/configs/kotlin-jvm-vertx-moshi.yaml b/bin/configs/kotlin-jvm-vertx-moshi.yaml
new file mode 100644
index 00000000000..e3d658c39f3
--- /dev/null
+++ b/bin/configs/kotlin-jvm-vertx-moshi.yaml
@@ -0,0 +1,8 @@
+generatorName: kotlin
+outputDir: samples/client/petstore/kotlin-jvm-vertx-moshi
+library: jvm-vertx
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+additionalProperties:
+ artifactId: kotlin-petstore-jvm-vertx
+ serializationLibrary: "moshi"
\ No newline at end of file
diff --git a/bin/configs/spring-boot-oas3.yaml b/bin/configs/spring-boot-oas3.yaml
index 21994a14ad4..1c4c87f1940 100644
--- a/bin/configs/spring-boot-oas3.yaml
+++ b/bin/configs/spring-boot-oas3.yaml
@@ -8,3 +8,4 @@ additionalProperties:
artifactId: springboot
snapshotVersion: "true"
hideGenerationTimestamp: "true"
+ requestMappingMode: api_interface
diff --git a/bin/configs/spring-boot.yaml b/bin/configs/spring-boot.yaml
index fe2345e7126..c0d8268ae70 100644
--- a/bin/configs/spring-boot.yaml
+++ b/bin/configs/spring-boot.yaml
@@ -7,3 +7,4 @@ additionalProperties:
artifactId: springboot
snapshotVersion: "true"
hideGenerationTimestamp: "true"
+ camelCaseDollarSign: "true"
diff --git a/bin/configs/typescript-rxjs-allOf-composition.yaml b/bin/configs/typescript-rxjs-allOf-composition.yaml
new file mode 100644
index 00000000000..e9bca87aa19
--- /dev/null
+++ b/bin/configs/typescript-rxjs-allOf-composition.yaml
@@ -0,0 +1,4 @@
+generatorName: typescript-rxjs
+outputDir: samples/client/others/typescript-rxjs/allOf-composition
+inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf_composition.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs
diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md
index 76ec86abae0..e60f802f17b 100644
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -26,6 +26,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false|
|dateLibrary|Option. Date library to use|