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, 23 insertions, 22 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
index ba4a4fe3a..dadf86254 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
@@ -28,28 +28,29 @@ import eu.stork.peps.auth.engine.core.VIDPAuthenticationAttributes;
  * 
  * @author fjquevedo
  */
-public class VIDPAuthenticationAttributesUnmarshaller extends
-	AbstractSAMLObjectUnmarshaller {
+public class VIDPAuthenticationAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process child element.
-     * 
-     * @param parentObject the parent object
-     * @param childObject the child object
-     * 
-     * @throws UnmarshallingException the unmarshalling exception
-     *
-     */
-    protected final void processChildElement(final XMLObject parentObject,
-	    final XMLObject childObject) throws UnmarshallingException {
-	final VIDPAuthenticationAttributes vIDPAuthenticationAttr = (VIDPAuthenticationAttributes) parentObject;
+	/**
+	 * Process child element.
+	 * 
+	 * @param parentObject
+	 *            the parent object
+	 * @param childObject
+	 *            the child object
+	 * 
+	 * @throws UnmarshallingException
+	 *             the unmarshalling exception
+	 *
+	 */
+	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
+		final VIDPAuthenticationAttributes vIDPAuthenticationAttr = (VIDPAuthenticationAttributes) parentObject;
 
-	if (childObject instanceof CitizenCountryCode) {
-	    vIDPAuthenticationAttr.setCitizenCountryCode((CitizenCountryCode) childObject);
-	} else if (childObject instanceof SPInformation) {
-		vIDPAuthenticationAttr.setSPInformation((SPInformation) childObject);
-	} else {
-	    super.processChildElement(parentObject, childObject);
-	}	
-    }
+		if (childObject instanceof CitizenCountryCode) {
+			vIDPAuthenticationAttr.setCitizenCountryCode((CitizenCountryCode) childObject);
+		} else if (childObject instanceof SPInformation) {
+			vIDPAuthenticationAttr.setSPInformation((SPInformation) childObject);
+		} else {
+			super.processChildElement(parentObject, childObject);
+		}
+	}
 }