fix problems after interface refactoring

6 files changed, 14 insertions, 11 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
index af66552d..4a4bcab6 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
@@ -49,7 +49,7 @@ import at.gv.egiz.eaaf.core.api.data.ExtendedPVPAttributeDefinitions;
 import at.gv.egiz.eaaf.core.api.data.PVPAttributeDefinitions;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.idp.IAuthenticationDataBuilder;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IAuthProcessDataContainer;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
@@ -72,7 +72,7 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 	public static final String CONFIG_PROP_ENABLE_IDL_ATTRIBUTE_ESCAPEING = "configuration.bugfix.enable.idl.escaping";
 	
 	protected Collection<String> includedToGenericAuthData = null;	
-	@Autowired protected IConfiguration basicConfig;
+	@Autowired protected IConfigurationWithSP basicConfig;
 	
 	@Override
 	public IAuthData buildAuthenticationData(IRequest pendingReq) throws EAAFAuthenticationException {
@@ -212,7 +212,7 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 								
 			} else {
 				authData.setCiticenCountryCode(basicConfig.getBasicConfiguration(
-						IConfiguration.CONFIG_PROPS_AUTH_DEFAULT_COUNTRYCODE, 
+						IConfigurationWithSP.CONFIG_PROPS_AUTH_DEFAULT_COUNTRYCODE, 
 						EAAFConstants.COUNTRYCODE_AUSTRIA));
 				
 			}			
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
index 5ad44801..4505163d 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
@@ -43,7 +43,7 @@ import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IStatusMessenger;
 import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egiz.eaaf.core.api.data.ExceptionContainer;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.idp.auth.services.IProtocolAuthenticationService;
 import at.gv.egiz.eaaf.core.api.logging.IRevisionLogger;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
@@ -65,7 +65,7 @@ public abstract class AbstractController {
 
 	@Autowired(required=true) protected IProtocolAuthenticationService protAuthService;	
 	@Autowired(required=true) protected ApplicationContext applicationContext;	
-	@Autowired(required=true) protected IConfiguration authConfig;
+	@Autowired(required=true) protected IConfigurationWithSP authConfig;
 	@Autowired(required=true) protected ITransactionStorage transactionStorage;
 	@Autowired(required=true) protected IStatusMessenger statusMessager;
 
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
index f037f4ab..3f0c61b8 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
@@ -46,6 +46,7 @@ import org.springframework.lang.Nullable;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+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.EAAFAuthenticationException;
 import at.gv.egiz.eaaf.core.exceptions.EAAFException;
@@ -104,7 +105,7 @@ public abstract class RequestImpl implements IRequest, Serializable{
 	 * @throws EAAFException 
 	 * 
 	 */
-	public final void initialize(HttpServletRequest req, IConfiguration authConfig) throws EAAFException {
+	public final void initialize(HttpServletRequest req, IConfigurationWithSP authConfig) throws EAAFException {
 		initialize(req, authConfig, null);
 		
 	}
@@ -119,7 +120,7 @@ public abstract class RequestImpl implements IRequest, Serializable{
 	 * @throws EAAFException 
 	 * 
 	 */
-	public final void initialize(@NonNull HttpServletRequest req, @NonNull  IConfiguration authConfig, @Nullable String transactionId) throws EAAFException {
+	public final void initialize(@NonNull HttpServletRequest req, @NonNull  IConfigurationWithSP authConfig, @Nullable String transactionId) throws EAAFException {
 		//use external transactionId or create new one if empty or null
 		if (StringUtils.isNotEmpty(transactionId))
 			uniqueTransactionIdentifer = transactionId;		
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummyConfiguration.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummyConfiguration.java
index ffb921ce..816f6871 100644
--- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummyConfiguration.java
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummyConfiguration.java
@@ -4,13 +4,13 @@ import java.net.URI;
 import java.net.URL;
 import java.util.Map;
 
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+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.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.builder.AbstractAuthenticationDataBuilder;
 
-public class DummyConfiguration implements IConfiguration {
+public class DummyConfiguration implements IConfigurationWithSP {
 
 	private Boolean isIDLEscapingEnabled = null;
 	
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
index 368155db..a12a7260 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
@@ -3,7 +3,7 @@ package at.gv.egiz.eaaf.core.api.idp;
 import java.net.URI;
 import java.util.Properties;
 
-public interface IExtendedConfiguration extends IConfiguration {
+public interface IExtendedConfiguration extends IConfigurationWithSP {
 
 	/**
 	 * Get the full configuration properties object
diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualeIDRequestTask.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualeIDRequestTask.java
index 736ba077..85302d83 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualeIDRequestTask.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualeIDRequestTask.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.EAAFAuthenticationException;
@@ -47,6 +48,7 @@ public abstract class AbstractCreateQualeIDRequestTask extends AbstractAuthServl
 	private static final Logger log = LoggerFactory.getLogger(AbstractCreateQualeIDRequestTask.class);
 	
 	@Autowired(required=true) private IHttpClientFactory httpClientFactory;
+	@Autowired(required=true) protected IConfigurationWithSP authConfigWithSp;
 	
 	@Override 
 	public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
@@ -193,7 +195,7 @@ public abstract class AbstractCreateQualeIDRequestTask extends AbstractAuthServl
 		final String spSpecificVDAEndpoints = oaConfig.getConfigurationValue(Constants.CONFIG_PROP_SP_SL20_ENDPOINT_LIST);		
 		
 		//load general configuration
-		final Map<String, String> endPointMap = authConfig.getBasicConfigurationWithPrefix(Constants.CONFIG_PROP_VDA_ENDPOINT_QUALeID_LIST);
+		final Map<String, String> endPointMap = authConfigWithSp.getBasicConfigurationWithPrefix(Constants.CONFIG_PROP_VDA_ENDPOINT_QUALeID_LIST);
 		endPointMap.put(Constants.CONFIG_PROP_VDA_ENDPOINT_QUALeID_DEFAULT_ELEMENT, authConfig.getBasicConfiguration(Constants.CONFIG_PROP_VDA_ENDPOINT_QUALeID_DEFAULT));
 		if (StringUtils.isNotEmpty(spSpecificVDAEndpoints)) {
 			endPointMap.putAll(KeyValueUtils.convertListToMap(