1 files changed, 11 insertions, 0 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
index 8505f5d5..6dcd4879 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
@@ -58,6 +58,7 @@ import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
 import at.gv.egiz.eaaf.core.exceptions.PendingReqIdValidationException;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -166,18 +167,23 @@ public class AdresssucheController {
         number.replaceAll("[\r\n]", ""));    
     try {
       pendingReqGeneration.validateAndGetPendingRequestId(pendingId);
+      
     } catch (PendingReqIdValidationException e) {
       log.warn("Search with pendingId '{}' is not valid", pendingId.replaceAll("[\r\n]", ""));
       return ResponseEntity.badRequest().build();
+      
     }
+    
     try {
       Adressdaten searchInput = buildSearchInput(postleitzahl, municipality, village, street, number);
       ZmrAddressSoapClient.AddressInfo searchOutput = client.searchAddress(searchInput);
       AdresssucheResult output = buildResponse(searchOutput);
       return ResponseEntity.ok(output);
+      
     } catch (EidasSAuthenticationException e) {
       log.warn("Search failed", e);
       return ResponseEntity.badRequest().build();
+      
     }
   }
 
@@ -185,7 +191,9 @@ public class AdresssucheController {
     if (searchOutput.getPersonResult().isEmpty()) {
       log.warn("No result from ZMR");
       return new AdresssucheResult(Collections.emptyList(), 0);
+      
     }
+    
     log.info("Result level is {}", searchOutput.getLevel());
     Set<AdresssucheOutput> result = searchOutput.getPersonResult().stream()
         .map(Adressdaten::getPostAdresse)
@@ -195,6 +203,7 @@ public class AdresssucheController {
     // TODO Add configuration option for the limit of 30
     List<AdresssucheOutput> sorted = result.stream().sorted().limit(30).collect(Collectors.toList());
     return new AdresssucheResult(sorted, result.size());
+    
   }
 
   private Adressdaten buildSearchInput(String postleitzahl,
@@ -225,6 +234,7 @@ public class AdresssucheController {
     Adressdaten searchInput = new Adressdaten();
     searchInput.setPostAdresse(postAdresse);
     return searchInput;
+    
   }
 
   @Data
@@ -236,6 +246,7 @@ public class AdresssucheController {
 
   @Data
   @AllArgsConstructor
+  @Builder
   public static class AdresssucheOutput implements Comparable<AdresssucheOutput> {
     private final String postleitzahl;
     private final String municipality;