1 files changed, 39 insertions, 41 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
index 1ca4cdb6..ef8822aa 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
@@ -19,36 +19,33 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
-*/
+ */
 
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.utils;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
 import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType;
 import at.gv.egiz.eaaf.core.impl.data.Triple;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import eu.eidas.auth.commons.attribute.AttributeDefinition;
 import eu.eidas.auth.commons.attribute.AttributeValue;
 import eu.eidas.auth.commons.attribute.AttributeValueMarshaller;
 import eu.eidas.auth.commons.attribute.AttributeValueMarshallingException;
 import eu.eidas.auth.commons.attribute.AttributeValueTransliterator;
 import eu.eidas.auth.commons.protocol.eidas.impl.PostalAddress;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class EidasResponseUtils {
   private static final Logger log = LoggerFactory.getLogger(EidasResponseUtils.class);
@@ -61,7 +58,7 @@ public class EidasResponseUtils {
    *
    * @param uniqueID eIDAS attribute value of a unique identifier
    * @return true if the uniqueID matches to eIDAS to Unique Identifier
-   *         specification, otherwise false
+   * specification, otherwise false
    */
   public static boolean validateEidasPersonalIdentifier(String uniqueID) {
     final Pattern pattern = Pattern.compile(PERSONALIDENIFIER_VALIDATION_PATTERN);
@@ -77,10 +74,10 @@ public class EidasResponseUtils {
    *
    * @param uniqueID eIDAS attribute value of a unique identifier
    * @return {@link Triple} that contains: <br>
-   *         First : citizen country <br>
-   *         Second: destination country <br>
-   *         Third : unique identifier <br>
-   *         or null if the attribute value has a wrong format
+   * First : citizen country <br>
+   * Second: destination country <br>
+   * Third : unique identifier <br>
+   * or null if the attribute value has a wrong format
    */
   public static Triple<String, String, String> parseEidasPersonalIdentifier(String uniqueID) {
     if (!validateEidasPersonalIdentifier(uniqueID)) {
@@ -99,7 +96,7 @@ public class EidasResponseUtils {
    * @param attributeDefinition eIDAS attribute definition
    * @param attributeValues     Attributes from eIDAS response
    * @return Set of attribute values. If more then one value than the first value
-   *         contains the 'Latin' value.
+   * contains the 'Latin' value.
    */
   // TODO: check possible problem with nonLatinCharacters
   public static List<String> translateStringListAttribute(AttributeDefinition<?> attributeDefinition,
@@ -107,58 +104,59 @@ public class EidasResponseUtils {
     final List<String> stringListAttribute = new ArrayList<>();
     if (attributeValues == null) {
       log.info("Can not extract infos from 'null' attribute value");
-      
-    } else {    
-      final AttributeValueMarshaller<?> attributeValueMarshaller = 
+
+    } else {
+      final AttributeValueMarshaller<?> attributeValueMarshaller =
           attributeDefinition.getAttributeValueMarshaller();
       for (final AttributeValue<?> attributeValue : attributeValues) {
         String valueString = null;
         try {
           valueString = attributeValueMarshaller.marshal((AttributeValue) attributeValue);
-  
+
           log.trace("Find attr: {} with value: {} nonLatinFlag: {} needTransliteration: {}",
               attributeDefinition.getFriendlyName(), attributeValue.toString(),
               attributeValue.isNonLatinScriptAlternateVersion(),
               AttributeValueTransliterator.needsTransliteration(valueString));
-  
+
           // if (attributeValue.isNonLatinScriptAlternateVersion()) {
           if (!AttributeValueTransliterator.needsTransliteration(valueString)) {
             stringListAttribute.add(0, valueString);
-  
+
           } else {
             log.trace("Find 'needsTransliteration' flag. Setting this value at last list element ... ");
             stringListAttribute.add(valueString);
-  
+
             log.trace("Find attr: {} with value: {} nonLatinFlag: {} needTransliteration: {}",
                 attributeDefinition.getFriendlyName(), attributeValue.toString(),
                 attributeValue.isNonLatinScriptAlternateVersion(),
                 AttributeValueTransliterator.needsTransliteration(valueString));
-  
+
             // if (attributeValue.isNonLatinScriptAlternateVersion()) {
             if (!AttributeValueTransliterator.needsTransliteration(valueString)) {
               stringListAttribute.add(0, valueString);
-  
+
             } else {
               log.trace("Find 'needsTransliteration' flag. Setting this value at last list element ... ");
               stringListAttribute.add(valueString);
-  
+
             }
           }
         } catch (final AttributeValueMarshallingException e) {
           throw new IllegalStateException(e);
-  
+
         }
-        
-      }  
+
+      }
       log.trace("Extract values: {} for attr: {}",
           StringUtils.join(stringListAttribute, ","), attributeDefinition.getFriendlyName());
-      
+
     }
-    
+
     return stringListAttribute;
 
   }
 
+
   /**
    * Convert eIDAS DateTime attribute to Java Object.
    *
@@ -168,7 +166,7 @@ public class EidasResponseUtils {
    */
   @Nullable
   public static DateTime translateDateAttribute(AttributeDefinition<?> attributeDefinition,
-      ImmutableList<? extends AttributeValue<?>> attributeValues) {
+                                                ImmutableList<? extends AttributeValue<?>> attributeValues) {
     if (attributeValues.size() != 0) {
       final AttributeValue<?> firstAttributeValue = attributeValues.get(0);
       return (DateTime) firstAttributeValue.getValue();
@@ -187,7 +185,7 @@ public class EidasResponseUtils {
    */
   @Nullable
   public static PostalAddress translateAddressAttribute(AttributeDefinition<?> attributeDefinition,
-      ImmutableList<? extends AttributeValue<?>> attributeValues) {
+                                                        ImmutableList<? extends AttributeValue<?>> attributeValues) {
     final AttributeValue<?> firstAttributeValue = attributeValues.get(0);
     return (PostalAddress) firstAttributeValue.getValue();
   }
@@ -350,4 +348,4 @@ public class EidasResponseUtils {
     }
     return (String) taxReferenceObj;
   }
-}
+}
\ No newline at end of file