[java-identity-provider] branch master updated: OSJ-206: Promote new public methods to MetadataResolver subinterfaces

[Brent Putman]

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

putmanb pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b24c54aa7cd4bbbc40fc1247377f3188b04909df

The following commit(s) were added to refs/heads/master by this push:
       new  b24c54a   OSJ-206: Promote new public methods to MetadataResolver subinterfaces
b24c54a is described below

commit b24c54aa7cd4bbbc40fc1247377f3188b04909df
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Apr 17 22:06:47 2019 -0400

    OSJ-206: Promote new public methods to MetadataResolver subinterfaces
---
 .../saml/metadata/RelyingPartyMetadataProvider.java    | 18 ++++++++++++++++++
 .../metadata/impl/MetadataResolverServiceGaugeSet.java | 16 +++++++---------
 idp-war/src/main/webapp/WEB-INF/jsp/status.jsp         | 12 ++++++------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
index 76401d8..ffa9f90 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
@@ -211,6 +211,24 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
     }
     
     /** {@inheritDoc} */
+    public Instant getLastSuccessfulRefresh() {
+        if (resolver instanceof RefreshableMetadataResolver) {
+            return ((RefreshableMetadataResolver) resolver).getLastSuccessfulRefresh();
+        } else {
+            return null;
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Boolean wasLastRefreshSuccess() {
+        if (resolver instanceof RefreshableMetadataResolver) {
+            return ((RefreshableMetadataResolver) resolver).wasLastRefreshSuccess();
+        } else {
+            return null;
+        }
+    }
+    
+    /** {@inheritDoc} */
     @Override public int compareTo(final RelyingPartyMetadataProvider other) {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         final int result = sortKey.compareTo(other.sortKey);
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
index fd772c5..5af8950 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
@@ -22,9 +22,8 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
+import org.opensaml.saml.metadata.resolver.BatchMetadataResolver;
 import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
-import org.opensaml.saml.metadata.resolver.ExtendedBatchMetadataResolver;
-import org.opensaml.saml.metadata.resolver.ExtendedRefreshableMetadataResolver;
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver;
 
@@ -115,12 +114,11 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof ExtendedRefreshableMetadataResolver 
-                                            && ((ExtendedRefreshableMetadataResolver) resolver)
+                                    if (resolver instanceof RefreshableMetadataResolver 
+                                            && ((RefreshableMetadataResolver) resolver)
                                                 .getLastSuccessfulRefresh()  != null) {
                                         mapBuilder.put(resolver.getId(),
-                                                ((ExtendedRefreshableMetadataResolver) resolver)
-                                                    .getLastSuccessfulRefresh());
+                                                ((RefreshableMetadataResolver) resolver).getLastSuccessfulRefresh());
                                     }
                                 }
                             } finally {
@@ -142,10 +140,10 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof ExtendedBatchMetadataResolver 
-                                            && ((ExtendedBatchMetadataResolver) resolver).getRootValidUntil() != null) {
+                                    if (resolver instanceof BatchMetadataResolver 
+                                            && ((BatchMetadataResolver) resolver).getRootValidUntil() != null) {
                                         mapBuilder.put(resolver.getId(),
-                                                ((ExtendedBatchMetadataResolver) resolver).getRootValidUntil());
+                                                ((BatchMetadataResolver) resolver).getRootValidUntil());
                                     }
                                 }
                             } finally {
diff --git a/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp b/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
index 3d103b1..efa3b7b 100644
--- a/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
+++ b/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
@@ -9,8 +9,8 @@
 <%@ page import="org.opensaml.saml.metadata.resolver.ChainingMetadataResolver" %>
 <%@ page import="org.opensaml.saml.metadata.resolver.MetadataResolver" %>
 <%@ page import="org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver" %>
-<%@ page import="org.opensaml.saml.metadata.resolver.ExtendedBatchMetadataResolver" %>
-<%@ page import="org.opensaml.saml.metadata.resolver.ExtendedRefreshableMetadataResolver" %>
+<%@ page import="org.opensaml.saml.metadata.resolver.BatchMetadataResolver" %>
+<%@ page import="org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver" %>
 <%@ page import="net.shibboleth.idp.Version" %>
 <%@ page import="net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider" %>
 <%@ page import="net.shibboleth.idp.attribute.resolver.AttributeResolver" %>
@@ -85,12 +85,12 @@ for (final ReloadableService service : (Collection<ReloadableService>) request.g
                     final Instant lastUpdate = resolver.getLastUpdate();
 
                     Instant lastSuccessfulRefresh = null;
-                    if (resolver instanceof ExtendedRefreshableMetadataResolver) {
-                        lastSuccessfulRefresh = ((ExtendedRefreshableMetadataResolver)resolver).getLastSuccessfulRefresh();
+                    if (resolver instanceof RefreshableMetadataResolver) {
+                        lastSuccessfulRefresh = ((RefreshableMetadataResolver)resolver).getLastSuccessfulRefresh();
                     }
                     Instant rootValidUntil = null;
-                    if (resolver instanceof ExtendedBatchMetadataResolver) {
-                        rootValidUntil = ((ExtendedBatchMetadataResolver)resolver).getRootValidUntil();
+                    if (resolver instanceof BatchMetadataResolver) {
+                        rootValidUntil = ((BatchMetadataResolver)resolver).getRootValidUntil();
                     }
     
                     out.println("\tmetadata source: " + resolver.getId());

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