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, 62 insertions, 63 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java
index f38b41838..33105c58f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java
@@ -16,70 +16,69 @@ package eu.stork.peps.auth.commons;
 /**
  * Interface for stork session.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $
  */
 public interface IStorkSession {
-  
-  /**
-   * Returns the object associated the the given key.
-   * 
-   * @param key with which the specified value is to be associated.
-   * 
-   * @return The object associated the the given key.
-   */
-  Object get(Object key);
-  
-  /**
-   * Associates a key to a value, and inserts them in the session object.
-   * 
-   * @param key with which the specified value is to be associated.
-   * @param value to be associated with the specified key.
-   * 
-   * @return previous value associated with specified key, or null if there was
-   *         no mapping for key. A null return can also indicate that the map
-   *         previously associated null with the specified key.
-   */
-  Object put(String key, Object value);
-  
-  /**
-   * Removes the mapping for this key.
-   * 
-   * @param key with which the specified value is to be associated.
-   * 
-   * @return previous value associated with specified key, or null if there was
-   *         no mapping for key. A null return can also indicate that the map
-   *         previously associated null with the specified key.
-   */
-  Object remove(Object key);
-  
-  /**
-   * Returns the number of key-value mappings in this map.
-   * 
-   * @return the number of key-value mappings in this map.
-   */
-  int size();
-  
-  /**
-   * Returns true if this map contains a mapping for the specified key.
-   * 
-   * @param key with which the specified value is to be associated.
-   * 
-   * @return true if this map contains a mapping for the specified key.
-   */
-  boolean containsKey(Object key);
-  
-  /**
-   * Removes all mappings from this map.
-   */
-  void clear();
-  
-  /**
-   * Returns true if this map contains no key-value mappings.
-   * 
-   * @return true if this map contains no key-value mappings.
-   */
-  boolean isEmpty();
+
+	/**
+	 * Returns the object associated the the given key.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * 
+	 * @return The object associated the the given key.
+	 */
+	Object get(Object key);
+
+	/**
+	 * Associates a key to a value, and inserts them in the session object.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * @param value
+	 *            to be associated with the specified key.
+	 * 
+	 * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key.
+	 */
+	Object put(String key, Object value);
+
+	/**
+	 * Removes the mapping for this key.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * 
+	 * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key.
+	 */
+	Object remove(Object key);
+
+	/**
+	 * Returns the number of key-value mappings in this map.
+	 * 
+	 * @return the number of key-value mappings in this map.
+	 */
+	int size();
+
+	/**
+	 * Returns true if this map contains a mapping for the specified key.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * 
+	 * @return true if this map contains a mapping for the specified key.
+	 */
+	boolean containsKey(Object key);
+
+	/**
+	 * Removes all mappings from this map.
+	 */
+	void clear();
+
+	/**
+	 * Returns true if this map contains no key-value mappings.
+	 * 
+	 * @return true if this map contains no key-value mappings.
+	 */
+	boolean isEmpty();
 }