diff options
Diffstat (limited to 'connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java')
| -rw-r--r-- | connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java index 831338c2..4db6ac5a 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java @@ -41,13 +41,13 @@ import org.springframework.stereotype.Service; import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants; import at.asitplus.eidas.specific.connector.verification.MetadataSignatureVerificationFilter; import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP; -import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration; -import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException; +import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration; +import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException; import at.gv.egiz.eaaf.core.impl.utils.FileUtils; -import at.gv.egiz.eaaf.modules.pvp2.exception.PVP2MetadataException; +import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException; import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.AbstractChainingMetadataProvider; import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.MetadataFilterChain; -import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.PVPEntityCategoryFilter; +import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.PvpEntityCategoryFilter; import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.SchemaValidationFilter; @Service("PVPMetadataProvider") @@ -57,8 +57,8 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{ @Autowired(required=true) IConfigurationWithSP basicConfig; @Override - protected String getMetadataURL(String entityId) throws EAAFConfigurationException { - ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId); + protected String getMetadataUrl(String entityId) throws EaafConfigurationException { + ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId); if (spConfig != null) { String metadataURL = entityId; @@ -79,8 +79,8 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{ @Override protected MetadataProvider createNewMetadataProvider(String entityId) - throws EAAFConfigurationException, IOException, CertificateException { - ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId); + throws EaafConfigurationException, IOException, CertificateException { + ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId); if (spConfig != null) { try { String metadataURL = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_URL); @@ -89,7 +89,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{ metadataURL = entityId; } - String trustStoreUrl = FileUtils.makeAbsoluteURL( + String trustStoreUrl = FileUtils.makeAbsoluteUrl( spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE), authConfig.getConfigurationRootDirectory()); String trustStorePassword = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE_PASSWORD); @@ -101,9 +101,9 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{ new BasicParserPool(), createHttpClient(metadataURL)); - } catch (PVP2MetadataException e) { + } catch (Pvp2MetadataException e) { log.info("Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage()); - throw new EAAFConfigurationException("config.27", + throw new EaafConfigurationException("config.27", new Object[] {"Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage()}, e); } @@ -115,7 +115,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{ } @Override - protected List<String> getAllMetadataURLsFromConfiguration() throws EAAFConfigurationException { + protected List<String> getAllMetadataUrlsFromConfiguration() throws EaafConfigurationException { // TODO Auto-generated method stub return null; } @@ -129,7 +129,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{ } - private MetadataFilterChain buildMetadataFilterChain(ISPConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, PVP2MetadataException{ + private MetadataFilterChain buildMetadataFilterChain(ISpConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, Pvp2MetadataException{ MetadataFilterChain filterChain = new MetadataFilterChain(); filterChain.getFilters().add(new SchemaValidationFilter( basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_SCHEME_VALIDATION, true))); @@ -138,7 +138,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{ new MetadataSignatureVerificationFilter( trustStoreUrl, trustStorePassword, metadataURL)); - filterChain.getFilters().add(new PVPEntityCategoryFilter( + filterChain.getFilters().add(new PvpEntityCategoryFilter( basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES, true))); return filterChain; |