From f220f54579f5975586b4dcd7634668815c208eda Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 8 Apr 2020 16:23:51 +0200
Subject: refactor to OpenSAML 4.x

---
 .../metadata/AbstractChainingMetadataProvider.java | 54 +++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

(limited to 'eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java')

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
index 40448b45..3a21b15d 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
@@ -21,6 +21,7 @@ package at.gv.egiz.eaaf.modules.pvp2.impl.metadata;
 
 import java.io.IOException;
 import java.security.cert.CertificateException;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -33,15 +34,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.naming.ConfigurationException;
 
-import at.gv.egiz.components.spring.api.IDestroyableObject;
-import at.gv.egiz.eaaf.core.api.IGarbageCollectorProcessing;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpAddableChainingMetadataProvider;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IRefreshableMetadataProvider;
-
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.saml.metadata.resolver.ClearableMetadataResolver;
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
@@ -50,6 +43,12 @@ import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
 import org.opensaml.saml.metadata.resolver.impl.AbstractMetadataResolver;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
+import at.gv.egiz.components.spring.api.IDestroyableObject;
+import at.gv.egiz.eaaf.core.api.IGarbageCollectorProcessing;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpAddableChainingMetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IRefreshableMetadataProvider;
 import lombok.extern.slf4j.Slf4j;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
@@ -64,7 +63,7 @@ public abstract class AbstractChainingMetadataProvider implements IGarbageCollec
   @Nonnull
   @NonnullElements
   private final List<MetadataResolver> internalResolvers;
-  private DateTime lastRefeshTimestamp;
+  private Instant lastRefeshTimestamp;
   private boolean lastRefeshSuccessful;
   private static Object mutex = new Object();
 
@@ -111,10 +110,10 @@ public abstract class AbstractChainingMetadataProvider implements IGarbageCollec
   @Override
   public synchronized boolean refreshMetadataProvider(final String entityId) {
     try {
-      //if (resolveEntityDescriporForRefesh(entityId)) {
-      //  return true;
+      // if (resolveEntityDescriporForRefesh(entityId)) {
+      // return true;
       //
-      //}
+      // }
 
       // reload metadata provider
       final String metadataUrl = getMetadataUrl(entityId);
@@ -160,7 +159,6 @@ public abstract class AbstractChainingMetadataProvider implements IGarbageCollec
 
   }
 
-
   @Override
   public final MetadataFilter getMetadataFilter() {
     log.warn("{} does NOT support {}", AbstractChainingMetadataProvider.class.getName(),
@@ -275,17 +273,17 @@ public abstract class AbstractChainingMetadataProvider implements IGarbageCollec
       }
     }
 
-    this.lastRefeshTimestamp = DateTime.now();
+    this.lastRefeshTimestamp = Instant.now();
     this.lastRefeshSuccessful = true;
   }
 
   @Override
   @Nullable
-  public final DateTime getLastUpdate() {
-    DateTime ret = null;
+  public final Instant getLastUpdate() {
+    Instant ret = null;
     for (final MetadataResolver resolver : internalResolvers) {
       if (resolver instanceof RefreshableMetadataResolver) {
-        final DateTime lastUpdate = ((RefreshableMetadataResolver) resolver).getLastUpdate();
+        final Instant lastUpdate = ((RefreshableMetadataResolver) resolver).getLastUpdate();
         if (ret == null || ret.isBefore(lastUpdate)) {
           ret = lastUpdate;
         }
@@ -297,11 +295,11 @@ public abstract class AbstractChainingMetadataProvider implements IGarbageCollec
 
   @Override
   @Nullable
-  public final DateTime getLastRefresh() {
-    DateTime ret = null;
+  public final Instant getLastRefresh() {
+    Instant ret = null;
     for (final MetadataResolver resolver : internalResolvers) {
       if (resolver instanceof RefreshableMetadataResolver) {
-        final DateTime lastRefresh = ((RefreshableMetadataResolver) resolver).getLastRefresh();
+        final Instant lastRefresh = ((RefreshableMetadataResolver) resolver).getLastRefresh();
         if (ret == null || ret.isBefore(lastRefresh)) {
           ret = lastRefresh;
         }
@@ -312,7 +310,7 @@ public abstract class AbstractChainingMetadataProvider implements IGarbageCollec
   }
 
   @Override
-  public final DateTime getLastSuccessfulRefresh() {
+  public final Instant getLastSuccessfulRefresh() {
     return this.lastRefeshTimestamp;
 
   }
@@ -347,6 +345,20 @@ public abstract class AbstractChainingMetadataProvider implements IGarbageCollec
 
   }
 
+  @Override
+  public final Throwable getLastFailureCause() {
+    for (final MetadataResolver resolver : internalResolvers) {
+      if (resolver instanceof RefreshableMetadataResolver) {
+        final RefreshableMetadataResolver refreshable = (RefreshableMetadataResolver) resolver;
+        if (refreshable.getLastFailureCause() != null) {
+          return refreshable.getLastFailureCause();
+        }
+      }
+    }
+
+    return null;
+  }
+
   /**
    * Get the URL to metadata for a specific entityID.
    *
-- 
cgit v1.2.3