refactor(matching): move AddresssucheController into eIDAS module to reuse data-model for tasks

1 files changed, 36 insertions, 26 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/AdresssucheController.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
index b044e95e..8505f5d5 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/AdresssucheController.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
@@ -21,7 +21,27 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-package at.asitplus.eidas.specific.connector.controller;
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.controller;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.CompareToBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
@@ -30,6 +50,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenti
 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.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.utils.IPendingRequestIdGenerationStrategy;
@@ -39,24 +60,6 @@ import at.gv.egiz.eaaf.core.exceptions.PendingReqIdValidationException;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Default process-engine signaling controller.
@@ -67,6 +70,12 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AdresssucheController {
 
+  public static final String PARAM_POSTLEITZAHL = "postleitzahl";
+  public static final String PARAM_MUNIPICALITY = "municipality";
+  public static final String PARAM_VILLAGE = "village";
+  public static final String PARAM_STREET = "street";
+  public static final String PARAM_NUMBER = "number";
+    
   @Autowired
   private ISpringMvcGuiFormBuilder guiBuilder;
 
@@ -142,18 +151,19 @@ public class AdresssucheController {
    * Performs search for addresses in ZMR.
    */
   @RequestMapping(value = {"/residency/search"}, method = {RequestMethod.POST})
-  public ResponseEntity<AdresssucheResult> search(@RequestParam("postleitzahl") String postleitzahl,
-                                                  @RequestParam("municipality") String municipality,
-                                                  @RequestParam("village") String village,
-                                                  @RequestParam("street") String street,
-                                                  @RequestParam("number") String number,
-                                                  @RequestParam("pendingid") String pendingId) {
+  public ResponseEntity<AdresssucheResult> search(
+      @RequestParam(PARAM_POSTLEITZAHL) String postleitzahl,
+      @RequestParam(PARAM_MUNIPICALITY) String municipality,
+      @RequestParam(PARAM_VILLAGE) String village,
+      @RequestParam(PARAM_STREET) String street,
+      @RequestParam(PARAM_NUMBER) String number,
+      @RequestParam(EaafConstants.PARAM_HTTP_TARGET_PENDINGREQUESTID) String pendingId) {
     log.info("Search with '{}', '{}', '{}', '{}', '{}'",
         postleitzahl.replaceAll("[\r\n]", ""),
         municipality.replaceAll("[\r\n]", ""),
         village.replaceAll("[\r\n]", ""),
         street.replaceAll("[\r\n]", ""),
-        number.replaceAll("[\r\n]", ""));
+        number.replaceAll("[\r\n]", ""));    
     try {
       pendingReqGeneration.validateAndGetPendingRequestId(pendingId);
     } catch (PendingReqIdValidationException e) {