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, 26 insertions, 28 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
index 2d9039d4c..f34adfcb4 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
@@ -24,33 +24,31 @@ import eu.stork.peps.auth.engine.core.AuthenticationAttributes;
  * 
  * @author fjquevedo
  */
-public class AuthenticationAttributesBuilder extends
-	AbstractSAMLObjectBuilder<AuthenticationAttributes> {
-
-
-
-    /**
-     * Builds the object.
-     *
-     * @return the authentication attributes
-     */
-    public final AuthenticationAttributes buildObject() {
-	return buildObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
-    }
-
-    /**
-     * Builds the object.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * 
-     * @return the authentication attributes 
-     */
-    public final AuthenticationAttributes buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new AuthenticationAttributesImpl(namespaceURI, localName,
-		namespacePrefix);
-    }
+public class AuthenticationAttributesBuilder extends AbstractSAMLObjectBuilder<AuthenticationAttributes> {
+
+	/**
+	 * Builds the object.
+	 *
+	 * @return the authentication attributes
+	 */
+	public final AuthenticationAttributes buildObject() {
+		return buildObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
+	}
+
+	/**
+	 * Builds the object.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * 
+	 * @return the authentication attributes
+	 */
+	public final AuthenticationAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new AuthenticationAttributesImpl(namespaceURI, localName, namespacePrefix);
+	}
 
 }