Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java

1 files changed, 76 insertions, 75 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java
index 8a33897d8..4769bba19 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java
@@ -20,81 +20,82 @@ import eu.stork.peps.auth.commons.STORKAuthnRequest;
 /**
  * Interface for attributes normalization.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com
  */
 public interface ITranslatorService {
-  
-  /**
-   * Translates the attributes from local format to STORK format.
-   * 
-   * @param personalList The Personal Attribute List.
-   * 
-   * @return The Personal Attribute List with normalised attributes.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList normaliseAttributeNamesToStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Translates the attributes values from local format to STORK format.
-   * 
-   * @param personalList The Personal Attribute List.
-   * 
-   * @return The PersonalAttributeList with normalised values.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList normaliseAttributeValuesToStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Translates the attributes from STORK format to local format.
-   * 
-   * @param personalList The Personal Attribute List.
-   * 
-   * @return The PersonalAttributeList with normalised attributes.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList normaliseAttributeNamesFromStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Derive Attribute Names To Stork format.
-   * 
-   * @param personalList The Personal Attribute List,
-   * 
-   * @return The PersonalAttributeList with derived attributes.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList deriveAttributeFromStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Derive Attribute Names from Stork format.
-   * 
-   * @param session The session object.
-   * @param modifiedList The Personal Attribute List.
-   * 
-   * @return The PersonalAttributeList with derived attributes.
-   * 
-   * @see IStorkSession
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList deriveAttributeToStork(IStorkSession session,
-    IPersonalAttributeList modifiedList);
-  
-  /**
-   * Validate the values of the attributes.
-   * 
-   * @param pal The attribute list
-   * 
-   * @return True, if all the attributes have values. False, otherwise.
-   * 
-   * @see STORKAuthnRequest
-   */
-  boolean checkAttributeValues(IPersonalAttributeList pa);
+
+	/**
+	 * Translates the attributes from local format to STORK format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The Personal Attribute List with normalised attributes.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList normaliseAttributeNamesToStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Translates the attributes values from local format to STORK format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The PersonalAttributeList with normalised values.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList normaliseAttributeValuesToStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Translates the attributes from STORK format to local format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The PersonalAttributeList with normalised attributes.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList normaliseAttributeNamesFromStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Derive Attribute Names To Stork format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List,
+	 * 
+	 * @return The PersonalAttributeList with derived attributes.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList deriveAttributeFromStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Derive Attribute Names from Stork format.
+	 * 
+	 * @param session
+	 *            The session object.
+	 * @param modifiedList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The PersonalAttributeList with derived attributes.
+	 * 
+	 * @see IStorkSession
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList deriveAttributeToStork(IStorkSession session, IPersonalAttributeList modifiedList);
+
+	/**
+	 * Validate the values of the attributes.
+	 * 
+	 * @param pal
+	 *            The attribute list
+	 * 
+	 * @return True, if all the attributes have values. False, otherwise.
+	 * 
+	 * @see STORKAuthnRequest
+	 */
+	boolean checkAttributeValues(IPersonalAttributeList pa);
 }