From e7610325ee2f1d1f4e97e1e7a9b212e692836b5a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 4 Feb 2020 17:37:34 +0100
Subject: first stable version that uses OpenSAML 3.x

---
 .../impl/metadata/PvpMetadataResolverAdapter.java  | 39 ++++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

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

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 bd2b79cb..d2b861dc 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,18 +1,22 @@
 package at.gv.egiz.eaaf.modules.pvp2.impl.metadata;
 
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IRefreshableMetadataProvider;
+
 import org.joda.time.DateTime;
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.saml.metadata.resolver.ExtendedRefreshableMetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
+import lombok.extern.slf4j.Slf4j;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
-public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider {
-  
-  private ExtendedRefreshableMetadataResolver internalProvider;
+@Slf4j
+public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider, IRefreshableMetadataProvider {
+
+  private final ExtendedRefreshableMetadataResolver internalProvider;
 
   public PvpMetadataResolverAdapter(ExtendedRefreshableMetadataResolver provider) {
     this.internalProvider = provider;
@@ -27,7 +31,7 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider {
   @Override
   public DateTime getLastRefresh() {
     return internalProvider.getLastRefresh();
-    
+
   }
 
   @Override
@@ -38,7 +42,7 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider {
   @Override
   public boolean isRequireValidMetadata() {
     return internalProvider.isRequireValidMetadata();
-    
+
   }
 
   @Override
@@ -50,12 +54,12 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider {
   @Override
   public MetadataFilter getMetadataFilter() {
     return internalProvider.getMetadataFilter();
-    
+
   }
 
   @Override
   public void setMetadataFilter(MetadataFilter newFilter) {
-   internalProvider.setMetadataFilter(newFilter);
+    internalProvider.setMetadataFilter(newFilter);
 
   }
 
@@ -67,7 +71,7 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider {
   @Override
   public EntityDescriptor resolveSingle(CriteriaSet criteria) throws ResolverException {
     return internalProvider.resolveSingle(criteria);
-    
+
   }
 
   @Override
@@ -80,7 +84,7 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider {
     final CriteriaSet criteria = new CriteriaSet();
     criteria.add(new EntityIdCriterion(entityId));
     return internalProvider.resolveSingle(criteria);
-    
+
   }
 
   @Override
@@ -93,4 +97,19 @@ public class PvpMetadataResolverAdapter implements IPvp2MetadataProvider {
     return internalProvider.wasLastRefreshSuccess();
   }
 
+  @Override
+  public boolean refreshMetadataProvider(String entityID) {
+    try {
+      log.trace("Refeshing metadata-provider: {} ... ", getId());
+      internalProvider.refresh();
+      return true;
+
+    } catch (final ResolverException e) {
+      log.warn("Refreshing of metadata-provider: {} failed. Reason: {}",
+          getId(), e.getMessage());
+      return false;
+
+    }
+  }
+
 }
-- 
cgit v1.2.3