Merge branch 'main' into feat/zero-trust

Author: MatKuhr

cloudplatform/cloudplatform-connectivity/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultHttpDestination.java

@@ -55,7 +55,10 @@ public final class DefaultHttpDestination implements HttpDestination
     @Delegate
     private final DestinationProperties baseProperties;
 
+    @Nullable
     private final KeyStore keyStore;
+
+    @Nullable
     private final KeyStore trustStore;
 
     @Nonnull

cloudplatform/cloudplatform-connectivity/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationKeyStoreComparator.java

@@ -10,6 +10,7 @@
 import java.util.Enumeration;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
@@ -29,7 +30,7 @@ class DestinationKeyStoreComparator
      *            The KeyStore to calculate the hash code for.
      * @return The key-store hash code dynamically computed on behalf of stored certificates.
      */
-    static int resolveKeyStoreHashCode( @Nonnull final KeyStore ks )
+    static int resolveKeyStoreHashCode( @Nullable final KeyStore ks )
     {
         final HashCodeBuilder out = new HashCodeBuilder(INITIAL_HASH_CODE, 37);
         final Certificate[] certificates = resolveCertificatesOnly(ks);
@@ -45,8 +46,12 @@ static int resolveKeyStoreHashCode( @Nonnull final KeyStore ks )
      * @return An array with certificates, or empty in case of error or non-certificate based keystore entries.
      */
     @Nonnull
-    static Certificate[] resolveCertificatesOnly( @Nonnull final KeyStore ks )
+    static Certificate[] resolveCertificatesOnly( @Nullable final KeyStore ks )
     {
+        if( ks == null ) {
+            return new Certificate[0];
+        }
+
         final ArrayList<Certificate> out = new ArrayList<>();
         try {
             final Enumeration<String> aliases = ks.aliases();

release_notes.md

@@ -20,4 +20,4 @@
 
 ### 🐛 Fixed Issues
 
-- 
+- Stop unnecessarily throwing and catching `NullPointerException` when interacting with `DefaultHttpDestination#equals(...)` and `#hashCode()`.