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, 35 insertions, 24 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
index 4fce4df3f..a4015eed1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
@@ -7,13 +7,15 @@ import org.opensaml.xml.validation.Validator;
 import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
 
 public class CustomAttributeQueryValidator implements Validator<CustomAttributeQuery> {
-	
+
 	/**
 	 * Validate action.
 	 * 
-	 * @param attrQuery the attribute query to validate
+	 * @param attrQuery
+	 *            the attribute query to validate
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	public final void validate(final CustomAttributeQuery attrQuery) throws ValidationException {
 		validateAssertion(attrQuery);
@@ -21,45 +23,54 @@ public class CustomAttributeQueryValidator implements Validator<CustomAttributeQ
 		validateDestination(attrQuery);
 	}
 
-
 	/**
 	 * Validate assertion.
 	 * 
-	 * @param attrQuery the attribute query
+	 * @param attrQuery
+	 *            the attribute query
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
-	protected final void validateAssertion(final CustomAttributeQuery attrQuery)
-	throws ValidationException {
+	protected final void validateAssertion(final CustomAttributeQuery attrQuery) throws ValidationException {
 		if (DatatypeHelper.isEmpty(attrQuery.getAssertionConsumerServiceURL())) {
 			throw new ValidationException("Consumer Service URL must be specified.");
 		}
 	}
-	
+
 	/**
 	 * Validate subject
-	 * @param query the attribute query to validate
-	 * @throws ValidationException the validation exception
-	 */ 
+	 * 
+	 * @param query
+	 *            the attribute query to validate
+	 * @throws ValidationException
+	 *             the validation exception
+	 */
 	protected void validateSubject(CustomAttributeQuery query) throws ValidationException {
-        if (query.getSubject() == null)
-            throw new ValidationException("Subject is required");
-    }
-	
+		if (query.getSubject() == null)
+			throw new ValidationException("Subject is required");
+	}
+
 	/**
 	 * Validate the destination
-	 * @param query the query to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param query
+	 *            the query to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	protected void validateDestination(CustomAttributeQuery query) throws ValidationException {
-        if (query.getDestination() == null)
-            throw new ValidationException("Destination is required");
-    }
-	
+		if (query.getDestination() == null)
+			throw new ValidationException("Destination is required");
+	}
+
 	/**
 	 * Validate the destination
-	 * @param query the query to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param query
+	 *            the query to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	protected void validateTime(CustomAttributeQuery query) throws ValidationException {
         if (query.getIssueInstant().minusMinutes(5).isAfterNow())