[java-identity-provider] branch master updated: Switch to use new Extended- metadata resolver interfaces.

[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=83fa96c9605067a60c462f28378eedf5bcd45001

The following commit(s) were added to refs/heads/master by this push:
       new  83fa96c   Switch to use new Extended- metadata resolver interfaces.
83fa96c is described below

commit 83fa96c9605067a60c462f28378eedf5bcd45001
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri Jun 23 18:30:49 2017 -0400

    Switch to use new Extended- metadata resolver interfaces.
    
    This is temporary until 4.0.0 (OSJ-206).
---
 .../metadata/impl/MetadataResolverServiceGaugeSet.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 27ace76..0cef33d 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
@@ -23,10 +23,10 @@ import javax.annotation.Nonnull;
 
 import org.joda.time.DateTime;
 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;
-import org.opensaml.saml.metadata.resolver.impl.AbstractBatchMetadataResolver;
-import org.opensaml.saml.metadata.resolver.impl.AbstractReloadingMetadataResolver;
 
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricFilter;
@@ -102,7 +102,7 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                     }
                 });
         
-        //TODO v4.0.0 - Switch to use RefreshableMetadataResolver when new methods promoted to interface
+        //TODO v4.0.0 - Switch to use RefreshableMetadataResolver when new methods promoted up
         getMetricMap().put(
                 MetricRegistry.name(DEFAULT_METRIC_NAME, metricName, "successfulRefresh"),
                 new Gauge<Map<String,DateTime>>() {
@@ -112,9 +112,9 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof AbstractReloadingMetadataResolver) {
+                                    if (resolver instanceof ExtendedRefreshableMetadataResolver) {
                                         mapBuilder.put(resolver.getId(),
-                                                ((AbstractReloadingMetadataResolver) resolver)
+                                                ((ExtendedRefreshableMetadataResolver) resolver)
                                                     .getLastSuccessfulRefresh());
                                     }
                                 }
@@ -126,7 +126,7 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                     }
                 });
         
-        //TODO v4.0.0 - Switch to use BatchMetadataResolver when new methods promoted to interface
+        //TODO v4.0.0 - Switch to use BatchMetadataResolver when new methods promoted up
         getMetricMap().put(
                 MetricRegistry.name(DEFAULT_METRIC_NAME, metricName, "rootValidUntil"),
                 new Gauge<Map<String,DateTime>>() {
@@ -136,9 +136,9 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof AbstractBatchMetadataResolver) {
+                                    if (resolver instanceof ExtendedBatchMetadataResolver) {
                                         mapBuilder.put(resolver.getId(),
-                                                ((AbstractBatchMetadataResolver) resolver).getRootValidUntil());
+                                                ((ExtendedBatchMetadataResolver) resolver).getRootValidUntil());
                                     }
                                 }
                             } finally {

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