From 41ea2fdf782cd64d7d29f73c2e83f9c255810818 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 2 Feb 2020 19:32:21 +0100 Subject: some more OpenSAML3 refactoring stuff --- .../pvp2/api/metadata/IPvp2MetadataProvider.java | 28 ++++------------------ .../metadata/IPvpMetadataBuilderConfiguration.java | 7 +++--- .../api/metadata/IRefreshableMetadataProvider.java | 4 +++- 3 files changed, 11 insertions(+), 28 deletions(-) (limited to 'eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api') 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 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; } diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java index 72cb3f3c..128d4c2f 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java @@ -22,14 +22,15 @@ package at.gv.egiz.eaaf.modules.pvp2.api.metadata; import java.util.Collection; import java.util.List; -import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException; - import org.opensaml.saml.saml2.core.Attribute; import org.opensaml.saml.saml2.metadata.ContactPerson; import org.opensaml.saml.saml2.metadata.Organization; import org.opensaml.saml.saml2.metadata.RequestedAttribute; import org.opensaml.security.credential.Credential; +import at.gv.egiz.eaaf.modules.pvp2.api.credential.EaafX509Credential; +import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException; + /** * PVP Metadata builder configuration. * @@ -109,7 +110,7 @@ public interface IPvpMetadataBuilderConfiguration { * @return Credentials * @throws CredentialsNotAvailableException In case of an error */ - Credential getMetadataSigningCredentials() throws CredentialsNotAvailableException; + EaafX509Credential getMetadataSigningCredentials() throws CredentialsNotAvailableException; /** * Set the credential for request/response signing IDP metadata: this credential diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IRefreshableMetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IRefreshableMetadataProvider.java index 5f69ba62..39536771 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IRefreshableMetadataProvider.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IRefreshableMetadataProvider.java @@ -19,13 +19,15 @@ package at.gv.egiz.eaaf.modules.pvp2.api.metadata; +import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver; + /** * Metadata provider that supports dynamic refreshing on external events. * * @author tlenz * */ -public interface IRefreshableMetadataProvider { +public interface IRefreshableMetadataProvider extends RefreshableMetadataResolver{ /** * Refresh a entity or load a entity in a metadata provider. -- cgit v1.2.3