Merge branch 'feature/matching_search_address' into 'feature/matching_base'

add SOAP client to search addresses and add first simple test to request...

See merge request egiz/eidas_at_proxy!15

6 files changed, 538 insertions, 106 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrAddressSoapClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrAddressSoapClient.java
new file mode 100644
index 00000000..6e146ddf
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrAddressSoapClient.java
@@ -0,0 +1,286 @@
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr;
+
+import java.math.BigInteger;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.PostConstruct;
+import javax.xml.ws.BindingProvider;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.Nullable;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.AbstractSoapClient;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.ZmrCommunicationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.VersionHolder;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.ClientInfoType;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.Organisation;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.RequestType;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.ResponseType;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.Service;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.ServiceFault_Exception;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.ServicePort;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.WorkflowInfoClient;
+import at.gv.bmi.namespace.zmr_su.base._20040201_.address.WorkflowInfoServer;
+import at.gv.bmi.namespace.zmr_su.zrm._20040201_.address.Adressdaten;
+import at.gv.bmi.namespace.zmr_su.zrm._20040201_.address.AdresssucheInfoType;
+import at.gv.bmi.namespace.zmr_su.zrm._20040201_.address.AdresssucheRequest;
+import at.gv.bmi.namespace.zmr_su.zrm._20040201_.address.AdresssuchergebnisType;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * ZMR SOAP client for search-address operations.
+ *
+ * @author tlenz
+ *
+ */
+@Slf4j
+public class ZmrAddressSoapClient extends AbstractSoapClient {
+
+  private static final String CLIENT_DEFAULT = "ZMR-AddressSearch Client";
+  private static final String CLIENT_INFO = "eIDAS MS-Connector v{0}";
+
+  private static final String LOGMSG_ZMR_SOAP_ERROR =
+      "ZMR anwser for transaction: {0} with code: {1} and message: {2}";
+  private static final String LOGMSG_ZMR_ERROR =
+      "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: {}";
+
+  private static final String ERROR_MATCHING_07 = "module.eidasauth.matching.07";
+  private static final String ERROR_MATCHING_99 = "module.eidasauth.matching.99";
+
+  private static final String PROCESS_GENERAL = "GP_Abfragen";
+  private static final String PROCESS_TASK_ADDRESS_WIZZARD = "ZMR_VO_Adresssuche_im_GWR__6";
+
+  private static final String PROCESS_TASK_RESPONSE_LEVEL_CITY = "Ortschaft";
+  private static final String PROCESS_TASK_RESPONSE_LEVEL_STREET = "Strassenname";
+  private static final String PROCESS_TASK_RESPONSE_LEVEL_NUMBER = "Orientierungsnummer";
+
+
+  private static final String PROCESS_ADDRESS_WIZZARD = "PROCESS_SEARCH_WITH_ADDRESS_WIZZARD";
+
+  private static final String SEARCH_TYPE = "ADRESSSUCHE";
+
+
+  @Autowired VersionHolder versionHolder;
+  private ServicePort zmrClient;
+
+  @Getter
+  @AllArgsConstructor
+  public static class AddressInfo {
+    private final BigInteger processId;
+    private final List<Adressdaten> personResult;
+    private final DetailLevel level;
+
+  }
+
+  public enum DetailLevel { CITY, STREET, NUMBER, UNKNOWN }
+
+  /**
+   * Get address information based on ZMR data.
+   *
+   * @param addressInfo Search parameters
+   * @return Address data
+   * @throws EidasSAuthenticationException In case of an error
+   */
+  public AddressInfo searchAddress(@NonNull Adressdaten addressInfo)
+      throws EidasSAuthenticationException {
+    return searchAddress(addressInfo, null);
+
+  }
+
+  /**
+   * Get address information based on ZMR data.
+   *
+   * @param addressInfo Search parameters
+   * @param prozessInstanzId processId in case of associated requests
+   * @return Address data
+   * @throws EidasSAuthenticationException In case of an error
+   */
+  public AddressInfo searchAddress(@NonNull Adressdaten addressInfo, @Nullable BigInteger prozessInstanzId)
+      throws EidasSAuthenticationException {
+    try {
+      RequestType req = new RequestType();
+
+      // set generic informations
+      req.setClientInfo(generateClientInfos());
+      req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_ADDRESS_WIZZARD, null));
+
+      AdresssucheRequest search = new AdresssucheRequest();
+      req.setAdresssucheRequest(search);
+
+      // set static search type
+      AdresssucheInfoType searchType = new AdresssucheInfoType();
+      searchType.setSuchart(SEARCH_TYPE);
+      search.setAdresssucheInfo(searchType);
+
+      // set search parameters
+      search.setAdressdaten(addressInfo);
+
+      // request ZMR address services
+      log.debug("Requesting ZMR for adddress search ....");
+      ResponseType resp = zmrClient.service(req, null);
+      log.debug("Receice response for address search with #{} elements",
+          resp.getAdresssucheResponse().getAdresssuchergebnis().getGefundeneSaetze());
+
+      return new AddressInfo(
+          extractZmrProcessId(resp.getWorkflowInfoServer()),
+          resp.getAdresssucheResponse().getAdresssuchergebnis().getAdressdaten(),
+          extractAddressDetailLevel(resp.getAdresssucheResponse().getAdresssuchergebnis()));
+
+    } catch (final ServiceFault_Exception e) {
+      final String errorMsg = extractReasonFromError(e);
+      log.warn(LOGMSG_ZMR_ERROR, PROCESS_ADDRESS_WIZZARD, errorMsg);
+      throw new ZmrCommunicationException(ERROR_MATCHING_07, new Object[] { errorMsg }, e);
+
+    } catch (final Exception e) {
+      log.warn(LOGMSG_ZMR_RESP_PROCESS, PROCESS_ADDRESS_WIZZARD, e.getMessage());
+      throw new EidasSAuthenticationException(ERROR_MATCHING_99, new Object[] { e.getMessage() }, e);
+
+    }
+  }
+
+  @PostConstruct
+  private void initialize() throws EaafConfigurationException {
+    // set-up the ZMR client
+    initializeTechnicalZmrClient();
+
+  }
+
+  private void initializeTechnicalZmrClient() throws EaafConfigurationException {
+    log.info("Starting ZMR-AddressSearch Client initialization .... ");
+    final URL url = ZmrAddressSoapClient.class.getResource("/wsdl/addresssearching_client/wsdl/Service.wsdl");
+    final Service zmrService = new Service(url);
+    zmrClient = zmrService.getService();
+
+    final String zmrServiceUrl = basicConfig.getBasicConfiguration(
+        Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_ENDPOINT);
+    if (StringUtils.isEmpty(zmrServiceUrl)) {
+      log.error("No ZMR-AddressSearch service-URL found. ZMR-AddressSearch-Client initalisiation failed.");
+      throw new RuntimeException(
+          "No ZMR-AddressSearch service URL found. ZMR-AddressSearch-Client initalisiation failed.");
+
+    }
+
+    // inject handler
+    log.info("Use ZMR-AddressSearch service-URL: " + zmrServiceUrl);
+    injectBindingProvider((BindingProvider) zmrClient, CLIENT_DEFAULT, zmrServiceUrl,
+        basicConfig.getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_DEBUG_TRACEMESSAGES,
+            false));
+
+    // inject http parameters and SSL context
+    log.debug("Inject HTTP client settings ... ");
+    injectHttpClient(zmrClient, HttpClientConfig.builder()
+        .clientName(CLIENT_DEFAULT)
+        .clientType(CLIENT_DEFAULT)
+        .clientUrl(zmrServiceUrl)
+        .connectionTimeout(basicConfig.getBasicConfiguration(
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_TIMEOUT_CONNECTION,
+            Constants.HTTP_CLIENT_DEFAULT_TIMEOUT_CONNECTION))
+        .responseTimeout(basicConfig.getBasicConfiguration(
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_TIMEOUT_RESPONSE,
+            Constants.HTTP_CLIENT_DEFAULT_TIMEOUT_RESPONSE))
+        .keyStoreConfig(buildKeyStoreConfiguration(
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_KEYSTORE_TYPE,
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_KEYSTORE_PATH,
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_KEYSTORE_PASSWORD,
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_KEYSTORE_NAME,
+            "ZMR-AddressSearch SSL Client-Authentication KeyStore"))
+        .keyAlias(basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_KEYS_ALIAS))
+        .keyPassword(basicConfig.getBasicConfiguration(
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_KEY_PASSWORD))
+        .trustAll(false)
+        .trustStoreConfig(buildKeyStoreConfiguration(
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_TRUSTSTORE_TYPE,
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_TRUSTSTORE_PATH,
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_TRUSTSTORE_PASSWORD,
+            Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_SSL_TRUSTSTORE_NAME,
+            "ZMR-AddressSearch SSL Client-Authentication TrustStore"))
+        .build());
+
+  }
+
+  @Nonnull
+  private ClientInfoType generateClientInfos() {
+    final ClientInfoType clientInfo = new ClientInfoType();
+    final Organisation clientOrganisation = new Organisation();
+    clientInfo.setOrganisation(clientOrganisation);
+
+    // set client information
+    clientInfo.setClient(MessageFormat.format(CLIENT_INFO, versionHolder.getVersion()));
+
+    // set Behoerdennummer as organization identifier
+    clientOrganisation.setBehoerdenNr(basicConfig.getBasicConfiguration(
+        Constants.CONIG_PROPS_EIDAS_ZMRCLIENT_REQ_ORGANIZATION_NR));
+
+    return clientInfo;
+  }
+
+  @Nonnull
+  private static String extractReasonFromError(ServiceFault_Exception e) {
+    if (e.getFaultInfo() != null) {
+      return MessageFormat.format(LOGMSG_ZMR_SOAP_ERROR,
+          e.getFaultInfo().getServerTransaktionNr().toString(),
+          e.getFaultInfo().getErrorCode(),
+          e.getFaultInfo().getErrorMessage());
+
+    } else {
+      log.error("ZMR response without error code", e);
+      return e.getMessage();
+
+    }
+  }
+
+  @Nonnull
+  private static WorkflowInfoClient generateWorkFlowInfos(@Nonnull String subStepName,
+      @Nullable BigInteger prozessInstanzId) {
+    final WorkflowInfoClient infos = new WorkflowInfoClient();
+    infos.setProzessName(PROCESS_GENERAL);
+    infos.setVorgangName(subStepName);
+
+    //set processId that we received from ZMR before, if already available
+    if (prozessInstanzId != null) {
+      infos.setProzessInstanzID(prozessInstanzId);
+
+    }
+
+    return infos;
+
+  }
+
+  private static BigInteger extractZmrProcessId(WorkflowInfoServer workflowInfoServer) {
+    return workflowInfoServer != null ? workflowInfoServer.getProzessInstanzID() : null;
+
+  }
+
+  private static DetailLevel extractAddressDetailLevel(AdresssuchergebnisType value) {
+    if (value.getDetailgrad() == null) {
+      return DetailLevel.UNKNOWN;
+    }
+    switch (value.getDetailgrad()) {
+      case PROCESS_TASK_RESPONSE_LEVEL_CITY:
+        return DetailLevel.CITY;
+
+      case PROCESS_TASK_RESPONSE_LEVEL_STREET:
+        return DetailLevel.STREET;
+
+      case PROCESS_TASK_RESPONSE_LEVEL_NUMBER:
+        return DetailLevel.NUMBER;
+
+      default:
+        return DetailLevel.UNKNOWN;
+
+    }
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 85b49186..d82ccec5 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
@@ -22,6 +22,9 @@
 
   <bean id="zmrClient"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrSoapClient" />
+        
+  <bean id="zmrAddressClient"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrAddressSoapClient" />
 
   <!-- bean id="ZmrClientForeIDAS"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.zmr.DummyZmrClient" /-->
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
index f47d0f30..3ccfff19 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
@@ -20,4 +20,4 @@ module.eidasauth.matching.02=Matching failed, because ZMR response contains hist
 module.eidasauth.matching.03=Matching failed in workflow step: {0} with error: {1}
 module.eidasauth.matching.04=An error occurred while loading your data from official registers. Please contact the support.  
 
-module.eidasauth.matching.99=Matching failed, because of an unexpected processing error. Reason: {0}
\ No newline at end of file
+module.eidasauth.matching.99=Matching failed, because of an unexpected processing error. Reason: {0}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
index 186937d7..640c1f75 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
@@ -4,7 +4,7 @@
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
 <head>
-  <script src="$contextPath/autocommit.js"
+  <script src="/autocommit.js"
           th:attr="src=@{/autocommit.js}"></script>
 </head>
 <body>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrAddressSearchClientProductionTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrAddressSearchClientProductionTest.java
new file mode 100644
index 00000000..a6ff234b
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrAddressSearchClientProductionTest.java
@@ -0,0 +1,169 @@
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.clients;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.IfProfileValue;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrAddressSoapClient;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrAddressSoapClient.AddressInfo;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrAddressSoapClient.DetailLevel;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.LoggingHandler;
+import at.gv.bmi.namespace.zmr_su.zrm._20040201_.address.Adressdaten;
+import at.gv.e_government.reference.namespace.persondata.de._20040201.PostAdresseTyp;
+import at.gv.e_government.reference.namespace.persondata.de._20040201.ZustelladresseTyp;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+
+@IfProfileValue(name = "spring.profiles.active", value = "devEnvironment")
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {
+    "/SpringTest-context_tasks_test.xml",
+    "/SpringTest-context_basic_realConfig.xml" })
+@TestPropertySource(locations = {
+    // "classpath:/application.properties",
+    "file:/home/tlenz/Projekte/config/ms_connector/default_config.properties",
+})
+public class ZmrAddressSearchClientProductionTest {
+
+  
+  @Autowired ZmrAddressSoapClient client;
+  @Autowired IConfiguration basicConfig;
+  
+  @BeforeClass
+  public static void classInitializer() {
+    final Logger logger1 = (Logger) LoggerFactory.getLogger(LoggingHandler.class);
+    logger1.setLevel(Level.TRACE);
+
+    final Logger logger2 = (Logger) LoggerFactory.getLogger(ZmrAddressSoapClient.class);
+    logger2.setLevel(Level.TRACE);
+
+    final Logger rootLogger = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+    rootLogger.setLevel(Level.INFO);
+
+  }
+  
+  @Test
+  public void gemeinde() throws EidasSAuthenticationException {
+    // build dummy request
+    Adressdaten req = new Adressdaten();
+    PostAdresseTyp address = new PostAdresseTyp();
+    address.setGemeinde("Frohnl*");
+    req.setPostAdresse(address);
+        
+    // execute test
+    AddressInfo resp = client.searchAddress(req);
+    
+    // validate state
+    assertFalse("no results", resp.getPersonResult().isEmpty());
+    assertEquals("wrong detail level", DetailLevel.CITY, resp.getLevel());
+    
+    
+  }
+  
+  @Test
+  public void ortschaftAndGemeinde() throws EidasSAuthenticationException {
+    // build dummy request
+    Adressdaten req = new Adressdaten();
+    PostAdresseTyp address = new PostAdresseTyp();
+    address.setGemeinde("Frohnleiten");
+    address.setOrtschaft("Wannersdorf");
+    req.setPostAdresse(address);
+        
+    // execute test
+    AddressInfo resp = client.searchAddress(req);
+    
+    // validate state
+    assertFalse("no results", resp.getPersonResult().isEmpty());
+    assertEquals("wrong detail level", DetailLevel.STREET, resp.getLevel());
+    
+  }
+ 
+  @Test
+  public void ortschaftAndGemeindeAndStreet() throws EidasSAuthenticationException {
+    // build dummy request
+    Adressdaten req = new Adressdaten();
+    PostAdresseTyp address = new PostAdresseTyp();
+    address.setGemeinde("Frohnleiten");
+    address.setOrtschaft("Wannersdorf");
+    req.setPostAdresse(address);
+    
+    ZustelladresseTyp addressDetail = new ZustelladresseTyp();
+    addressDetail.setStrassenname("Wannersdorf"); 
+    address.setZustelladresse(addressDetail);
+        
+    // execute test
+    AddressInfo resp = client.searchAddress(req);
+    
+    // validate state
+    assertFalse("no results", resp.getPersonResult().isEmpty());
+    assertEquals("wrong detail level", DetailLevel.NUMBER, resp.getLevel());
+    
+  }
+  
+  
+  @Test
+  public void ortschaftAndGemeinde2() throws EidasSAuthenticationException {
+    // build dummy request
+    Adressdaten req = new Adressdaten();
+    PostAdresseTyp address = new PostAdresseTyp();
+    address.setGemeinde("Fro*");
+    address.setOrtschaft("Wannersdorf");
+    req.setPostAdresse(address);
+        
+    // execute test
+    AddressInfo resp = client.searchAddress(req);
+    
+    // validate state
+    assertFalse("no results", resp.getPersonResult().isEmpty());
+    assertEquals("wrong detail level", DetailLevel.CITY, resp.getLevel());
+    
+  }
+  
+  @Test
+  public void ortschaftAndGemeinde3() throws EidasSAuthenticationException {
+    // build dummy request
+    Adressdaten req = new Adressdaten();
+    PostAdresseTyp address = new PostAdresseTyp();
+    address.setGemeinde("Eggelsberg");
+    address.setOrtschaft("Wannersdorf");
+    req.setPostAdresse(address);
+        
+    // execute test
+    AddressInfo resp = client.searchAddress(req);
+    
+    // validate state
+    assertFalse("no results", resp.getPersonResult().isEmpty());
+    assertEquals("wrong detail level", DetailLevel.STREET, resp.getLevel());
+    
+  }
+  
+  
+  @Test
+  public void ortschaft() throws EidasSAuthenticationException {
+    // build dummy request
+    Adressdaten req = new Adressdaten();
+    PostAdresseTyp address = new PostAdresseTyp();
+    address.setOrtschaft("Wannersdorf");
+    req.setPostAdresse(address);
+        
+    // execute test
+    AddressInfo resp = client.searchAddress(req);
+    
+    // validate state
+    assertFalse("no results", resp.getPersonResult().isEmpty());
+    assertEquals("wrong detail level", DetailLevel.CITY, resp.getLevel());
+    
+  }
+  
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java
index 7c4f8a41..f17f69c3 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java
@@ -1,12 +1,15 @@
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.tasks;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.UnsupportedEncodingException;
-import java.text.MessageFormat;
-import java.util.Locale;
-
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SelectedLoginMethod;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateOtherLoginMethodGuiTask;
+import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
+import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import lombok.SneakyThrows;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Assert;
 import org.junit.Before;
@@ -23,17 +26,12 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
+import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
+import java.util.Locale;
 
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SelectedLoginMethod;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateOtherLoginMethodGuiTask;
-import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
-import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
-import lombok.SneakyThrows;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {
@@ -44,27 +42,27 @@ import lombok.SneakyThrows;
 @WebAppConfiguration
 public class GenerateOtherLoginMethodGuiTaskTest {
 
-  private static final String TEST_PATTER_REQ_PARAM = 
+  private static final String TEST_PATTER_REQ_PARAM =
       "<input type=\"hidden\" name=\"loginSelection\" value=\"{0}\">";
-  
+
   private static ObjectMapper mapper = new ObjectMapper();
-  
-  @Autowired GenerateOtherLoginMethodGuiTask task;
-  
+
+  @Autowired
+  GenerateOtherLoginMethodGuiTask task;
+
   private ExecutionContextImpl executionContext = new ExecutionContextImpl();
   private TestRequestImpl pendingReq;
   private MockHttpServletRequest httpReq;
   private MockHttpServletResponse httpResp;
-  
+
   @BeforeClass
   public static void classInitializer() {
     Locale.setDefault(Locale.ENGLISH);
-   
+
   }
-  
+
   /**
    * jUnit test set-up.
-   * 
    */
   @Before
   public void initialize() {
@@ -72,130 +70,106 @@ public class GenerateOtherLoginMethodGuiTaskTest {
     httpResp = new MockHttpServletResponse();
     RequestContextHolder.resetRequestAttributes();
     RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
-    
+
     pendingReq = new TestRequestImpl();
     pendingReq.setAuthUrl("https://localhost/ms_connector");
     pendingReq.setPendingReqId(RandomStringUtils.randomAlphanumeric(10));
-    
+
     LocaleContextHolder.resetLocaleContext();
   }
-  
-  
+
+
   @Test
   @SneakyThrows
-  public void jsonResponse() throws TaskExecutionException, UnsupportedEncodingException {    
-       
+  public void jsonResponse() throws TaskExecutionException, UnsupportedEncodingException {
+
     executionContext.put(Constants.CONTEXT_FLAG_ADVANCED_MATCHING_FAILED, true);
     httpReq.addHeader("Accept", "application/json");
-    
+
     task.execute(pendingReq, executionContext);
-    
+
     //result validation
     Assert.assertEquals("httpStausCode", 200, httpResp.getStatus());
     Assert.assertEquals("http ContentType", "application/json;charset=UTF-8", httpResp.getContentType());
     final String content = httpResp.getContentAsString();
     assertNotNull("response body is null", content);
     Assert.assertFalse("response body is empty", content.isEmpty());
-    final JsonNode json = new JsonMapper().readTree(content);    
-    assertNotNull("response body is null", json);    
+    final JsonNode json = new JsonMapper().readTree(content);
+    assertNotNull("response body is null", json);
     assertNotNull("advancedMatchFailed", json.get(Constants.HTML_FORM_ADVANCED_MATCHING_FAILED));
     assertTrue("advancedMatchFailed", json.get(Constants.HTML_FORM_ADVANCED_MATCHING_FAILED).asBoolean());
-    
+
   }
-  
+
   @Test
-  public void advancedMatchingFailedMsg() throws TaskExecutionException, UnsupportedEncodingException {    
-       
+  public void advancedMatchingFailedMsg() throws TaskExecutionException, UnsupportedEncodingException {
+
     executionContext.put(Constants.CONTEXT_FLAG_ADVANCED_MATCHING_FAILED, true);
-    
+
     task.execute(pendingReq, executionContext);
-    
-    //result validation
-    String html = doBasicValidation();
-    
-    Assert.assertTrue("No english text", 
-        html.contains("Matching of further information failed"));
-    
+
+    doBasicValidation();
+
   }
-  
+
   @Test
-  public void validHtmlResponseWithOutLocale() throws TaskExecutionException, UnsupportedEncodingException {    
-       
+  public void validHtmlResponseWithOutLocale() throws TaskExecutionException, UnsupportedEncodingException {
+
     task.execute(pendingReq, executionContext);
-    
-    //result validation
-    String html = doBasicValidation();
-    
-    Assert.assertTrue("No english text", 
-        html.contains("Information on Logins with European eIDs"));
-    Assert.assertFalse("No english text", 
-        html.contains("Matching of further information failed"));
-    
+
+    doBasicValidation();
+
   }
-  
+
   @Test
-  public void validHtmlResponseWithDE() throws TaskExecutionException, UnsupportedEncodingException {    
+  public void validHtmlResponseWithDE() throws TaskExecutionException, UnsupportedEncodingException {
     LocaleContextHolder.setLocale(Locale.GERMAN);
     httpReq.addHeader("Accept-Language", "de");
-    
+
     task.execute(pendingReq, executionContext);
-    
-    //result validation
-    String html = doBasicValidation();
-    
-    Assert.assertTrue("No english text", 
-        html.contains("Information zur Anmeldung über Europäische eIDs"));
-    
+
+    doBasicValidation();
+
   }
-  
+
   @Test
-  public void validHtmlResponseWithEN() throws TaskExecutionException, UnsupportedEncodingException {    
+  public void validHtmlResponseWithEN() throws TaskExecutionException, UnsupportedEncodingException {
     LocaleContextHolder.setLocale(Locale.ENGLISH);
-    
+
     task.execute(pendingReq, executionContext);
-    
-    //result validation
-    String html = doBasicValidation();
-    
-    Assert.assertTrue("No english text", 
-        html.contains("Information on Logins with European eIDs"));
-    
+
+    doBasicValidation();
+
   }
-  
+
   @Test
-  public void validHtmlResponseWithFR() throws TaskExecutionException, UnsupportedEncodingException {    
+  public void validHtmlResponseWithFR() throws TaskExecutionException, UnsupportedEncodingException {
     LocaleContextHolder.setLocale(Locale.FRANCE);
     httpReq.addHeader("Accept-Language", "fr");
-    
+
     task.execute(pendingReq, executionContext);
-    
-    //result validation
-    String html = doBasicValidation();
-    
-    Assert.assertTrue("No english text", 
-        html.contains("Information on Logins with European eIDs"));
-    
+
+    doBasicValidation();
+
   }
-  
-  private String doBasicValidation() throws UnsupportedEncodingException {
+
+  private void doBasicValidation() throws UnsupportedEncodingException {
     Assert.assertEquals("Wrong http StatusCode", 200, httpResp.getStatus());
     Assert.assertEquals("Wrong http ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
-    
+
     String html = httpResp.getContentAsString();
     Assert.assertNotNull("html result is null", html);
-    Assert.assertFalse("html result is empty", html.isEmpty());    
-    
-    Assert.assertTrue("Missing IDA Login", 
+    Assert.assertFalse("html result is empty", html.isEmpty());
+
+    Assert.assertTrue("Missing IDA Login",
         html.contains(MessageFormat.format(TEST_PATTER_REQ_PARAM, SelectedLoginMethod.MOBILE_PHONE_SIGNATURE_LOGIN)));
-    Assert.assertTrue("Missing residence infos", 
+    Assert.assertTrue("Missing residence infos",
         html.contains(MessageFormat.format(TEST_PATTER_REQ_PARAM, SelectedLoginMethod.NO_OTHER_LOGIN)));
-        
-    Assert.assertTrue("No language selector with pendingRequestId", 
+
+    Assert.assertTrue("No language selector with pendingRequestId",
         html.contains("/otherLoginMethod?pendingid=" + pendingReq.getPendingRequestId()));
-    Assert.assertTrue("No country-selection form", 
-        html.contains("<form class=\"block\" method=\"post\" action=\"/otherLoginMethod\">"));
-        
-    return html;
-    
+    Assert.assertTrue("No country-selection form",
+        html.contains("<form method=\"post\" action=\"/otherLoginMethod\">"));
+
   }
 }