summaryrefslogtreecommitdiff
path: root/eaaf_core/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2019-09-16 08:49:39 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2019-09-16 08:49:39 +0200
commit4671767699179a16d099ca105ce9bf4307c30d9b (patch)
tree77689f738fb0d76065c84071781a8054eeb79eb1 /eaaf_core/src/main/java
parentdb520df25d4314908705a09b1463c439a36d3446 (diff)
downloadEAAF-Components-4671767699179a16d099ca105ce9bf4307c30d9b.tar.gz
EAAF-Components-4671767699179a16d099ca105ce9bf4307c30d9b.tar.bz2
EAAF-Components-4671767699179a16d099ca105ce9bf4307c30d9b.zip
fix problems after interface refactoring
Diffstat (limited to 'eaaf_core/src/main/java')
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java6
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java4
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java5
3 files changed, 8 insertions, 7 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;