diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-08-20 15:59:38 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-08-20 15:59:38 +0200 |
| commit | ae0e8dbdded2acf47007a20dcd878d2b51178b97 (patch) | |
| tree | 7ecc3193aeb5b54dab9f7a24f71bf03798147421 | |
| parent | ecd4b586e450c4fba05db4c3539f9a898eace594 (diff) | |
| download | EAAF-Components-ae0e8dbdded2acf47007a20dcd878d2b51178b97.tar.gz EAAF-Components-ae0e8dbdded2acf47007a20dcd878d2b51178b97.tar.bz2 EAAF-Components-ae0e8dbdded2acf47007a20dcd878d2b51178b97.zip | |
some small fixes
3 files changed, 17 insertions, 2 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java index 6defefdd..602546a2 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java @@ -206,7 +206,7 @@ public class BPKBuilder { final String input = "V1::urn:publicid:gv.at:cdid+" + target + "::" + bpk + "::" + sdf.format(new Date()); - System.out.println(input); + //System.out.println(input); byte[] result; try { final byte[] inputBytes = input.getBytes("ISO-8859-1"); diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/TestRequestImpl.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/TestRequestImpl.java index ceb4d9fe..80451399 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/TestRequestImpl.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/TestRequestImpl.java @@ -26,10 +26,13 @@ *******************************************************************************/ package at.gv.egiz.eaaf.core.impl.idp.module.test; +import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; +import org.apache.commons.lang3.StringUtils; + import at.gv.egiz.eaaf.core.api.IRequest; import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration; import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException; @@ -271,6 +274,18 @@ public class TestRequestImpl implements IRequest { @Override public void setRawDataToTransaction(String key, Object object) throws EAAFStorageException { + if (StringUtils.isEmpty(key)) { + throw new EAAFStorageException("Generic request-data can not be stored with a 'null' key", null); + + } + + if (object != null) { + if (!Serializable.class.isInstance(object)) { + throw new EAAFStorageException("Generic request-data can only store objects which implements the 'Seralizable' interface", null); + + } + } + storage.put(key, object); } diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualeIDTask.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualeIDTask.java index 488f4610..b4039cf9 100644 --- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualeIDTask.java +++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualeIDTask.java @@ -107,7 +107,7 @@ public abstract class AbstractReceiveQualeIDTask extends AbstractAuthServletTask final String errorMsg = SL20JSONExtractorUtils.getStringValue(errorResult, SL20Constants.SL20_COMMAND_PARAM_GENERAL_RESPONSE_ERRORMESSAGE, false); - log.info("Receiving errorcode: {} with msg: {} from VDA! Stopping auth-process ... "); + log.info("Receiving errorcode: {} with msg: {} from VDA! Stopping auth-process ... ", errorCode, errorMsg); //aTrustErrorWorkAround = true; throw new SL20Exception("sl20.08", new Object[] {errorCode, errorMsg}); |