1 files changed, 12 insertions, 18 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/ItSpecificDetailSearchProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/ItSpecificDetailSearchProcessor.java
index 7e74a85c..b49c355d 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/ItSpecificDetailSearchProcessor.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/ItSpecificDetailSearchProcessor.java
@@ -23,37 +23,31 @@
 
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.handler;
 
+import org.apache.commons.lang3.StringUtils;
+
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MergedRegisterSearchResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.RegisterSearchService;
+import at.gv.bmi.namespace.zmr_su.zmr._20040201.PersonSuchenRequest;
 
 public class ItSpecificDetailSearchProcessor implements CountrySpecificDetailSearchProcessor {
 
-  private final RegisterSearchService registerSearchService;
-
-  public ItSpecificDetailSearchProcessor(RegisterSearchService registerSearchService) {
-    this.registerSearchService = registerSearchService;
-  }
-
   @Override
   public String getName() {
-    return this.getClass().getName();
+    return this.getClass().getSimpleName();
   }
 
   @Override
   public boolean canHandle(String countryCode, SimpleEidasData eidData) {
-    if (!countryCode.equalsIgnoreCase(Constants.COUNTRY_CODE_IT)) {
-      return false;
-    }
-    if (eidData.getTaxNumber() == null || eidData.getTaxNumber().isEmpty()) {
-      return false;
-    }
-    return true;
+    return countryCode.equalsIgnoreCase(Constants.COUNTRY_CODE_IT) 
+        &&  StringUtils.isNotEmpty(eidData.getTaxNumber());
+
   }
 
   @Override
-  public MergedRegisterSearchResult search(SimpleEidasData eidData) {
-    return registerSearchService.searchItSpecific(eidData);
+  public PersonSuchenRequest generateSearchRequest(SimpleEidasData eidData) {
+
+    //TODO: add IT specific search request if TaxNumber attribute is defined by IT        
+    return new PersonSuchenRequest();
+    
   }
 }