Fix JDK22 compiler warnings (#517)

newtork · web-flow · commit 411b39f8a719 · 2024-08-01T13:14:47.000+02:00
diff --git a/cloudplatform/caching/src/main/java/com/sap/cloud/sdk/cloudplatform/cache/SerializableCacheKey.java b/cloudplatform/caching/src/main/java/com/sap/cloud/sdk/cloudplatform/cache/SerializableCacheKey.java
@@ -6,7 +6,6 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -39,7 +38,7 @@ public final class SerializableCacheKey implements GenericCacheKey<SerializableC
     private final String principalId;
 
     @Getter
-    private final List<Serializable> components = new ArrayList<>();
+    private final ArrayList<Serializable> components = new ArrayList<>();
 
     @Nonnull
     @Override
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataConnectionException.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataConnectionException.java
@@ -27,7 +27,7 @@ public class ODataConnectionException extends ODataRequestException
      * The {@link HttpUriRequest} that was attempted.
      */
     @Nonnull
-    private final HttpUriRequest httpRequest;
+    private final transient HttpUriRequest httpRequest;
 
     /**
      * Default constructor.
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataException.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataException.java
@@ -40,7 +40,7 @@ public class ODataException extends IllegalStateException
      * The OData request that was attempted while this exception occurred.
      */
     @Nonnull
-    private final ODataRequestGeneric request;
+    private final transient ODataRequestGeneric request;
 
     /**
      * Default constructor.
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataResponseException.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataResponseException.java
@@ -21,12 +21,14 @@
 import io.vavr.control.Try;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * A generic {@link ODataException} representing an erroneous service response. This exception class comprises details
  * of the HTTP response.
  */
 @EqualsAndHashCode( callSuper = true )
+@Slf4j
 public class ODataResponseException extends ODataException
 {
     private static final long serialVersionUID = 4615831202194546242L;
@@ -42,7 +44,7 @@ public class ODataResponseException extends ODataException
      */
     @Getter
     @Nonnull
-    private final Collection<Header> httpHeaders;
+    private final transient Collection<Header> httpHeaders;
 
     /**
      * The content of the HTTP response body as plain text or null, if the response did not contain a body.
@@ -75,7 +77,7 @@ public ODataResponseException(
         httpBody =
             Try
                 .of(() -> EntityUtils.toString(httpResponse.getEntity(), StandardCharsets.UTF_8))
-                .onFailure(this::addSuppressed)
+                .onFailure(e -> log.debug("HTTP response could not be consumed.", e))
                 .toOption();
     }
 }
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataSerializationException.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataSerializationException.java
@@ -25,7 +25,7 @@ public class ODataSerializationException extends ODataRequestException
      */
     @Nonnull
     @Getter
-    private final Object nonSerializableObject;
+    private final transient Object nonSerializableObject;
 
     /**
      * Default constructor.
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataServiceErrorException.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/exception/ODataServiceErrorException.java
@@ -28,7 +28,7 @@ public class ODataServiceErrorException extends ODataResponseException
      * The parsed {@link ODataServiceError} that was found in the HTTP response body.
      */
     @Nonnull
-    private final ODataServiceError odataError;
+    private final transient ODataServiceError odataError;
 
     /**
      * Default constructor.
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/expression/FilterExpressionArithmetic.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/expression/FilterExpressionArithmetic.java
@@ -9,6 +9,7 @@
 /**
  * Set of OData filter functions for arithmetic types.
  */
+@SuppressWarnings( "overloads" )
 public interface FilterExpressionArithmetic
 {
     /**
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/expression/FilterExpressionTemporal.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/expression/FilterExpressionTemporal.java
@@ -9,6 +9,7 @@
 /**
  * Set of OData filter functions for temporal types.
  */
+@SuppressWarnings( "overloads" )
 public interface FilterExpressionTemporal
 {
     /**
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestAction.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestAction.java
@@ -9,8 +9,10 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.apache.http.HttpHeaders;
 import org.apache.http.client.HttpClient;
 
+import com.google.common.collect.Lists;
 import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;
 import com.sap.cloud.sdk.datamodel.odata.client.expression.ODataResourcePath;
 
@@ -30,10 +32,6 @@ public class ODataRequestAction extends ODataRequestGeneric
     @Nonnull
     private final String query;
 
-    {
-        addHeader("Content-Type", "application/json");
-    }
-
     /**
      * Convenience constructor for invocations of unbound actions. For bound actions use
      * {@link #ODataRequestAction(String, ODataResourcePath, String, ODataProtocol)}.
@@ -105,6 +103,7 @@ public ODataRequestAction(
         super(servicePath, actionPath, protocol);
         this.actionParameters = actionParameters != null ? actionParameters : "{}";
         this.query = encodedQuery != null ? encodedQuery : "";
+        headers.putIfAbsent(HttpHeaders.CONTENT_TYPE, Lists.newArrayList("application/json"));
     }
 
     @Nonnull
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestCreate.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestCreate.java
@@ -8,8 +8,10 @@
 
 import javax.annotation.Nonnull;
 
+import org.apache.http.HttpHeaders;
 import org.apache.http.client.HttpClient;
 
+import com.google.common.collect.Lists;
 import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;
 import com.sap.cloud.sdk.datamodel.odata.client.expression.ODataResourcePath;
 
@@ -26,10 +28,6 @@ public class ODataRequestCreate extends ODataRequestGeneric
     @Nonnull
     private final String serializedEntity;
 
-    {
-        addHeader("Content-Type", "application/json");
-    }
-
     /**
      * Convenience constructor for OData delete requests on entity collections directly. For operations on nested
      * entities use {@link #ODataRequestCreate(String, ODataResourcePath, String, ODataProtocol)}.
@@ -72,6 +70,7 @@ public ODataRequestCreate(
     {
         super(servicePath, entityPath, protocol);
         this.serializedEntity = serializedEntity;
+        headers.putIfAbsent(HttpHeaders.CONTENT_TYPE, Lists.newArrayList("application/json"));
     }
 
     @Nonnull
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestGeneric.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestGeneric.java
@@ -20,6 +20,7 @@
 import org.apache.http.client.HttpClient;
 
 import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.sap.cloud.sdk.cloudplatform.connectivity.CsrfToken;
 import com.sap.cloud.sdk.cloudplatform.connectivity.CsrfTokenRetriever;
 import com.sap.cloud.sdk.cloudplatform.connectivity.DefaultCsrfTokenRetriever;
@@ -100,7 +101,7 @@ public abstract class ODataRequestGeneric implements ODataRequestExecutable
         this.protocol = protocol;
         this.servicePath = servicePath;
         this.resourcePath = resourcePath;
-        addHeaderIfAbsent(HttpHeaders.ACCEPT, DEFAULT_FORMAT.getHttpAccept());
+        headers.putIfAbsent(HttpHeaders.ACCEPT, Lists.newArrayList(DEFAULT_FORMAT.getHttpAccept()));
     }
 
     /**
@@ -198,9 +199,7 @@ public void addHeader( @Nonnull final String key, @Nullable final String value )
      */
     public void addHeaderIfAbsent( @Nonnull final String key, @Nullable final String value )
     {
-        final ArrayList<String> values = new ArrayList<>(1);
-        values.add(value);
-        headers.putIfAbsent(key, values);
+        headers.putIfAbsent(key, Lists.newArrayList(value));
     }
 
     /**
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
@@ -18,6 +18,7 @@
 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;
 import com.sap.cloud.sdk.datamodel.odata.client.expression.ODataResourcePath;
@@ -155,7 +156,7 @@ public ODataRequestUpdate(
 
         final Header contentType = httpEntity.getContentType();
         if( contentType != null ) {
-            addHeaderIfAbsent(CONTENT_TYPE, contentType.getValue());
+            headers.putIfAbsent(CONTENT_TYPE, Lists.newArrayList(contentType.getValue()));
         }
     }
 
diff --git a/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmEnumDeserializer.java b/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmEnumDeserializer.java
@@ -6,8 +6,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -19,6 +17,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.sap.cloud.sdk.datamodel.odatav4.core.VdmEnum;
 
@@ -32,7 +31,7 @@
 public class JacksonVdmEnumDeserializer extends StdDeserializer<VdmEnum> implements ContextualDeserializer
 {
     private static final long serialVersionUID = 3282694560867458205L;
-    private Map<String, VdmEnum> nameEnumLookupMap = Collections.emptyMap();
+    private ImmutableMap<String, VdmEnum> nameEnumLookupMap = ImmutableMap.of();
     private Class<? extends VdmEnum> valueType;
 
     /**
@@ -83,7 +82,6 @@ public VdmEnum deserialize( @Nonnull final JsonParser parser, @Nonnull final Des
         }
 
         final String serializedValue = parser.getValueAsString();
-        final VdmEnum enumValue = nameEnumLookupMap.getOrDefault(serializedValue, null);
-        return enumValue;
+        return nameEnumLookupMap.getOrDefault(serializedValue, null);
     }
 }
diff --git a/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/BatchRequestBuilder.java b/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/BatchRequestBuilder.java
@@ -54,6 +54,7 @@ public class BatchRequestBuilder extends AbstractRequestBuilder<BatchRequestBuil
      * @param servicePath
      *            The service path to direct the requests to.
      */
+    @SuppressWarnings( "this-escape" ) // getUuidProvider() is designed to be overridable.
     public BatchRequestBuilder( @Nonnull final String servicePath )
     {
         super(servicePath, ODataResourcePath.of("$batch"));
diff --git a/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/CountRequestBuilder.java b/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/CountRequestBuilder.java
@@ -68,6 +68,7 @@ public CountRequestBuilder(
      * @param entityClass
      *            The expected entity type.
      */
+    @SuppressWarnings( "this-escape" )
     CountRequestBuilder(
         @Nonnull final String servicePath,
         @Nonnull final ODataResourcePath resourceToCount,
diff --git a/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/GetAllRequestBuilder.java b/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/GetAllRequestBuilder.java
@@ -77,6 +77,7 @@ public GetAllRequestBuilder(
      * @param entityClass
      *            The expected entity type.
      */
+    @SuppressWarnings( "this-escape" )
     GetAllRequestBuilder(
         @Nonnull final String servicePath,
         @Nonnull final ODataResourcePath entityPath,
diff --git a/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/GetByKeyRequestBuilder.java b/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/GetByKeyRequestBuilder.java
@@ -98,6 +98,7 @@ public GetByKeyRequestBuilder(
      * @param entityPath
      *            The {@link ODataResourcePath} that identifies the entity to read.
      */
+    @SuppressWarnings( "this-escape" )
     GetByKeyRequestBuilder(
         @Nonnull final String servicePath,
         @Nonnull final ODataResourcePath entityPath,
diff --git a/datamodel/odata/odata-core/src/main/java/com/sap/cloud/sdk/datamodel/odata/helper/FluentHelperFunction.java b/datamodel/odata/odata-core/src/main/java/com/sap/cloud/sdk/datamodel/odata/helper/FluentHelperFunction.java
@@ -51,6 +51,7 @@ public abstract class FluentHelperFunction<FluentHelperT, ObjectT, ResultT>
     /**
      * Upper-case HTTP method derived from {@link #createRequest(URI)} method.
      */
+    @SuppressWarnings( "this-escape" )
     private final Lazy<String> httpMethod = Lazy.of(() -> createRequest(URI.create("")).getMethod().toUpperCase());
 
     private boolean csrfTokenRetrieverUpdated = false;
diff --git a/s4hana/rfc/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/rfc/AbstractRemoteFunctionRequest.java b/s4hana/rfc/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/rfc/AbstractRemoteFunctionRequest.java
@@ -96,6 +96,7 @@ Iterable<Parameter> getParameters()
      * @param constructedByMethod
      *            The name of the method from which this constructor is being called.
      */
+    @SuppressWarnings( "this-escape" )
     protected AbstractRemoteFunctionRequest(
         @Nonnull final String functionName,
         @Nonnull final CommitStrategy commitStrategy,
diff --git a/s4hana/s4hana-connectivity/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/ErpTypeSerializer.java b/s4hana/s4hana-connectivity/src/main/java/com/sap/cloud/sdk/s4hana/connectivity/ErpTypeSerializer.java
@@ -34,6 +34,7 @@ public class ErpTypeSerializer
     /**
      * Initializes the {@link ErpTypeSerializer} with default ERP type converters.
      */
+    @SuppressWarnings( "this-escape" )
     public ErpTypeSerializer()
     {
         withTypeConverters(
diff --git a/s4hana/s4hana-core/src/main/java/com/sap/cloud/sdk/s4hana/serialization/ErpInteger.java b/s4hana/s4hana-core/src/main/java/com/sap/cloud/sdk/s4hana/serialization/ErpInteger.java
@@ -31,6 +31,7 @@ public class ErpInteger extends IntegerBasedErpType<ErpInteger>
      * @throws IllegalArgumentException
      *             when the input value could not be converted.
      */
+    @SuppressWarnings( "this-escape" )
     public ErpInteger( @Nonnull final Long value )
     {
         super(value);
@@ -45,6 +46,7 @@ public ErpInteger( @Nonnull final Long value )
      * @throws IllegalArgumentException
      *             when the input value could not be converted.
      */
+    @SuppressWarnings( "this-escape" )
     public ErpInteger( @Nullable final String str )
     {
         super(str);
@@ -59,6 +61,7 @@ public ErpInteger( @Nullable final String str )
      * @throws IllegalArgumentException
      *             when the input value could not be converted.
      */
+    @SuppressWarnings( "this-escape" )
     public ErpInteger( @Nonnull final Integer value )
     {
         super(value);
diff --git a/s4hana/s4hana-core/src/main/java/com/sap/cloud/sdk/s4hana/serialization/StringBasedErpType.java b/s4hana/s4hana-core/src/main/java/com/sap/cloud/sdk/s4hana/serialization/StringBasedErpType.java
@@ -146,6 +146,7 @@ public StringBasedErpType( @Nullable final String value, @Nullable final CharCas
      *             If the given value cannot be converted to an instance of this type, or any of the given parameter is
      *             {@code null}.
      */
+    @SuppressWarnings( "this-escape" )
     public StringBasedErpType(
         @Nullable final String value,
         @Nullable final CharCasing charCasing,

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`/**`
`10`	`10`	`* Set of OData filter functions for arithmetic types.`
`11`	`11`	`*/`
	`12`	`+@SuppressWarnings( "overloads" )`
`12`	`13`	`public interface FilterExpressionArithmetic`
`13`	`14`	`{`
`14`	`15`	`/**`