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

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
index fb01fd5aa..f43c1bd78 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
@@ -22,35 +22,38 @@ package eu.stork.peps.exceptions;
  */
 public class STORKSAMLEngineRuntimeException extends RuntimeException {
 
-    /** The Constant serialVersionUID. */
-    private static final long serialVersionUID = 5829810358581493517L;
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 5829810358581493517L;
 
-    /**
-     * Instantiates a new sTORKSAML engine runtime exception.
-     * 
-     * @param wrappedException the wrapped exception
-     */
-    public STORKSAMLEngineRuntimeException(final Exception wrappedException) {
-	super(wrappedException);
-    }
+	/**
+	 * Instantiates a new sTORKSAML engine runtime exception.
+	 * 
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public STORKSAMLEngineRuntimeException(final Exception wrappedException) {
+		super(wrappedException);
+	}
 
-    /**
-     * Creates a new instance of application exception.
-     * 
-     * @param cause the exception cause.
-     */
-    public STORKSAMLEngineRuntimeException(final String cause) {
-	super(cause);
-    }
+	/**
+	 * Creates a new instance of application exception.
+	 * 
+	 * @param cause
+	 *            the exception cause.
+	 */
+	public STORKSAMLEngineRuntimeException(final String cause) {
+		super(cause);
+	}
 
-    /**
-     * Instantiates a new sTORKSAML engine runtime exception.
-     * 
-     * @param message the message
-     * @param wrappedException the wrapped exception
-     */
-    public STORKSAMLEngineRuntimeException(final String message,
-	    final Exception wrappedException) {
-	super(message, wrappedException);
-    }
+	/**
+	 * Instantiates a new sTORKSAML engine runtime exception.
+	 * 
+	 * @param message
+	 *            the message
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public STORKSAMLEngineRuntimeException(final String message, final Exception wrappedException) {
+		super(message, wrappedException);
+	}
 }
\ No newline at end of file