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 cf7534a64..c4b8366fa 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 @@ -1,5 +1,7 @@ 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; @@ -25,7 +27,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; @@ -43,7 +44,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/ODataHttpRequest.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataHttpRequest.java index 999e217ac..6fa68d4b6 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 @@ -1,5 +1,7 @@ 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; @@ -21,7 +23,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; @@ -54,7 +55,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); } @@ -64,7 +65,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( 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 797d33558..1491a890b 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 @@ -1,5 +1,7 @@ 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; @@ -14,7 +16,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; @@ -190,7 +191,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-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 263ee2962..416da77ca 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 @@ -1,5 +1,7 @@ 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; @@ -15,14 +17,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; @@ -124,7 +124,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 @@ -149,7 +149,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 = @@ -220,7 +220,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 @@ -245,7 +245,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 = 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 cf08d2f10..b5b0ec12e 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 @@ -1,5 +1,7 @@ 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; @@ -21,7 +23,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; @@ -78,7 +79,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); @@ -136,7 +137,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 ef0d6a7d0..0a4098e42 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 @@ -1,5 +1,7 @@ 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; @@ -19,7 +21,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; @@ -81,7 +82,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); @@ -146,7 +147,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/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