1 files changed, 7 insertions, 11 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleMobileSignatureData.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleMobileSignatureData.java
index 2a7beb3b..e7a5547a 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleMobileSignatureData.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleMobileSignatureData.java
@@ -24,12 +24,12 @@
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.dao;
 
 import lombok.Data;
+import org.apache.commons.lang3.builder.EqualsBuilder;
 
 @Data
 public class SimpleMobileSignatureData {
 
   private String citizenCountryCode;
-
   private String bpk;
   private String givenName;
   private String familyName;
@@ -37,19 +37,15 @@ public class SimpleMobileSignatureData {
 
   /**
    * Compares the received authentication data from the mobile phone signature with the eid data received via eIDAS.
+   *
    * @param simpleEidasData The extracted eIDAS data
    * @return Returns true, if the eIDAS data matches the mobile phone signature data and false otherwise.
    */
   public boolean equalsSimpleEidasData(SimpleEidasData simpleEidasData) {
-    if (!simpleEidasData.getGivenName().equals(givenName)) {
-      return false;
-    }
-    if (!simpleEidasData.getFamilyName().equals(familyName)) {
-      return false;
-    }
-    if (!simpleEidasData.getDateOfBirth().equals(dateOfBirth)) {
-      return false;
-    }
-    return true;
+    return new EqualsBuilder()
+        .append(simpleEidasData.getGivenName(), givenName)
+        .append(simpleEidasData.getFamilyName(), familyName)
+        .append(simpleEidasData.getDateOfBirth(), dateOfBirth)
+        .isEquals();
   }
 }