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, 68 insertions, 72 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
index e0de20f7d..9f602aba1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
@@ -32,78 +32,74 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public final class AuthenticationAttributesImpl extends AbstractSignableSAMLObject implements
-AuthenticationAttributes {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationAttributesImpl.class.getName());
-
-    /** The indexed children. */
-    private VIDPAuthenticationAttributes vIDPAuthenAttr;
-
-    /**
-     * Instantiates a new authentication attributes implementation.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected AuthenticationAttributesImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {	
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-
-    /**
-     * Gets the ordered children.
-     * 
-     * @return the ordered children
-     * 
-     */
-    public List<XMLObject> getOrderedChildren() {
-	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-
-	children.add(vIDPAuthenAttr);
-
-	if (getSignature() != null) {
-	    children.add(getSignature());
+public final class AuthenticationAttributesImpl extends AbstractSignableSAMLObject implements AuthenticationAttributes {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationAttributesImpl.class.getName());
+
+	/** The indexed children. */
+	private VIDPAuthenticationAttributes vIDPAuthenAttr;
+
+	/**
+	 * Instantiates a new authentication attributes implementation.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected AuthenticationAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
+
+	/**
+	 * Gets the ordered children.
+	 * 
+	 * @return the ordered children
+	 * 
+	 */
+	public List<XMLObject> getOrderedChildren() {
+		final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+
+		children.add(vIDPAuthenAttr);
+
+		if (getSignature() != null) {
+			children.add(getSignature());
+		}
+
+		return Collections.unmodifiableList(children);
+	}
+
+	/**
+	 * Gets the signature reference id.
+	 * 
+	 * @return the signature reference id
+	 * 
+	 */
+	public String getSignatureReferenceID() {
+		return null;
+	}
+
+	/**
+	 * Gets the vidp authentication attributes.
+	 * 
+	 * @return the VIDP authentication attributes
+	 *
+	 */
+	public VIDPAuthenticationAttributes getVIDPAuthenticationAttributes() {
+		return vIDPAuthenAttr;
+	}
+
+	/**
+	 * Sets the vidp authentication attributes.
+	 * 
+	 * @param newVIDPAuthenAttr
+	 *            the new vidp authen attr
+	 *
+	 */
+	public void setVIDPAuthenticationAttributes(final VIDPAuthenticationAttributes newVIDPAuthenAttr) {
+		vIDPAuthenAttr = prepareForAssignment(this.vIDPAuthenAttr, newVIDPAuthenAttr);
 	}
 
-	return Collections.unmodifiableList(children);
-    }
-
-    /**
-     * Gets the signature reference id.
-     * 
-     * @return the signature reference id
-     * 
-     */
-    public String getSignatureReferenceID() {	
-	return null;
-    }
-
-    /**
-     * Gets the vidp authentication attributes.
-     * 
-     * @return the VIDP authentication attributes
-     *
-     */
-    public VIDPAuthenticationAttributes getVIDPAuthenticationAttributes() {	
-	return vIDPAuthenAttr;
-    }
-
-    /**
-     * Sets the vidp authentication attributes.
-     * 
-     * @param newVIDPAuthenAttr the new vidp authen attr
-     *
-     */
-    public void setVIDPAuthenticationAttributes(
-	    final VIDPAuthenticationAttributes newVIDPAuthenAttr) {	
-	vIDPAuthenAttr = prepareForAssignment(this.vIDPAuthenAttr, newVIDPAuthenAttr);
-    }
-
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }