From c06ba2e8d32850a45b6c11395edfffe531200de5 Mon Sep 17 00:00:00 2001
From: "anubhava.gupta" <anubhava.gupta@salesforce.com>
Date: Tue, 21 Apr 2026 12:43:56 +0530
Subject: [PATCH 1/2] @W-22133858 Upgrade to Spring Boot 4.0.5 / Spring
 Framework 7.x

- Bump version to 4.0.0-SNAPSHOT (major version for Spring 7 compat)
- Upgrade Spring Boot starter from 3.3.8 to 4.0.5
- Swap javax.annotation-api for jakarta.annotation-api 3.0.0
- Upgrade Jackson to 2.21.0 (required by Spring Boot 4)
- Add explicit jackson-datatype-jdk8 dependency
- Upgrade Netty from 4.1.x to 4.2.10.Final (Spring Boot 4 requires Netty 4.2)
- Upgrade Mockito to 5.14.2, JUnit to 5.11.4, Reactor to 3.7.6
- Fix Spring 7 HttpHeaders API: entrySet() -> headerSet(), getRawStatusCode() -> getStatusCode().value()
- Fix UriComponentsBuilder.fromHttpUrl() -> fromUriString()
- Add find-and-replace executions to patch OpenAPI-generated code for Spring 7 compat
- Add Maven Central direct repo for Jackson 2.21 resolution

Made-with: Cursor
---
 pom.xml                                       | 95 +++++++++++++++----
 .../sdk/client/model/BotHttpHeaders.java      |  2 +-
 .../sdk/client/model/BotResponseBuilder.java  |  4 +-
 .../einsteinbot/sdk/util/UtilFunctions.java   |  4 +-
 .../einsteinbot/sdk/util/WebClientUtil.java   |  2 +-
 .../examples/ApiExampleWithoutUsingSDK.java   |  6 +-
 6 files changed, 88 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 201b2f3..a77560a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.salesforce.einsteinbot</groupId>
     <artifactId>einstein-bot-sdk-java</artifactId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>einstein-bot-sdk-java</name>
     <description>Java SDK to interact with Einstein Bots Runtime.
@@ -27,17 +27,17 @@
         <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
         <maven-release-plugin.version>3.0.0</maven-release-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
-        <swagger-core-version>2.1.7</swagger-core-version>
-        <jackson-version>2.15.0</jackson-version>
-        <jackson-annotations-version>2.15.0</jackson-annotations-version>
-        <javax-annotation-version>1.3.2</javax-annotation-version>
-        <spring-boot-starter-webflux-version>3.3.8</spring-boot-starter-webflux-version>
+        <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
+        <swagger-core-version>2.2.25</swagger-core-version>
+        <jackson-version>2.21.0</jackson-version>
+        <jackson-annotations-version>2.21</jackson-annotations-version>
+        <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
+        <spring-boot-starter-webflux-version>4.0.5</spring-boot-starter-webflux-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <einstein-bot-openapi-codegen-version>7.10.4</einstein-bot-openapi-codegen-version>
-        <junit-jupiter-version>5.5.2</junit-jupiter-version>
-        <spring-reactor-test-version>3.7.2</spring-reactor-test-version>
-        <spring-reactor-core-version>3.7.2</spring-reactor-core-version>
+        <junit-jupiter-version>5.11.4</junit-jupiter-version>
+        <spring-reactor-test-version>3.7.6</spring-reactor-test-version>
+        <spring-reactor-core-version>3.7.6</spring-reactor-core-version>
         <openapi-generator-version>7.10.0</openapi-generator-version>
 
         <!-- Runtime follows a fixed naming convention for all API versions
@@ -84,6 +84,19 @@
         <tag>HEAD</tag>
     </scm>
 
+    <repositories>
+        <repository>
+            <id>maven-central-direct</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <distributionManagement>
         <repository>
             <id>ossrh</id>
@@ -149,6 +162,51 @@
                             <fileMask>${api-spec-yaml-file}</fileMask>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>fix-generated-headers-entrySet</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>find-and-replace</goal>
+                        </goals>
+                        <configuration>
+                            <replacementType>file-contents</replacementType>
+                            <baseDir>target/generated-sources/openapi</baseDir>
+                            <findRegex>: headers\.entrySet\(\)</findRegex>
+                            <replaceValue>: headers.headerSet()</replaceValue>
+                            <recursive>true</recursive>
+                            <fileMask>ApiClient.java</fileMask>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>fix-generated-headers-containsKey</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>find-and-replace</goal>
+                        </goals>
+                        <configuration>
+                            <replacementType>file-contents</replacementType>
+                            <baseDir>target/generated-sources/openapi</baseDir>
+                            <findRegex>defaultHeaders\.containsKey\(</findRegex>
+                            <replaceValue>defaultHeaders.containsHeader(</replaceValue>
+                            <recursive>true</recursive>
+                            <fileMask>ApiClient.java</fileMask>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>fix-generated-fromHttpUrl</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>find-and-replace</goal>
+                        </goals>
+                        <configuration>
+                            <replacementType>file-contents</replacementType>
+                            <baseDir>target/generated-sources/openapi</baseDir>
+                            <findRegex>\.fromHttpUrl\(</findRegex>
+                            <replaceValue>.fromUriString(</replaceValue>
+                            <recursive>true</recursive>
+                            <fileMask>ApiClient.java</fileMask>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -288,9 +346,9 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax-annotation-version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -308,6 +366,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson-version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
@@ -339,13 +402,13 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.2.10.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.2.10.Final</version>
         </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
@@ -356,7 +419,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>3.9.0</version>
+            <version>5.14.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotHttpHeaders.java b/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotHttpHeaders.java
index 25f880f..5e15352 100644
--- a/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotHttpHeaders.java
+++ b/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotHttpHeaders.java
@@ -61,7 +61,7 @@ public static Builder with() {
   }
 
   public static BotHttpHeaders fromSpringHttpHeaders(HttpHeaders httpHeaders) {
-    return new BotHttpHeaders(httpHeaders.entrySet());
+    return new BotHttpHeaders(httpHeaders.headerSet());
   }
 
   public String getRequestIdHeaderAsCSV() {
diff --git a/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotResponseBuilder.java b/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotResponseBuilder.java
index 77dcb7d..ee9cba4 100644
--- a/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotResponseBuilder.java
+++ b/src/main/java/com/salesforce/einsteinbot/sdk/client/model/BotResponseBuilder.java
@@ -26,7 +26,7 @@ public static BotResponse fromResponseEnvelopeResponseEntity(
       ResponseEntity<ResponseEnvelope> responseEntity) {
     responseEntity.getHeaders();
     return BotResponse.with(responseEntity.getBody(),
-        responseEntity.getStatusCodeValue(),
+        responseEntity.getStatusCode().value(),
         fromSpringHttpHeaders(responseEntity.getHeaders()));
   }
 
@@ -34,7 +34,7 @@ public static BotResponse fromChatMessageResponseEnvelopeResponseEntity(
       ResponseEntity<ChatMessageResponseEnvelope> responseEntity, String sessionId) {
     ResponseEnvelope responseEnvelope = buildResponseEnvelope(sessionId, responseEntity.getBody());
     return BotResponse.with(responseEnvelope,
-        responseEntity.getStatusCodeValue(),
+        responseEntity.getStatusCode().value(),
         fromSpringHttpHeaders(responseEntity.getHeaders()));
   }
 }
diff --git a/src/main/java/com/salesforce/einsteinbot/sdk/util/UtilFunctions.java b/src/main/java/com/salesforce/einsteinbot/sdk/util/UtilFunctions.java
index 8b08d4f..6c87f5b 100644
--- a/src/main/java/com/salesforce/einsteinbot/sdk/util/UtilFunctions.java
+++ b/src/main/java/com/salesforce/einsteinbot/sdk/util/UtilFunctions.java
@@ -35,8 +35,8 @@
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import org.openapitools.jackson.nullable.JsonNullableModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import org.openapitools.jackson.nullable.JsonNullableModule;
 import org.springframework.http.HttpHeaders;
 
 /**
@@ -137,7 +137,7 @@ public static DateFormat createDefaultDateFormat() {
   }
 
   public static Map<String, List<String>> maskAuthorizationHeader(HttpHeaders headers){
-    return headers.entrySet()
+    return headers.headerSet()
         .stream()
         .collect(Collectors.toMap(
             Map.Entry::getKey,
diff --git a/src/main/java/com/salesforce/einsteinbot/sdk/util/WebClientUtil.java b/src/main/java/com/salesforce/einsteinbot/sdk/util/WebClientUtil.java
index 6e8cae0..da62447 100644
--- a/src/main/java/com/salesforce/einsteinbot/sdk/util/WebClientUtil.java
+++ b/src/main/java/com/salesforce/einsteinbot/sdk/util/WebClientUtil.java
@@ -78,7 +78,7 @@ private static Mono<Error> buildErrorFromClientResponseBodyString(ReactiveHttpIn
      Mono<String> bodyString = BodyExtractors.toMono(String.class).
             extract(clientResponse, context);
      return bodyString.map(errorMessage -> new Error()
-            .status(response.getRawStatusCode())
+            .status(response.getStatusCode().value())
             .message("This Response content type is not 'application/json', " +
                     "See the 'error' field for actual error returned by the server.")
             .error(errorMessage));
diff --git a/src/test/java/com/salesforce/einsteinbot/sdk/examples/ApiExampleWithoutUsingSDK.java b/src/test/java/com/salesforce/einsteinbot/sdk/examples/ApiExampleWithoutUsingSDK.java
index 4f7a7ce..6fedca3 100644
--- a/src/test/java/com/salesforce/einsteinbot/sdk/examples/ApiExampleWithoutUsingSDK.java
+++ b/src/test/java/com/salesforce/einsteinbot/sdk/examples/ApiExampleWithoutUsingSDK.java
@@ -214,21 +214,21 @@ private HttpEntity<String> createHttpEntityForRequest(HttpHeaders requestHeaders
 
   private String createStartSessionUrl() {
     return UriComponentsBuilder
-        .fromHttpUrl(RUNTIME_URL)
+        .fromUriString(RUNTIME_URL)
         .path(START_SESSION_URI)
         .buildAndExpand(botId).toString();
   }
 
   private String createContinueSessionUrl(String sessionId) {
     return UriComponentsBuilder
-        .fromHttpUrl(RUNTIME_URL)
+        .fromUriString(RUNTIME_URL)
         .path(SEND_MESSAGE_URI)
         .buildAndExpand(sessionId).toString();
   }
 
   private String createEndSessionUrl(String sessionId) {
     return UriComponentsBuilder
-        .fromHttpUrl(RUNTIME_URL)
+        .fromUriString(RUNTIME_URL)
         .path(END_SESSION_URI)
         .buildAndExpand(sessionId).toString();
   }

From ce709b8584587d45cebeb720da07c8e88aac006b Mon Sep 17 00:00:00 2001
From: "anubhava.gupta" <anubhava.gupta@salesforce.com>
Date: Wed, 6 May 2026 00:07:10 +0530
Subject: [PATCH 2/2] Updating the openapi-generator changes with comments

---
 pom.xml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7689b7c..186c07b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,19 +84,29 @@
         <tag>HEAD</tag>
     </scm>
 
+    <!-- repositories: resolves dependencies (e.g. Jackson 2.21) directly from Maven Central.
+         pluginRepositories: resolves build plugins (e.g. central-publishing-maven-plugin) from Maven Central.
+         Not needed for CI (GitHub Actions uses Maven Central by default).
+         But needed for local builds behind corporate Nexus proxy that may not cache newer artifacts. -->
     <repositories>
         <repository>
             <id>maven-central-direct</id>
             <url>https://repo.maven.apache.org/maven2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
         </repository>
     </repositories>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>maven-central-plugins</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+
     <distributionManagement>
         <repository>
             <id>central</id>
@@ -162,6 +172,10 @@
                             <fileMask>${api-spec-yaml-file}</fileMask>
                         </configuration>
                     </execution>
+                    <!-- TODO: Remove these 3 patches once forcedotcom/einstein-bot-openapi-codegen is upgraded to
+                         support openapi-generator 7.22+ with useSpringBoot4=true for WebClient.
+                         Current custom codegen (7.10.4) is pinned to generator 7.10.0 which generates
+                         Spring 6 API calls (entrySet, containsKey, fromHttpUrl) removed in Spring 7. -->
                     <execution>
                         <id>fix-generated-headers-entrySet</id>
                         <phase>process-sources</phase>
@@ -222,6 +236,9 @@
                             <inputSpec>${project.basedir}/src/main/resources/${api-spec-yaml-file}</inputSpec>
                             <configOptions>
                                 <sourceFolder>src/gen/java/main</sourceFolder>
+                                <!-- Required for Jakarta namespace generation. No useSpringBoot4 flag exists
+                                     for WebClient generator yet (only RestTemplate in openapi generator v7.22+.)
+                                     Ref line 175 TODO comment in this pom.xml. -->
                                 <useSpringBoot3>true</useSpringBoot3>
                                 <useJakartaEe>true</useJakartaEe>
                                 <dateLibrary>java8</dateLibrary>