Skip to content

Commit da49da1

Browse files
committed
Merge branch 'main' into fix-caching-getOrComputeAllDestinations
2 parents bf81047 + 12d3794 commit da49da1

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/dependabot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ updates:
4949
versions: ['3.6.1', '3.6.2']
5050
- dependency-name: 'com.sap.cloud.security:env'
5151
versions: ['3.6.1', '3.6.2']
52+
# needs Java 21
53+
- dependency-name: 'com.puppycrawl.tools:checkstyle'
54+
versions: [ ">=13.0.0" ]
5255

5356
# archetype updates
5457
# Dependabot seems to be unable to handle those, so this is disabled for now

cloudplatform/connectivity-destination-service/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/GetOrComputeSingleDestinationCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import java.util.Objects;
99
import java.util.concurrent.locks.ReentrantLock;
1010
import java.util.function.BiFunction;
11+
import java.util.function.Function;
1112
import java.util.function.Supplier;
1213

1314
import javax.annotation.Nonnull;
1415
import javax.annotation.Nullable;
1516

1617
import com.github.benmanes.caffeine.cache.Cache;
17-
import com.google.common.base.Functions;
1818
import com.sap.cloud.sdk.cloudplatform.cache.CacheKey;
1919
import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
2020
import com.sap.cloud.sdk.cloudplatform.security.principal.exception.PrincipalAccessException;
@@ -273,7 +273,7 @@ private static boolean certificateIsExpired( final Destination destination )
273273
return destination
274274
.get(DestinationProperty.CERTIFICATES)
275275
.toStream()
276-
.flatMap(Functions.identity())
276+
.flatMap(Function.identity())
277277
.map(t -> ((DestinationServiceV1Response.DestinationCertificate) t).getExpiryTimestamp())
278278
.filter(Objects::nonNull)
279279
.min()
@@ -286,7 +286,7 @@ private static boolean authTokenIsExpired( @Nonnull final Destination destinatio
286286
return destination
287287
.get(DestinationProperty.AUTH_TOKENS)
288288
.toStream()
289-
.flatMap(Functions.identity())
289+
.flatMap(Function.identity())
290290
.map(t -> ((DestinationServiceV1Response.DestinationAuthToken) t).getExpiryTimestamp())
291291
.filter(Objects::nonNull)
292292
.min()

datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmObjectSerializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Arrays;
66
import java.util.Map;
77
import java.util.Optional;
8+
import java.util.function.Function;
89
import java.util.stream.Collectors;
910

1011
import javax.annotation.Nonnull;
@@ -20,7 +21,6 @@
2021
import com.fasterxml.jackson.databind.introspect.AnnotationMap;
2122
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
2223
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
23-
import com.google.common.base.Functions;
2424
import com.sap.cloud.sdk.datamodel.odatav4.core.VdmEntity;
2525
import com.sap.cloud.sdk.datamodel.odatav4.core.VdmObject;
2626
import com.sap.cloud.sdk.result.ElementName;
@@ -79,7 +79,7 @@ public void serialize(
7979
Arrays
8080
.stream(object.getClass().getDeclaredFields())
8181
.filter(f -> f.getAnnotation(ElementName.class) != null)
82-
.collect(Collectors.toMap(Functions.identity(), f -> getFieldValue(f, object)));
82+
.collect(Collectors.toMap(Function.identity(), f -> getFieldValue(f, object)));
8383

8484
for( final Map.Entry<Field, Option<Object>> propertyEntry : fieldValues.entrySet() ) {
8585
final Option<Object> propertyValueOption = propertyEntry.getValue();

release_notes.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
### 🔧 Compatibility Notes
1010

11-
-
11+
- We noticed an implicit behavior change for updated Apache HttpClient from `5.5.1` to `5.6`.
12+
TLS/SSL connections are now checked for hostname verification on behalf of the provided server certificate.
13+
Even with enabled trust-all-certificates flag, connections to servers with mismatching hostnames will be rejected.
1214

1315
### ✨ New Functionality
1416

0 commit comments

Comments
 (0)