[JAVA] Add missing dependencies in templates (#20075)

* Add commons-lang3 dependency for useReflectionEqualsHashCode * Fix feign-no-nullable config/sample * Add commons-lang3 dependency to jersey2 * Add & update mutiny dependency for microprofile * Regenerate samples
OpenAPITools · Nov 14, 2024 · 216ba30 · 216ba30
1 parent ee698f1
commit 216ba30
Show file tree

Hide file tree

Showing 426 changed files with 10,340 additions and 2,528 deletions.
diff --git a/.github/workflows/samples-java-client-jdk11.yaml b/.github/workflows/samples-java-client-jdk11.yaml
@@ -63,12 +63,15 @@ jobs:
           - samples/client/petstore/java/rest-assured
           - samples/client/petstore/java/rest-assured-jackson
           - samples/client/petstore/java/microprofile-rest-client
+          - samples/client/petstore/java/microprofile-rest-client-mutiny
           - samples/client/petstore/java/microprofile-rest-client-3.0
           - samples/client/petstore/java/microprofile-rest-client-3.0-jackson
           - samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml
+          - samples/client/petstore/java/microprofile-rest-client-3.0-mutiny
           - samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter
           - samples/client/petstore/java/apache-httpclient
           - samples/client/petstore/java/feign
+          - samples/client/petstore/java/feign-no-nullable
           - samples/client/petstore/java/okhttp-gson-awsv4signature
           - samples/openapi3/client/petstore/java/jersey2-java8-special-characters
           - samples/openapi3/client/petstore/java/native

diff --git a/bin/configs/java-feign-no-nullable.yaml b/bin/configs/java-feign-no-nullable.yaml
@@ -6,6 +6,8 @@ templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   booleanGetterPrefix: is
   artifactId: petstore-feign-no-nullable
-  hideGenerationTimestamp: "true"
+  hideGenerationTimestamp: true
   additionalModelTypeAnnotations: '@javax.annotation.concurrent.Immutable'
-  openApiNullable: "false"
+  openApiNullable: false
+  useReflectionEqualsHashCode: true
+  annotationLibrary: "swagger1"
diff --git a/bin/configs/java-jersey2-8.yaml b/bin/configs/java-jersey2-8.yaml
@@ -11,4 +11,5 @@ additionalProperties:
   useOneOfDiscriminatorLookup: true
   disallowAdditionalPropertiesIfNotPresent: false
   gradleProperties: "\n# JVM arguments\norg.gradle.jvmargs=-Xmx2024m -XX:MaxPermSize=512m\n# set timeout\norg.gradle.daemon.idletimeout=3600000\n# show all warnings\norg.gradle.warning.mode=all"
-  failOnUnknownProperties: true
+  failOnUnknownProperties: true
+  useReflectionEqualsHashCode: true
diff --git a/bin/configs/java-jersey3.yaml b/bin/configs/java-jersey3.yaml
@@ -12,4 +12,5 @@ additionalProperties:
   useOneOfDiscriminatorLookup: true
   disallowAdditionalPropertiesIfNotPresent: false
   gradleProperties: "\n# JVM arguments\norg.gradle.jvmargs=-Xmx2024m -XX:MaxPermSize=512m\n# set timeout\norg.gradle.daemon.idletimeout=3600000\n# show all warnings\norg.gradle.warning.mode=all"
-  failOnUnknownProperties: true
+  failOnUnknownProperties: true
+  useReflectionEqualsHashCode: true
diff --git a/bin/configs/java-microprofile-rest-client-3.0-mutiny.yaml b/bin/configs/java-microprofile-rest-client-3.0-mutiny.yaml
@@ -0,0 +1,10 @@
+generatorName: java
+outputDir: samples/client/petstore/java/microprofile-rest-client-3.0-mutiny
+library: microprofile
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: microprofile-rest-client-3-mutiny
+  configKey: petstore
+  microprofileRestClientVersion: "3.0"
+  microprofileMutiny: true
diff --git a/bin/configs/java-microprofile-rest-client-mutiny.yaml b/bin/configs/java-microprofile-rest-client-mutiny.yaml
@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/petstore/java/microprofile-rest-client-mutiny
+library: microprofile
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: microprofile-rest-client-mutiny
+  configKeyFromClassName: true
+  microprofileMutiny: true
diff --git a/bin/configs/java-native.yaml b/bin/configs/java-native.yaml
@@ -7,3 +7,4 @@ additionalProperties:
   artifactId: petstore-native
   hideGenerationTimestamp: "true"
   generateBuilders: true
+  useReflectionEqualsHashCode: "true"
diff --git a/bin/configs/java-okhttp-gson.yaml b/bin/configs/java-okhttp-gson.yaml
@@ -11,9 +11,10 @@ parameterNameMappings:
   type_: typeWithUnderscore
 additionalProperties:
   artifactId: petstore-okhttp-gson
-  hideGenerationTimestamp: "true"
-  useOneOfDiscriminatorLookup: "true"
+  hideGenerationTimestamp: true
+  useOneOfDiscriminatorLookup: true
   disallowAdditionalPropertiesIfNotPresent: false
+  useReflectionEqualsHashCode:: true
 enumNameMappings:
   s: LOWER_CASE_S
   S: UPPER_CASE_S

diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
@@ -126,6 +126,9 @@ ext {
     jersey_version = "1.19.4"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
+    {{#useReflectionEqualsHashCode}}
+    commons_lang3_version = "3.17.0"
+    {{/useReflectionEqualsHashCode}}
 }
 
 dependencies {
@@ -148,6 +151,9 @@ dependencies {
     {{#useBeanValidation}}
     implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
     {{/useBeanValidation}}
+    {{#useReflectionEqualsHashCode}}
+    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
+    {{/useReflectionEqualsHashCode}}
     testImplementation "junit:junit:$junit_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"

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
@@ -114,6 +114,9 @@ ext {
     feign_form_version = "3.8.0"
     junit_version = "5.7.0"
     scribejava_version = "8.0.0"
+    {{#useReflectionEqualsHashCode}}
+    commons_lang3_version = "3.17.0"
+    {{/useReflectionEqualsHashCode}}
 }
 
 dependencies {
@@ -127,9 +130,9 @@ dependencies {
     implementation "io.github.openfeign:feign-okhttp:$feign_version"
     implementation "io.github.openfeign.form:feign-form:$feign_form_version"
     {{#jackson}}
-        {{#joda}}
+    {{#joda}}
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
-        {{/joda}}
+    {{/joda}}
     implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
@@ -142,6 +145,9 @@ dependencies {
     implementation "com.github.scribejava:scribejava-core:$scribejava_version"
     implementation "com.brsanthu:migbase64:2.2"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+    {{#useReflectionEqualsHashCode}}
+    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
+    {{/useReflectionEqualsHashCode}}
     testImplementation "org.junit.jupiter:junit-jupiter:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"

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
@@ -28,6 +28,9 @@ lazy val root = (project in file(".")).
       "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
+{{#useReflectionEqualsHashCode}}
+      "org.apache.commons" % "commons-lang3" % "3.17.0" % "compile",
+{{/useReflectionEqualsHashCode}}
       "org.junit.jupiter" % "junit-jupiter" % "5.7.0" % "test",
       "org.junit.jupiter" % "junit-jupiter-params" % "5.7.0" % "test",
       "com.github.tomakehurst" % "wiremock-jre8" % "2.35.1" % "test",

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
@@ -345,6 +345,14 @@
             <scope>provided</scope>
         </dependency>
         {{/useBeanValidation}}
+        {{#useReflectionEqualsHashCode}}
+        <!-- For equals and hashCode using reflection -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3-version}</version>
+        </dependency>
+        {{/useReflectionEqualsHashCode}}
 
         <!-- test dependencies -->
         <dependency>
@@ -409,6 +417,9 @@
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
+        {{#useReflectionEqualsHashCode}}
+        <commons-lang3-version>3.17.0</commons-lang3-version>
+        {{/useReflectionEqualsHashCode}}
         <junit-version>5.10.0</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <scribejava-version>8.3.3</scribejava-version>

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
@@ -116,6 +116,9 @@ ext {
     {{#hasHttpSignatureMethods}}
     tomitribe_http_signatures_version = "1.7"
     {{/hasHttpSignatureMethods}}
+    {{#useReflectionEqualsHashCode}}
+    commons_lang3_version = "3.17.0"
+    {{/useReflectionEqualsHashCode}}
 }
 
 dependencies {
@@ -146,6 +149,9 @@ dependencies {
     {{#useBeanValidation}}
     implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
     {{/useBeanValidation}}
+    {{#useReflectionEqualsHashCode}}
+    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
+    {{/useReflectionEqualsHashCode}}
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
 }

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
@@ -33,6 +33,9 @@ lazy val root = (project in file(".")).
       "org.tomitribe" % "tomitribe-http-signatures" % "1.7" % "compile",
       {{/hasHttpSignatureMethods}}
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
+  {{#useReflectionEqualsHashCode}}
+        "org.apache.commons" % "commons-lang3" % "3.17.0" % "compile",
+  {{/useReflectionEqualsHashCode}}
       "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
     )
   )
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
@@ -379,6 +379,15 @@
             <artifactId>jersey-apache-connector</artifactId>
             <version>${jersey-version}</version>
         </dependency>
+        {{#useReflectionEqualsHashCode}}
+        <!-- For equals and hashCode using reflection -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3-version}</version>
+        </dependency>
+        {{/useReflectionEqualsHashCode}}
+
         <!-- test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -414,6 +423,9 @@
         {{#hasOAuthMethods}}
         <scribejava-apis-version>8.3.3</scribejava-apis-version>
         {{/hasOAuthMethods}}
+        {{#useReflectionEqualsHashCode}}
+        <commons-lang3-version>3.17.0</commons-lang3-version>
+        {{/useReflectionEqualsHashCode}}
         <spotless.version>2.21.0</spotless.version>
     </properties>
 </project>
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
@@ -116,6 +116,9 @@ ext {
     {{#hasHttpSignatureMethods}}
     tomitribe_http_signatures_version = "1.7"
     {{/hasHttpSignatureMethods}}
+    {{#useReflectionEqualsHashCode}}
+    commons_lang3_version = "3.17.0"
+    {{/useReflectionEqualsHashCode}}
 }
 
 dependencies {
@@ -146,6 +149,9 @@ dependencies {
     {{#useBeanValidation}}
     implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
     {{/useBeanValidation}}
+    {{#useReflectionEqualsHashCode}}
+    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
+    {{/useReflectionEqualsHashCode}}
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"

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
@@ -33,6 +33,9 @@ lazy val root = (project in file(".")).
       "org.tomitribe" % "tomitribe-http-signatures" % "1.7" % "compile",
       {{/hasHttpSignatureMethods}}
       "jakarta.annotation" % "jakarta.annotation-api" % "2.1.0" % "compile",
+  {{#useReflectionEqualsHashCode}}
+        "org.apache.commons" % "commons-lang3" % "3.17.0" % "compile",
+  {{/useReflectionEqualsHashCode}}
       "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
     )
   )
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
@@ -379,6 +379,15 @@
             <artifactId>jersey-apache-connector</artifactId>
             <version>${jersey-version}</version>
         </dependency>
+        {{#useReflectionEqualsHashCode}}
+        <!-- For equals and hashCode using reflection -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3-version}</version>
+        </dependency>
+        {{/useReflectionEqualsHashCode}}
+
         <!-- test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -408,6 +417,9 @@
         {{#hasOAuthMethods}}
         <scribejava-apis-version>8.3.3</scribejava-apis-version>
         {{/hasOAuthMethods}}
+        {{#useReflectionEqualsHashCode}}
+        <commons-lang3-version>3.17.0</commons-lang3-version>
+        {{/useReflectionEqualsHashCode}}
         <spotless.version>2.21.0</spotless.version>
     </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -249,7 +249,7 @@
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
 {{#microprofileMutiny}}
-    <mutiny.version>1.2.0</mutiny.version>
+    <mutiny.version>1.10.0</mutiny.version>
 {{/microprofileMutiny}}
 {{#useReflectionEqualsHashCode}}
     <commons.lang3.version>3.17.0</commons.lang3.version>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
@@ -189,6 +189,13 @@
         <version>${jakarta.annotation.version}</version>
         <scope>provided</scope>
     </dependency>
+{{#microprofileMutiny}}
+    <dependency>
+        <groupId>io.smallrye.reactive</groupId>
+        <artifactId>mutiny</artifactId>
+        <version>${mutiny.version}</version>
+    </dependency>
+{{/microprofileMutiny}}
 {{#useReflectionEqualsHashCode}}
     <!-- For equals and hashCode using reflection -->
     <dependency>
@@ -241,6 +248,9 @@
     <jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
     <maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
+{{#microprofileMutiny}}
+    <mutiny.version>1.10.0</mutiny.version>
+{{/microprofileMutiny}}
 {{#useReflectionEqualsHashCode}}
     <commons.lang3.version>3.17.0</commons.lang3.version>
 {{/useReflectionEqualsHashCode}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
@@ -85,6 +85,9 @@ ext {
     {{#hasFormParamsInSpec}}
     httpmime_version = "4.5.13"
     {{/hasFormParamsInSpec}}
+    {{#useReflectionEqualsHashCode}}
+    commons_lang3_version = "3.17.0"
+    {{/useReflectionEqualsHashCode}}
 }
 
 dependencies {
@@ -107,6 +110,9 @@ dependencies {
     {{#hasFormParamsInSpec}}
     implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
     {{/hasFormParamsInSpec}}
+    {{#useReflectionEqualsHashCode}}
+    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
+    {{/useReflectionEqualsHashCode}}
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }
 

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
@@ -271,6 +271,14 @@
             <version>${httpmime-version}</version>
         </dependency>
         {{/hasFormParamsInSpec}}
+        {{#useReflectionEqualsHashCode}}
+        <!-- For equals and hashCode using reflection -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3-version}</version>
+        </dependency>
+        {{/useReflectionEqualsHashCode}}
 
         <!-- test dependencies -->
         <dependency>
@@ -304,6 +312,9 @@
         {{#hasFormParamsInSpec}}
         <httpmime-version>4.5.14</httpmime-version>
         {{/hasFormParamsInSpec}}
+        {{#useReflectionEqualsHashCode}}
+        <commons-lang3-version>3.17.0</commons-lang3-version>
+        {{/useReflectionEqualsHashCode}}
         <junit-version>5.10.2</junit-version>
         <spotless.version>2.27.2</spotless.version>
     </properties>

diff --git a/...les/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/...les/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -126,7 +126,7 @@ dependencies {
     {{#hasOAuthMethods}}
     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'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
     {{#joda}}
     implementation 'joda-time:joda-time:2.9.9'
     {{/joda}}

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
@@ -13,7 +13,7 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp3" % "okhttp" % "4.12.0",
       "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
       "com.google.code.gson" % "gson" % "2.9.1",
-      "org.apache.commons" % "commons-lang3" % "3.12.0",
+      "org.apache.commons" % "commons-lang3" % "3.17.0",
       "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
       {{#openApiNullable}}
       "org.openapitools" % "jackson-databind-nullable" % "0.2.6",

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
@@ -414,7 +414,7 @@
         {{/swagger2AnnotationLibrary}}
         <okhttp-version>4.12.0</okhttp-version>
         <gson-version>2.10.1</gson-version>
-        <commons-lang3-version>3.14.0</commons-lang3-version>
+        <commons-lang3-version>3.17.0</commons-lang3-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}