diff options
Diffstat (limited to 'eidas_modules/authmodule-eIDAS-v2/src/main')
| -rw-r--r-- | eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java index baee2a58..0edfb357 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java @@ -79,7 +79,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { private static final String LOGMSG_MISSING_CONFIG = "Missing configuration with key: {0}"; private static final String LOGMSG_ZMR_ERROR = - "Receive an error from ZMR during '{0}' operation with msg: {1}"; + "Receive an error from ZMR during '{}' operation with msg: {}"; private static final String LOGMSG_ZMR_RESP_PROCESS = "Proces ZMR response during '{}' operation failes with msg: {}"; @@ -94,7 +94,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { private static final String PROCESS_SEARCH_PERSONAL_IDENTIFIER = "Searching " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER; private static final String PROCESS_SEARCH_MDS_ONLY = "Searching with MDS only"; - private static final String PROCESS_SEARCH_COUNTRY_SPECIFIC = "Searching {} specific"; + private static final String PROCESS_SEARCH_COUNTRY_SPECIFIC = "Searching {0} specific"; private static final String PROCESS_KITT_GENERAL = "KITT general-processing"; private static final String PROCESS_KITT_IDENITIES_GET = "KITT get-latest-version"; @@ -138,7 +138,8 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { req.setClientInfo(generateClientInfos()); // set additionl search parameters - searchPersonReq.setPersonensucheInfo(generateSearchCriteria(false, true, false)); + searchPersonReq.setPersonensucheInfo(generateSearchCriteria( + PROCESS_SEARCH_PERSONAL_IDENTIFIER, false, true, false)); // request ZMR log.trace("Requesting ZMR for '{}' operation", PROCESS_SEARCH_PERSONAL_IDENTIFIER); @@ -187,7 +188,8 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { req.setClientInfo(generateClientInfos()); // set additionl search parameters - searchPersonReq.setPersonensucheInfo(generateSearchCriteria(false, true, false)); + searchPersonReq.setPersonensucheInfo(generateSearchCriteria( + PROCESS_SEARCH_MDS_ONLY, false, true, false)); // request ZMR log.trace("Requesting ZMR for '{}' operation", PROCESS_SEARCH_MDS_ONLY); @@ -230,7 +232,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { req.setClientInfo(generateClientInfos()); // set additionl search parameters - personSearchDao.setPersonensucheInfo(generateSearchCriteria(false, true, false)); + personSearchDao.setPersonensucheInfo(generateSearchCriteria(friendlyMsg, false, true, false)); // request ZMR log.trace("Requesting ZMR for '{}' operation", friendlyMsg); @@ -395,11 +397,13 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { } @Nonnull - private PersonensucheInfoType generateSearchCriteria(boolean searchInErnp, + private PersonensucheInfoType generateSearchCriteria(String infoElement, boolean searchInErnp, boolean searchInZmrHistory, boolean includeHistoryResults) { final PersonensucheInfoType personSearchInfo = new PersonensucheInfoType(); final SuchkriterienType searchCriteria = new SuchkriterienType(); final ErgebniskriterienType resultCriteria = new ErgebniskriterienType(); + + personSearchInfo.setBezugsfeld(infoElement); personSearchInfo.setSuchkriterien(searchCriteria); personSearchInfo.setErgebniskriterien(resultCriteria); @@ -410,6 +414,9 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { // TODO: check 'processSearchPersonResponse' if we change this to 'true' resultCriteria.setInclusivHistorie(includeHistoryResults); + // TODO: are these flags valid? + personSearchInfo.setAnzahlSaetze(10); + return personSearchInfo; } @@ -639,11 +646,12 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient { bpkInfo.setType(EaafConstants.URN_PREFIX_CDID + "ZP"); // set work-flow client information - req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_UPDATE, zmrProzessId)); + req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_SEARCH, zmrProzessId)); req.setClientInfo(generateClientInfos()); // set additionl search parameters - searchPersonReq.setPersonensucheInfo(generateSearchCriteria(false, true, false)); + searchPersonReq.setPersonensucheInfo(generateSearchCriteria( + PROCESS_KITT_IDENITIES_GET, false, true, false)); // request ZMR log.trace("Requesting ZMR for '{}' operation", PROCESS_KITT_IDENITIES_GET); |