Update samples and docs

Author: robinmarechal

docs/generators/java-microprofile.md

@@ -97,8 +97,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useBeanValidation|Use BeanValidation API annotations| |false|
 |useEnumCaseInsensitive|Use `equalsIgnoreCase` when String for enum comparison| |false|
 |useGzipFeature|Send gzip-encoded requests| |false|
-|useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useJackson3|Use Jackson 3 instead of Jackson 2 for JSON processing. Only supported for 'native' and 'webclient' libraries.| |false|
+|useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped. Only jersey2, jersey3, native, okhttp-gson support this option.| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|

samples/client/others/java/webclient-sealedInterface/build.gradle

@@ -129,11 +129,11 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
     implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
     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"
     implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
-    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }

samples/client/others/java/webclient-sealedInterface_3_1/build.gradle

@@ -129,11 +129,11 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
     implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
     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"
     implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
-    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }

samples/client/others/java/webclient-useAbstractionForFiles/build.gradle

@@ -129,11 +129,11 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
     implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
     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"
     implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
-    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }

samples/client/petstore/java/webclient-jackson3/README.md

@@ -1,4 +1,4 @@
-# petstore-webclient
+# petstore-webclient-jackson3
 
 OpenAPI Petstore
 
@@ -41,7 +41,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
   <groupId>org.openapitools</groupId>
-  <artifactId>petstore-webclient</artifactId>
+  <artifactId>petstore-webclient-jackson3</artifactId>
   <version>1.0.0</version>
   <scope>compile</scope>
 </dependency>
@@ -53,12 +53,12 @@ Add this dependency to your project's build file:
 
 ```groovy
   repositories {
-    mavenCentral()     // Needed if the 'petstore-webclient' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'petstore-webclient' jar has been published to the local maven repo.
+    mavenCentral()     // Needed if the 'petstore-webclient-jackson3' jar has been published to maven central.
+    mavenLocal()       // Needed if the 'petstore-webclient-jackson3' jar has been published to the local maven repo.
   }
 
   dependencies {
-     implementation "org.openapitools:petstore-webclient:1.0.0"
+     implementation "org.openapitools:petstore-webclient-jackson3:1.0.0"
   }
 ```
 
@@ -72,7 +72,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/petstore-webclient-1.0.0.jar`
+- `target/petstore-webclient-jackson3-1.0.0.jar`
 - `target/lib/*.jar`
 
 ## Getting Started

samples/client/petstore/java/webclient-jackson3/build.gradle

@@ -32,8 +32,8 @@ if(hasProperty('target') && target == 'android') {
         }
 
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
+            sourceCompatibility JavaVersion.VERSION_17
+            targetCompatibility JavaVersion.VERSION_17
         }
 
         // Rename the aar correctly
@@ -78,13 +78,13 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     publishing {
         publications {
             maven(MavenPublication) {
-               artifactId = 'petstore-webclient'
+               artifactId = 'petstore-webclient-jackson3'
                from components.java
             }
         }
@@ -119,8 +119,9 @@ ext {
     reactor_netty_version = "1.2.8"
     jackson_version = "3.1.0"
     jackson_databind_version = "3.1.0"
-    jackson_databind_nullable_version = "0.2.9" // TODO waiting for https://github.com/OpenAPITools/jackson-databind-nullable/pull/117
-    jackson_annotations = "2.19.2"
+    jackson_annotations_version = "2.19.2"
+    jackson_databind_version = "2.19.2"
+    jackson_databind_nullable_version = "0.2.9"
     junit_version = "5.10.2"
 }
 
@@ -132,7 +133,7 @@ dependencies {
     implementation "tools.jackson.core:jackson-core:$jackson_version"
     implementation "tools.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
     implementation "tools.jackson.core:jackson-databind:$jackson_databind_version"
-    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"

samples/client/petstore/java/webclient-jackson3/pom.xml

@@ -2,9 +2,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapitools</groupId>
-    <artifactId>petstore-webclient</artifactId>
+    <artifactId>petstore-webclient-jackson3</artifactId>
     <packaging>jar</packaging>
-    <name>petstore-webclient</name>
+    <name>petstore-webclient-jackson3</name>
     <version>1.0.0</version>
     <url>https://github.com/openapitools/openapi-generator</url>
     <description>OpenAPI Java</description>
@@ -38,8 +38,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -117,10 +117,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jackson-version>3.1.0</jackson-version>
         <jackson-databind-version>3.1.0</jackson-databind-version>
-        <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version> <!-- TODO waiting for https://github.com/OpenAPITools/jackson-databind-nullable/pull/117 -->
+        <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <spring-boot-version>4.0.3</spring-boot-version>
-        <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
-        <reactor-version>3.4.34</reactor-version>
+        <spring-boot-version>3.2.12</spring-boot-version>
+        <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <reactor-version>3.5.12</reactor-version>
         <reactor-netty-version>1.2.8</reactor-netty-version>
         <junit-version>5.10.2</junit-version>
     </properties>

samples/client/petstore/java/webclient-jackson3/settings.gradle

@@ -1 +1 @@
-rootProject.name = "petstore-webclient"
+rootProject.name = "petstore-webclient-jackson3"

samples/client/petstore/java/webclient-jackson3/src/main/java/org/openapitools/client/ApiClient.java

@@ -70,7 +70,7 @@
 import java.util.Map.Entry;
 import java.util.TimeZone;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.time.OffsetDateTime;
 
@@ -80,7 +80,7 @@
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public class ApiClient extends JavaTimeFormatter {
     public enum CollectionFormat {
         CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null);
@@ -149,7 +149,7 @@ public static ObjectMapper createDefaultObjectMapper(@Nullable DateFormat dateFo
             .builder()
             .setDateFormat(dateFormat)
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-            .addModule(new JsonNullableModule())
+            .addModule(new JsonNullableJackson3Module())
             .build();
     }
 
@@ -174,8 +174,8 @@ public static WebClient.Builder buildWebClientBuilder(ObjectMapper mapper) {
         ExchangeStrategies strategies = ExchangeStrategies
             .builder()
             .codecs(clientDefaultCodecsConfigurer -> {
-                clientDefaultCodecsConfigurer.defaultCodecs().jacksonJsonEncoder(new JacksonJsonEncoder(mapper, MediaType.APPLICATION_JSON));
-                clientDefaultCodecsConfigurer.defaultCodecs().jacksonJsonDecoder(new JacksonJsonDecoder(mapper, MediaType.APPLICATION_JSON));
+                clientDefaultCodecsConfigurer.defaultCodecs().jacksonJsonEncoder(new JacksonJsonEncoder(mapper));
+                clientDefaultCodecsConfigurer.defaultCodecs().jacksonJsonDecoder(new JacksonJsonDecoder(mapper));
             }).build();
         WebClient.Builder webClientBuilder = WebClient.builder().exchangeStrategies(strategies);
         return webClientBuilder;
@@ -713,7 +713,7 @@ protected WebClient.RequestBodySpec prepareRequest(String path, HttpMethod metho
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, WebClient.RequestBodySpec requestBuilder) {
-        for (Entry<String, List<String>> entry : headers.entrySet()) {
+        for (Entry<String, List<String>> entry : headers.headerSet()) {
             List<String> values = entry.getValue();
             for(String value : values) {
                 if (value != null) {

samples/client/petstore/java/webclient-jackson3/src/main/java/org/openapitools/client/JavaTimeFormatter.java

@@ -20,7 +20,7 @@
  * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class.
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public class JavaTimeFormatter {
   private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;