diff --git a/pom.xml b/pom.xml index 5b90d4e..186c07b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.salesforce.einsteinbot einstein-bot-sdk-java - 3.0.9-SNAPSHOT + 4.0.0-SNAPSHOT jar einstein-bot-sdk-java Java SDK to interact with Einstein Bots Runtime. @@ -27,17 +27,17 @@ 3.5.0 3.0.0 3.2.1 - 0.2.1 - 2.1.7 - 2.15.0 - 2.15.0 - 1.3.2 - 3.3.8 + 0.2.10 + 2.2.25 + 2.21.0 + 2.21 + 3.0.0 + 4.0.5 UTF-8 7.10.4 - 5.5.2 - 3.7.2 - 3.7.2 + 5.11.4 + 3.7.6 + 3.7.6 7.10.0 + + + maven-central-direct + https://repo.maven.apache.org/maven2 + true + false + + + + + + maven-central-plugins + https://repo.maven.apache.org/maven2 + true + false + + + + central @@ -149,6 +172,55 @@ ${api-spec-yaml-file} + + + fix-generated-headers-entrySet + process-sources + + find-and-replace + + + file-contents + target/generated-sources/openapi + : headers\.entrySet\(\) + : headers.headerSet() + true + ApiClient.java + + + + fix-generated-headers-containsKey + process-sources + + find-and-replace + + + file-contents + target/generated-sources/openapi + defaultHeaders\.containsKey\( + defaultHeaders.containsHeader( + true + ApiClient.java + + + + fix-generated-fromHttpUrl + process-sources + + find-and-replace + + + file-contents + target/generated-sources/openapi + \.fromHttpUrl\( + .fromUriString( + true + ApiClient.java + + @@ -164,6 +236,9 @@ ${project.basedir}/src/main/resources/${api-spec-yaml-file} src/gen/java/main + true true java8 @@ -287,9 +362,9 @@ - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -307,6 +382,11 @@ jackson-databind ${jackson-version} + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson-version} + com.auth0 java-jwt @@ -338,13 +418,13 @@ io.netty netty-handler - 4.1.115.Final + 4.2.10.Final test io.netty netty-codec - 4.1.115.Final + 4.2.10.Final org.wiremock @@ -355,7 +435,7 @@ org.mockito mockito-junit-jupiter - 3.9.0 + 5.14.2 test 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 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 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> 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 buildErrorFromClientResponseBodyString(ReactiveHttpIn Mono 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 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(); }