From 0224cdf7be78cf0778f0b832a42c18c480c4b784 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 9 Dec 2019 09:22:54 +0100
Subject: switch to EAAF-Components 1.1.0-SNAPSHOT

---
 .../connector/config/BasicConfigurationProvider.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java')

diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
index 4793e085..4a9bc8e4 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.idp.conf.AbstractConfigurationImpl;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 
@@ -44,15 +44,15 @@ import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 public class BasicConfigurationProvider extends AbstractConfigurationImpl{
 	private static final Logger log = LoggerFactory.getLogger(BasicConfigurationProvider.class);
 	
-	private Map<String, ISPConfiguration> spConfigCache = new HashMap<String, ISPConfiguration>(); 
+	private Map<String, ISpConfiguration> spConfigCache = new HashMap<String, ISpConfiguration>(); 
 	
-	public BasicConfigurationProvider(String configPath) throws EAAFConfigurationException {
+	public BasicConfigurationProvider(String configPath) throws EaafConfigurationException {
 		super(configPath);
 		
 	}
 
 	@Override
-	public ISPConfiguration getServiceProviderConfiguration(String entityId) throws EAAFConfigurationException {
+	public ISpConfiguration getServiceProviderConfiguration(String entityId) throws EaafConfigurationException {
 		if (!spConfigCache.containsKey(entityId)) {
 			log.debug("SP: " + entityId + " is NOT cached. Starting load operation ...  ");
 			Map<String, String> allSPs = getBasicConfigurationWithPrefix(MSeIDASNodeConstants.PROP_CONFIG_SP_LIST_PREFIX);	
@@ -84,8 +84,8 @@ public class BasicConfigurationProvider extends AbstractConfigurationImpl{
 	}
 
 	@Override
-	public <T> T getServiceProviderConfiguration(String entityId, Class<T> decorator) throws EAAFConfigurationException {
-		ISPConfiguration spConfig = getServiceProviderConfiguration(entityId);
+	public <T> T getServiceProviderConfiguration(String entityId, Class<T> decorator) throws EaafConfigurationException {
+		ISpConfiguration spConfig = getServiceProviderConfiguration(entityId);
 		if (spConfig != null && decorator != null) {
 			if (decorator.isInstance(spConfig))
 				return (T)spConfig;
@@ -99,12 +99,12 @@ public class BasicConfigurationProvider extends AbstractConfigurationImpl{
 	}
 
 	@Override
-	public String validateIDPURL(URL url) throws EAAFException {
+	public String validateIdpUrl(URL url) throws EaafException {
 		log.trace("Validate requested URL: " + url);
 		String urlPrefixFromConfig = getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX);
 		if (StringUtils.isEmpty(urlPrefixFromConfig)) {
 			log.warn("Application config containts NO URL prefix");
-			throw new EAAFConfigurationException("config.27", 
+			throw new EaafConfigurationException("config.27", 
 					new Object[] {"Application config containts NO " 
 							+ getApplicationSpecificKeyPrefix() + MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX });
 			
-- 
cgit v1.2.3