[java-oidc-common] branch main updated: Add profile-api to metadata-impl module

[Phil Smart]

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

philsmart pushed a commit to branch main
in repository java-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=a1bca3450fe1bc46870c1fa6c955e825d874e2bd

The following commit(s) were added to refs/heads/main by this push:
     new a1bca34  Add profile-api to metadata-impl module
a1bca34 is described below

commit a1bca3450fe1bc46870c1fa6c955e825d874e2bd
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Mar 8 20:31:54 2022 +0000

    Add profile-api to metadata-impl module
    
    Some cleanup
---
 oidc-common-metadata-impl/pom.xml                                    | 5 +++++
 .../net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java  | 2 +-
 .../cache/impl/DefaultSourceMetadataExpirationTimeStrategy.java      | 3 ++-
 .../oidc/metadata/cache/impl/FetchThroughMetadataCache.java          | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/oidc-common-metadata-impl/pom.xml b/oidc-common-metadata-impl/pom.xml
index 992e28e..a6ffd39 100644
--- a/oidc-common-metadata-impl/pom.xml
+++ b/oidc-common-metadata-impl/pom.xml
@@ -56,6 +56,11 @@
 			<artifactId>oidc-common-crypto-impl</artifactId>
 			<scope>provided</scope>
 		</dependency>
+        <dependency>
+            <groupId>net.shibboleth.oidc</groupId>
+            <artifactId>oidc-common-profile-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 		<dependency>
 			<groupId>net.shibboleth.oidc</groupId>
 			<artifactId>oidc-common-metadata-api</artifactId>
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java
index e831c8b..723b470 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCache.java
@@ -375,7 +375,7 @@ public class BatchMetadataCache<IdentifierType, MetadataType>
                 if (sourceMetadataValidPredicate.test(rawFetchedMetadata)) {           
                     
                     final List<MetadataType> parsedMetadata = parsingStrategy.apply(rawFetchedMetadata);
-                    if (parsedMetadata != null) {
+                    if (parsedMetadata != null && !parsedMetadata.isEmpty()) {
                         log.info("{} Parsed {} metadata candidates, loading into cache", 
                                 getLogPrefix(), parsedMetadata.size());
                         freshLoad(parsedMetadata);
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DefaultSourceMetadataExpirationTimeStrategy.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DefaultSourceMetadataExpirationTimeStrategy.java
index cb9946e..05701fc 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DefaultSourceMetadataExpirationTimeStrategy.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/DefaultSourceMetadataExpirationTimeStrategy.java
@@ -22,6 +22,7 @@ import java.time.Instant;
 import java.util.function.Function;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -45,7 +46,7 @@ public class DefaultSourceMetadataExpirationTimeStrategy
     }
 
     @Override
-    public Instant apply(final byte[] sourceMetadata) {
+    public Instant apply(@Nullable final byte[] sourceMetadata) {
         return Instant.now().plus(expiryDuration);
     }
 
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java
index 7709716..a932265 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCache.java
@@ -34,6 +34,7 @@ import net.shibboleth.oidc.metadata.cache.MetadataCacheException;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -88,7 +89,7 @@ public class FetchThroughMetadataCache <IdentifierType, MetadataType>
     }
 
     @Override
-    @Nonnull @NonnullElements public List<MetadataType> get(
+    @Nonnull @NonnullElements @NotLive public List<MetadataType> get(
             @Nonnull @NotEmpty final CriteriaSet criteria) throws MetadataCacheException {
         
         if (!isInitialized()) {

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