[java-oidfed-common] 03/03: Fix miscellaneous minor warnings

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-oidfed-common.

View the commit online:
https://codeberg.org/Shibboleth/java-oidfed-common/commit/5a5f8ebce82bb4564302e5ee3dba94be7109fa7a

commit 5a5f8ebce82bb4564302e5ee3dba94be7109fa7a
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Oct 30 14:37:21 2026 +0200

    Fix miscellaneous minor warnings
---
 .../java/net/shibboleth/oidfed/profile/TrustedRemoteEntity.java   | 8 ++++++++
 .../shibboleth/oidfed/profile/TrustedRemoteResolverEntity.java    | 8 ++++++++
 .../oidfed/support/ClientInformationExtensionSupport.java         | 2 +-
 .../oidfed/messaging/impl/ExplicitClientRegistrationRequest.java  | 2 +-
 .../shibboleth/oidfed/messaging/impl/ResolveEntityRequest.java    | 2 +-
 .../cache/DefaultPrivateKeyJwtClientAuthenticationFunction.java   | 7 +++++--
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteEntity.java b/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteEntity.java
index e396cb1..95e612f 100644
--- a/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteEntity.java
+++ b/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteEntity.java
@@ -14,6 +14,8 @@
 
 package net.shibboleth.oidfed.profile;
 
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 import com.google.common.base.MoreObjects;
@@ -56,6 +58,12 @@ public class TrustedRemoteEntity {
                 .toString();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public int hashCode() {
+        return Objects.hash(entityId);
+    }
+
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
diff --git a/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteResolverEntity.java b/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteResolverEntity.java
index df10c4e..95e2ec2 100644
--- a/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteResolverEntity.java
+++ b/oidfed-common-api/src/main/java/net/shibboleth/oidfed/profile/TrustedRemoteResolverEntity.java
@@ -15,6 +15,7 @@
 package net.shibboleth.oidfed.profile;
 
 import java.util.Collection;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
@@ -22,6 +23,7 @@ import com.google.common.base.MoreObjects;
 
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.logic.Constraint;
 
 /**
@@ -62,6 +64,12 @@ public class TrustedRemoteResolverEntity extends TrustedRemoteEntity {
                 .toString();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public int hashCode() {
+        return Objects.hash(getEntityId(), CollectionSupport.copyToSet(trustAnchors));
+    }
+
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
diff --git a/oidfed-common-api/src/main/java/net/shibboleth/oidfed/support/ClientInformationExtensionSupport.java b/oidfed-common-api/src/main/java/net/shibboleth/oidfed/support/ClientInformationExtensionSupport.java
index f9e5407..b0fb134 100644
--- a/oidfed-common-api/src/main/java/net/shibboleth/oidfed/support/ClientInformationExtensionSupport.java
+++ b/oidfed-common-api/src/main/java/net/shibboleth/oidfed/support/ClientInformationExtensionSupport.java
@@ -68,7 +68,7 @@ public class ClientInformationExtensionSupport {
         return Optional.ofNullable(clientInformation.getOIDCMetadata().getCustomField(KEY_VALIDATED_TRUST_CHAIN))
                 .filter(List.class::isInstance)
                 .map(obj -> (List<?>) obj)
-                .map(list -> list.stream().map(String.class::cast).toList())
+                .map(list -> list.stream().filter(String.class::isInstance).map(String.class::cast).toList())
                 .orElse(null);
     }
 
diff --git a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ExplicitClientRegistrationRequest.java b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ExplicitClientRegistrationRequest.java
index 59a6148..d0e3241 100644
--- a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ExplicitClientRegistrationRequest.java
+++ b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ExplicitClientRegistrationRequest.java
@@ -79,7 +79,7 @@ public class ExplicitClientRegistrationRequest implements Request {
     @Override
     public HTTPRequest toHTTPRequest() {
         //TODO
-        return null;
+        throw new UnsupportedOperationException("not-implemented-yet");
     }
 
     /**
diff --git a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ResolveEntityRequest.java b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ResolveEntityRequest.java
index b776b00..74de825 100644
--- a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ResolveEntityRequest.java
+++ b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/messaging/impl/ResolveEntityRequest.java
@@ -107,7 +107,7 @@ public class ResolveEntityRequest extends AbstractOptionallyAuthenticatedRequest
     @Override
     public HTTPRequest toHTTPRequest() {
         //TODO
-        return null;
+        throw new UnsupportedOperationException("not-implemented-yet");
     }
 
     /** {@inheritDoc} */
diff --git a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/metadata/cache/DefaultPrivateKeyJwtClientAuthenticationFunction.java b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/metadata/cache/DefaultPrivateKeyJwtClientAuthenticationFunction.java
index d30921d..c72cde9 100644
--- a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/metadata/cache/DefaultPrivateKeyJwtClientAuthenticationFunction.java
+++ b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/metadata/cache/DefaultPrivateKeyJwtClientAuthenticationFunction.java
@@ -233,9 +233,12 @@ public class DefaultPrivateKeyJwtClientAuthenticationFunction extends AbstractId
 
         final SignatureSigningParameters signingParameters;
         try {
-            final CriteriaSet resolverCriteria = criteria == null ? new CriteriaSet() : criteria;
+            final CriteriaSet resolverCriteria = new CriteriaSet();
+            if (criteria != null) {
+                resolverCriteria.addAll(criteria);
+            }
             resolverCriteria.add(new SignatureSigningConfigurationCriterion(
-                    securityConfiguration.getJwtSignatureSigningConfiguration()));
+                    securityConfiguration.getJwtSignatureSigningConfiguration()), true);
             signingParameters = resolver.resolveSingle(resolverCriteria);
             if (signingParameters == null) {
                 log.error("Failed to resolve signature signing parameters");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.