1 files changed, 36 insertions, 21 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java
index a3062d0d..6a41893b 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java
@@ -30,14 +30,14 @@ public class RegisterSearchService {
    *
    * @param initialSearchResult Result of initial register search
    * @param specificDetailSearchResult Result of last register search
-   * @param eidData Received eidas data
+   * @param eidasData Received eidas data
    * @param pendingReq Pending request
    * @return The bpk
    * @throws TaskExecutionException if an error occurs during the register update
    */
   public String step7aKittProcess(MergedRegisterSearchResult initialSearchResult,
                                   MergedRegisterSearchResult specificDetailSearchResult,
-                                  SimpleEidasData eidData, IRequest pendingReq) throws TaskExecutionException {
+                                  SimpleEidasData eidasData, IRequest pendingReq) throws TaskExecutionException {
     try {
       if (initialSearchResult.getResultCount() != 0) {
         throw new WorkflowException("initialSearchResult.getResultCount() != 0");
@@ -46,10 +46,10 @@ public class RegisterSearchService {
         throw new WorkflowException("countrySpecificDetailSearchResult.getResultCount() != 1");
       }
       if (specificDetailSearchResult.getResultsZmr().size() == 1) {
-        zmrClient.update(specificDetailSearchResult.getResultsZmr().get(0), eidData);
+        zmrClient.update(specificDetailSearchResult.getResultsZmr().get(0), eidasData);
       }
       if (specificDetailSearchResult.getResultsErnp().size() == 1) {
-        ernpClient.update(specificDetailSearchResult.getResultsErnp().get(0), eidData);
+        ernpClient.update(specificDetailSearchResult.getResultsErnp().get(0), eidasData);
       }
       return specificDetailSearchResult.getBpk();
     } catch (WorkflowException e) {
@@ -57,39 +57,54 @@ public class RegisterSearchService {
     }
   }
 
-  public MergedRegisterSearchResult searchWithMds(SimpleEidasData eidData) {
+  /**
+   * Search with MDS (Given Name, Family Name, Date of Birth) in ZMR and ERnP.
+   */
+  public MergedRegisterSearchResult searchWithMds(SimpleEidasData eidasData) {
     List<RegisterResult> resultsZmr =
-        zmrClient.searchWithMds(eidData.getGivenName(), eidData.getFamilyName(), eidData.getDateOfBirth());
+        zmrClient.searchWithMds(eidasData.getGivenName(), eidasData.getFamilyName(), eidasData.getDateOfBirth());
     List<RegisterResult> resultsErnp =
-        ernpClient.searchWithMds(eidData.getGivenName(), eidData.getFamilyName(), eidData.getDateOfBirth());
+        ernpClient.searchWithMds(eidasData.getGivenName(), eidasData.getFamilyName(), eidasData.getDateOfBirth());
     return new MergedRegisterSearchResult(resultsZmr, resultsErnp);
   }
 
-  public MergedRegisterSearchResult searchWithPersonIdentifier(SimpleEidasData eidData) {
-    List<RegisterResult> resultsZmr = zmrClient.searchWithPersonIdentifier(eidData.getPseudonym());
-    List<RegisterResult> resultsErnp = ernpClient.searchWithPersonIdentifier(eidData.getPseudonym());
+  /**
+   * Search with Person Identifier (eIDAS Pseudonym) in ZMR and ERnP.
+   */
+  public MergedRegisterSearchResult searchWithPersonIdentifier(SimpleEidasData eidasData) {
+    List<RegisterResult> resultsZmr = zmrClient.searchWithPersonIdentifier(eidasData.getPseudonym());
+    List<RegisterResult> resultsErnp = ernpClient.searchWithPersonIdentifier(eidasData.getPseudonym());
     return new MergedRegisterSearchResult(resultsZmr, resultsErnp);
   }
 
-  public MergedRegisterSearchResult searchItSpecific(SimpleEidasData eidData) {
-    List<RegisterResult> resultsZmr = zmrClient.searchItSpecific(eidData.getTaxNumber());
-    List<RegisterResult> resultsErnb = ernpClient.searchItSpecific(eidData.getTaxNumber());
+  /**
+   * Search with Tax Number in ZMR and ERnP.
+   */
+  public MergedRegisterSearchResult searchItSpecific(SimpleEidasData eidasData) {
+    List<RegisterResult> resultsZmr = zmrClient.searchItSpecific(eidasData.getTaxNumber());
+    List<RegisterResult> resultsErnb = ernpClient.searchItSpecific(eidasData.getTaxNumber());
     return new MergedRegisterSearchResult(resultsZmr, resultsErnb);
   }
 
-  public MergedRegisterSearchResult searchDeSpecific(SimpleEidasData eidData) {
+  /**
+   * Search with Given Name, Family Name, Date of Birth, Place of Birth and Birth Name in ZMR and ERnP.
+   */
+  public MergedRegisterSearchResult searchDeSpecific(SimpleEidasData eidasData) {
     List<RegisterResult> resultsZmr =
-        zmrClient.searchDeSpecific(eidData.getGivenName(), eidData.getFamilyName(), eidData.getDateOfBirth(),
-            eidData.getPlaceOfBirth(), eidData.getBirthName());
+        zmrClient.searchDeSpecific(eidasData.getGivenName(), eidasData.getFamilyName(), eidasData.getDateOfBirth(),
+            eidasData.getPlaceOfBirth(), eidasData.getBirthName());
     List<RegisterResult> resultsErnb =
-        ernpClient.searchDeSpecific(eidData.getGivenName(), eidData.getFamilyName(), eidData.getDateOfBirth(),
-            eidData.getPlaceOfBirth(), eidData.getBirthName());
+        ernpClient.searchDeSpecific(eidasData.getGivenName(), eidasData.getFamilyName(), eidasData.getDateOfBirth(),
+            eidasData.getPlaceOfBirth(), eidasData.getBirthName());
     return new MergedRegisterSearchResult(resultsZmr, resultsErnb);
   }
 
-  public MergedRegisterSearchResult searchWithBpkZp(String bpkzp) {
-    List<RegisterResult> resultsZmr = zmrClient.searchWithBpkZp(bpkzp);
-    List<RegisterResult> resultsErnp = ernpClient.searchWithBpkZp(bpkzp);
+  /**
+   * Search with BPK-ZP in BMR and ERnP.
+   */
+  public MergedRegisterSearchResult searchWithBpkZp(String bpkZp) {
+    List<RegisterResult> resultsZmr = zmrClient.searchWithBpkZp(bpkZp);
+    List<RegisterResult> resultsErnp = ernpClient.searchWithBpkZp(bpkZp);
     return new MergedRegisterSearchResult(resultsZmr, resultsErnp);
   }
 }