some more OpenSAML3 refactoring stuff

1 files changed, 4 insertions, 24 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
index e2ee0c9d..1af8db7b 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
@@ -19,33 +19,13 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.api.metadata;
 
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
-import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
+import org.opensaml.saml.metadata.resolver.ExtendedRefreshableMetadataResolver;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml.saml2.metadata.RoleDescriptor;
-
-public interface IPvp2MetadataProvider extends MetadataResolver {
-
-  XMLObject getMetadata() throws Pvp2MetadataException;
-
-
-  EntitiesDescriptor getEntitiesDescriptor(String entitiesID) throws Pvp2MetadataException;
-
-
-  EntityDescriptor getEntityDescriptor(String entityID) throws Pvp2MetadataException;
-
 
-  List<RoleDescriptor> getRole(String entityID, QName roleName) throws Pvp2MetadataException;
+import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
+public interface IPvp2MetadataProvider extends ExtendedRefreshableMetadataResolver {
 
-  RoleDescriptor getRole(String entityID, QName roleName, String supportedProtocol)
-      throws Pvp2MetadataException;
+  EntityDescriptor getEntityDescriptor(String entityID) throws ResolverException;
 
 }