Merge branch 'opensaml_4.x' into nightlyBuild

# Conflicts:
#	eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java
#	eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/SamlVerificationEngine.java
#	eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
#	eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyMetadataProvider.java
#	eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
#	eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java
#	pom.xml

1 files changed, 13 insertions, 7 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java
index 4115cc7c..f0291847 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java
@@ -1,8 +1,10 @@
 package at.gv.egiz.eaaf.modules.pvp2.impl.metadata;
 
-import org.joda.time.DateTime;
+
+import java.time.Instant;
+
 import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.saml.metadata.resolver.ExtendedRefreshableMetadataResolver;
+import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
 import org.opensaml.saml.metadata.resolver.impl.AbstractMetadataResolver;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
@@ -16,9 +18,9 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
 @Slf4j
 public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider, IRefreshableMetadataProvider {
 
-  private final ExtendedRefreshableMetadataResolver internalProvider;
+  private final RefreshableMetadataResolver internalProvider;
 
-  public PvpMetadataResolverAdapter(ExtendedRefreshableMetadataResolver provider) {
+  public PvpMetadataResolverAdapter(RefreshableMetadataResolver provider) {
     this.internalProvider = provider;
   }
 
@@ -29,13 +31,13 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider, IRefre
   }
 
   @Override
-  public DateTime getLastRefresh() {
+  public Instant getLastRefresh() {
     return internalProvider.getLastRefresh();
 
   }
 
   @Override
-  public DateTime getLastUpdate() {
+  public Instant getLastUpdate() {
     return internalProvider.getLastUpdate();
   }
 
@@ -88,7 +90,7 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider, IRefre
   }
 
   @Override
-  public DateTime getLastSuccessfulRefresh() {
+  public Instant getLastSuccessfulRefresh() {
     return internalProvider.getLastSuccessfulRefresh();
   }
 
@@ -122,7 +124,11 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider, IRefre
           internalProvider.getClass().getName());
 
     }
+  }
 
+  public Throwable getLastFailureCause() {
+    return internalProvider.getLastFailureCause();
+    
   }
 
 }