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, 37 insertions, 38 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
index 6ee9e0e1b..c4c1ec845 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
@@ -26,47 +26,46 @@ import org.opensaml.common.SAMLObject;
  */
 public interface VIDPAuthenticationAttributes extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "VIDPAuthenticationAttributes";
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "VIDPAuthenticationAttributes";
 
-    /** Default element name. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** Default element name. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
-    /** Local name of the XSI type. */
-    String TYPE_LOCAL_NAME = "VIDPAuthenticationAttributesType";
+	/** Local name of the XSI type. */
+	String TYPE_LOCAL_NAME = "VIDPAuthenticationAttributesType";
 
-    /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** QName of the XSI type. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
+	/**
+	 * Gets the citizen country code.
+	 * 
+	 * @return the citizen country code
+	 */
+	CitizenCountryCode getCitizenCountryCode();
+
+	/**
+	 * Sets the citizen country code.
+	 * 
+	 * @param newCitizenCountryCode
+	 *            the new citizen country code
+	 */
+	void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode);
+
+	/**
+	 * Gets the SP information
+	 * 
+	 * @return the SP information
+	 */
+	SPInformation getSPInformation();
+
+	/**
+	 * Sets the SP information
+	 * 
+	 * @param newSPInformation
+	 *            the new SPInformation
+	 */
+	void setSPInformation(SPInformation newSPInformation);
 
-    /**
-     * Gets the citizen country code.
-     * 
-     * @return the citizen country code
-     */
-    CitizenCountryCode getCitizenCountryCode();
-    
-    /**
-     * Sets the citizen country code.
-     * 
-     * @param newCitizenCountryCode the new citizen country code
-     */
-    void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode);
-    
-    /**
-     * Gets the SP information
-     * 
-     * @return the SP information
-     */
-    SPInformation getSPInformation();
-    
-    /**
-     * Sets the SP information
-     * 
-     * @param newSPInformation the new SPInformation
-     */
-    void setSPInformation(SPInformation newSPInformation);
-     
 }