From 27e4fcafb517a4bb3bb671005096ff9e34359eba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 07:47:11 +0000 Subject: [PATCH 1/4] chore: [DevOps] bump the production-minor-patch group across 1 directory with 16 updates Bumps the production-minor-patch group with 16 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.assertj:assertj-core](https://github.com/assertj/assertj) | `3.26.3` | `3.27.2` | | [org.mockito:mockito-core](https://github.com/mockito/mockito) | `5.14.2` | `5.15.2` | | [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) | `5.14.2` | `5.15.2` | | [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) | `5.11.3` | `5.11.4` | | [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.11.3` | `5.11.4` | | [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) | `5.11.3` | `5.11.4` | | [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) | `10.21.0` | `10.21.1` | | [com.google.guava:guava](https://github.com/google/guava) | `33.3.1-jre` | `33.4.0-jre` | | [io.github.resilience4j:resilience4j-circuitbreaker](https://github.com/resilience4j/resilience4j) | `2.2.0` | `2.3.0` | | [io.github.resilience4j:resilience4j-bulkhead](https://github.com/resilience4j/resilience4j) | `2.2.0` | `2.3.0` | | [io.github.resilience4j:resilience4j-timelimiter](https://github.com/resilience4j/resilience4j) | `2.2.0` | `2.3.0` | | [io.github.resilience4j:resilience4j-cache](https://github.com/resilience4j/resilience4j) | `2.2.0` | `2.3.0` | | [io.github.resilience4j:resilience4j-retry](https://github.com/resilience4j/resilience4j) | `2.2.0` | `2.3.0` | | [io.github.resilience4j:resilience4j-ratelimiter](https://github.com/resilience4j/resilience4j) | `2.2.0` | `2.3.0` | | [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) | `3.48.3` | `3.48.4` | | [org.mozilla:rhino](https://github.com/mozilla/rhino) | `1.7.15` | `1.8.0` | Updates `org.assertj:assertj-core` from 3.26.3 to 3.27.2 - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.2) Updates `org.mockito:mockito-core` from 5.14.2 to 5.15.2 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.14.2...v5.15.2) Updates `org.mockito:mockito-junit-jupiter` from 5.14.2 to 5.15.2 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.14.2...v5.15.2) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.11.4) Updates `com.puppycrawl.tools:checkstyle` from 10.21.0 to 10.21.1 - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.21.0...checkstyle-10.21.1) Updates `com.google.guava:guava` from 33.3.1-jre to 33.4.0-jre - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Updates `io.github.resilience4j:resilience4j-circuitbreaker` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-bulkhead` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-timelimiter` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-cache` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-retry` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-ratelimiter` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-bulkhead` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-timelimiter` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-cache` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-retry` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `io.github.resilience4j:resilience4j-ratelimiter` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/resilience4j/resilience4j/releases) - [Changelog](https://github.com/resilience4j/resilience4j/blob/master/RELEASENOTES.adoc) - [Commits](https://github.com/resilience4j/resilience4j/compare/v2.2.0...v2.3.0) Updates `org.checkerframework:checker-qual` from 3.48.3 to 3.48.4 - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.48.3...checker-framework-3.48.4) Updates `org.mozilla:rhino` from 1.7.15 to 1.8.0 - [Release notes](https://github.com/mozilla/rhino/releases) - [Changelog](https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md) - [Commits](https://github.com/mozilla/rhino/commits) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-circuitbreaker dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-bulkhead dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-timelimiter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-retry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-ratelimiter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-bulkhead dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-timelimiter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-retry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: io.github.resilience4j:resilience4j-ratelimiter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-minor-patch - dependency-name: org.mozilla:rhino dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-minor-patch ... Signed-off-by: dependabot[bot] --- datamodel/openapi/openapi-generator/pom.xml | 2 +- dependency-bundles/bom/pom.xml | 6 +++--- pom.xml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/datamodel/openapi/openapi-generator/pom.xml b/datamodel/openapi/openapi-generator/pom.xml index 8cc12abc6..c8fcaa4dc 100644 --- a/datamodel/openapi/openapi-generator/pom.xml +++ b/datamodel/openapi/openapi-generator/pom.xml @@ -44,7 +44,7 @@ org.mozilla rhino - 1.7.15 + 1.8.0 diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml index 31fb42277..9ac8a2497 100644 --- a/dependency-bundles/bom/pom.xml +++ b/dependency-bundles/bom/pom.xml @@ -54,7 +54,7 @@ 3.0.2 0.10.5 - 33.3.1-jre + 33.4.0-jre 2.18.0 @@ -65,7 +65,7 @@ 3.1.8 1.1.1 - 2.2.0 + 2.3.0 2.11.0 2.18.2 @@ -264,7 +264,7 @@ org.checkerframework checker-qual - 3.48.3 + 3.48.4 diff --git a/pom.xml b/pom.xml index 33d732c76..e0c1c7999 100644 --- a/pom.xml +++ b/pom.xml @@ -97,11 +97,11 @@ 6.2.1 6.1.5 2.0.16 - 3.26.3 + 3.27.2 0.4.3 - 5.14.2 + 5.15.2 1.5.3 - 5.11.3 + 5.11.4 2.6 5.0.0 2.0.13 @@ -119,7 +119,7 @@ 2.1.0 2.2.0 3.10.0 - 10.21.0 + 10.21.1 1.15.11 2.3 1.17.1 From 5a3ccf99f1d3aae2b34f3ce33ba5e9b1912f8771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20D=C3=BCmont?= Date: Mon, 6 Jan 2025 11:24:17 +0100 Subject: [PATCH 2/4] Fix compilation warning --- .../datamodel/odata/client/request/ODataHttpRequest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataHttpRequest.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataHttpRequest.java index a8f467f93..cd10dc4bc 100644 --- a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataHttpRequest.java +++ b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataHttpRequest.java @@ -4,6 +4,8 @@ package com.sap.cloud.sdk.datamodel.odata.client.request; +import static java.nio.charset.StandardCharsets.UTF_8; + import java.io.IOException; import java.net.URI; import java.util.function.Function; @@ -25,7 +27,6 @@ import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.entity.StringEntity; -import com.google.common.base.Charsets; import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataConnectionException; import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataRequestException; @@ -58,7 +59,7 @@ static ODataHttpRequest forBodyJson( @Nonnull final HttpClient httpClient, @Nonnull final String json ) { - final StringEntity requestBody = new StringEntity(json, Charsets.UTF_8); + final StringEntity requestBody = new StringEntity(json, UTF_8); requestBody.setContentType("application/json"); return forHttpEntity(requestGeneric, httpClient, requestBody); } @@ -68,7 +69,7 @@ static ODataHttpRequest forBodyText( @Nonnull final HttpClient httpClient, @Nonnull final String text ) { - return forHttpEntity(requestGeneric, httpClient, new StringEntity(text, Charsets.UTF_8)); + return forHttpEntity(requestGeneric, httpClient, new StringEntity(text, UTF_8)); } static ODataHttpRequest forHttpEntity( From 83f7c819a5b71f3c95f9d8e8cf748dbae27b88f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20D=C3=BCmont?= Date: Mon, 6 Jan 2025 11:32:40 +0100 Subject: [PATCH 3/4] Fix compilation warning --- .../MegacliteConnectivityProxyInformationResolverTest.java | 5 +++-- .../datamodel/odata/client/request/ODataRequestUpdate.java | 5 +++-- .../datamodel/odatav4/core/ModificationResponseTest.java | 7 ++++--- .../datamodel/odata/helper/ModificationResponseTest.java | 7 ++++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cloudplatform/connectivity-dwc/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteConnectivityProxyInformationResolverTest.java b/cloudplatform/connectivity-dwc/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteConnectivityProxyInformationResolverTest.java index f7c19a0d1..fd0f939d1 100644 --- a/cloudplatform/connectivity-dwc/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteConnectivityProxyInformationResolverTest.java +++ b/cloudplatform/connectivity-dwc/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteConnectivityProxyInformationResolverTest.java @@ -4,6 +4,8 @@ package com.sap.cloud.sdk.cloudplatform.connectivity; +import static java.nio.charset.StandardCharsets.UTF_8; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -29,7 +31,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import com.google.common.base.Charsets; import com.sap.cloud.sdk.cloudplatform.resilience.ResilienceRuntimeException; import com.sap.cloud.sdk.cloudplatform.tenant.DefaultTenant; import com.sap.cloud.sdk.cloudplatform.tenant.TenantAccessor; @@ -47,7 +48,7 @@ class MegacliteConnectivityProxyInformationResolverTest doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")) .when(successResponse) .getStatusLine(); - doReturn(new StringEntity("{ \"proxy\":\"http://some.proxy\", \"proxyAuth\":\"Bearer 1234\"}", Charsets.UTF_8)) + doReturn(new StringEntity("{ \"proxy\":\"http://some.proxy\", \"proxyAuth\":\"Bearer 1234\"}", UTF_8)) .when(successResponse) .getEntity(); diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestUpdate.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestUpdate.java index 445876765..012c6a96c 100644 --- a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestUpdate.java +++ b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestUpdate.java @@ -3,6 +3,8 @@ */ package com.sap.cloud.sdk.datamodel.odata.client.request; +import static java.nio.charset.StandardCharsets.UTF_8; + import static org.apache.http.HttpHeaders.CONTENT_TYPE; import java.net.URI; @@ -17,7 +19,6 @@ import org.apache.http.entity.StringEntity; import org.apache.http.util.EntityUtils; -import com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol; import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataRequestException; @@ -193,7 +194,7 @@ public ODataRequestResultGeneric execute( @Nonnull final HttpClient httpClient ) public String getSerializedEntity() { return Try - .of(() -> EntityUtils.toString(requestHttpEntity, Charsets.UTF_8)) + .of(() -> EntityUtils.toString(requestHttpEntity, UTF_8)) .getOrElseThrow(e -> new ODataRequestException(this, "Unable to serialize request payload.", e)); } diff --git a/datamodel/odata-v4/odata-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/core/ModificationResponseTest.java b/datamodel/odata-v4/odata-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/core/ModificationResponseTest.java index aaa05d375..47e9593ce 100644 --- a/datamodel/odata-v4/odata-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/core/ModificationResponseTest.java +++ b/datamodel/odata-v4/odata-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/core/ModificationResponseTest.java @@ -4,6 +4,8 @@ package com.sap.cloud.sdk.datamodel.odatav4.core; +import static java.nio.charset.StandardCharsets.UTF_8; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -25,7 +27,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.base.Charsets; import com.google.gson.annotations.JsonAdapter; import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol; import com.sap.cloud.sdk.datamodel.odata.client.request.ODataRequestGeneric; @@ -82,7 +83,7 @@ void testEntityResponse() final HttpResponse response = mock(HttpResponse.class); doReturn(responseHeaders).when(response).getAllHeaders(); doReturn(responseHeaders).when(response).getHeaders("ETag"); - doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity(); + doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity(); doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine(); final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response); @@ -140,7 +141,7 @@ void testResponseIsOnlyEvaluatedOnce() final HttpResponse response = mock(HttpResponse.class); doReturn(responseHeaders).when(response).getAllHeaders(); doReturn(responseHeaders).when(response).getHeaders("ETag"); - doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity(); + doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity(); doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine(); final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response); diff --git a/datamodel/odata/odata-core/src/test/java/com/sap/cloud/sdk/datamodel/odata/helper/ModificationResponseTest.java b/datamodel/odata/odata-core/src/test/java/com/sap/cloud/sdk/datamodel/odata/helper/ModificationResponseTest.java index 170ac9668..06372d7e9 100644 --- a/datamodel/odata/odata-core/src/test/java/com/sap/cloud/sdk/datamodel/odata/helper/ModificationResponseTest.java +++ b/datamodel/odata/odata-core/src/test/java/com/sap/cloud/sdk/datamodel/odata/helper/ModificationResponseTest.java @@ -4,6 +4,8 @@ package com.sap.cloud.sdk.datamodel.odata.helper; +import static java.nio.charset.StandardCharsets.UTF_8; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -23,7 +25,6 @@ import org.apache.http.message.BasicStatusLine; import org.junit.jupiter.api.Test; -import com.google.common.base.Charsets; import com.google.gson.annotations.JsonAdapter; import com.sap.cloud.sdk.cloudplatform.connectivity.Destination; import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol; @@ -85,7 +86,7 @@ void testEntityResponse() final HttpResponse response = mock(HttpResponse.class); doReturn(responseHeaders).when(response).getAllHeaders(); doReturn(responseHeaders).when(response).getHeaders("ETag"); - doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity(); + doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity(); doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine(); final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response); @@ -150,7 +151,7 @@ void testResponseIsOnlyEvaluatedOnce() final HttpResponse response = mock(HttpResponse.class); doReturn(responseHeaders).when(response).getAllHeaders(); doReturn(responseHeaders).when(response).getHeaders("ETag"); - doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity(); + doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity(); doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine(); final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response); From 9011890c56ab65f0f3f1b320a58cf54c2098702c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20D=C3=BCmont?= Date: Mon, 6 Jan 2025 11:39:53 +0100 Subject: [PATCH 4/4] Fix compilation warning --- .../odata/client/request/ODataQueryPropertyTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/datamodel/odata-client/src/test/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataQueryPropertyTest.java b/datamodel/odata-client/src/test/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataQueryPropertyTest.java index 596f22b06..9bbbbb18a 100644 --- a/datamodel/odata-client/src/test/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataQueryPropertyTest.java +++ b/datamodel/odata-client/src/test/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataQueryPropertyTest.java @@ -4,6 +4,8 @@ package com.sap.cloud.sdk.datamodel.odata.client.request; +import static java.nio.charset.StandardCharsets.UTF_8; + import static com.github.tomakehurst.wiremock.client.WireMock.containing; import static com.github.tomakehurst.wiremock.client.WireMock.delete; import static com.github.tomakehurst.wiremock.client.WireMock.deleteRequestedFor; @@ -19,14 +21,12 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.verify; -import static com.google.common.base.Charsets.UTF_8; import static com.sap.cloud.sdk.datamodel.odata.client.request.UpdateStrategy.REPLACE_WITH_PUT; import static org.apache.http.HttpHeaders.ACCEPT; import static org.apache.http.HttpHeaders.CONTENT_TYPE; import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; import javax.annotation.Nonnull; @@ -128,7 +128,7 @@ void deleteSimplePropertyV2() void getStreamPropertyV2() { final String payloadV2 = "This is a large document"; - final byte[] payloadBytes = payloadV2.getBytes(StandardCharsets.UTF_8); + final byte[] payloadBytes = payloadV2.getBytes(UTF_8); stubFor(get(WireMock.anyUrl()).willReturn(ok().withBody(payloadBytes).withHeader(CONTENT_TYPE, XML))); // user code @@ -153,7 +153,7 @@ void setStreamPropertyV2() // user code final String payloadV2 = "This is a large document"; - final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV2.getBytes(StandardCharsets.UTF_8)); + final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV2.getBytes(UTF_8)); final HttpEntity httpEntity = new InputStreamEntity(payloadBytes, ContentType.create(XML, UTF_8)); final ODataRequestResultGeneric result = @@ -224,7 +224,7 @@ void deleteSimplePropertyV4() void getStreamPropertyV4() { final String payloadV4 = "This is a large document"; - final byte[] payloadBytes = payloadV4.getBytes(StandardCharsets.UTF_8); + final byte[] payloadBytes = payloadV4.getBytes(UTF_8); stubFor(get(WireMock.anyUrl()).willReturn(ok().withBody(payloadBytes).withHeader(CONTENT_TYPE, XML))); // user code @@ -249,7 +249,7 @@ void setStreamPropertyV4() // user code final String payloadV4 = "This is a large document"; - final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV4.getBytes(StandardCharsets.UTF_8)); + final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV4.getBytes(UTF_8)); final HttpEntity httpEntity = new InputStreamEntity(payloadBytes, ContentType.create(XML, UTF_8)); final ODataRequestResultGeneric result =