common EGIZ code-style refactoring

3 files changed, 674 insertions, 655 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java
index e096b8e6..7c143ca2 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java
@@ -1,24 +1,20 @@
 /*******************************************************************************
- * Copyright 2017 Graz University of Technology
- * EAAF-Core Components has been developed in a cooperation between EGIZ,  
- * A-SIT Plus, A-SIT, and Graz University of Technology.
+ * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
+ * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
  *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at:
  * https://joinup.ec.europa.eu/news/understanding-eupl-v12
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *  
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
  *******************************************************************************/
 /*******************************************************************************
  *******************************************************************************/
@@ -29,226 +25,276 @@ package at.gv.egiz.eaaf.core.impl.idp.auth.data;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
+import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.idp.EaafAuthProcessDataConstants;
+import at.gv.egiz.eaaf.core.api.idp.auth.data.IAuthProcessDataContainer;
+import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
+import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
-import at.gv.egiz.eaaf.core.api.idp.EAAFAuthProcessDataConstants;
-import at.gv.egiz.eaaf.core.api.idp.auth.data.IAuthProcessDataContainer;
-import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
-
-public class AuthProcessDataWrapper implements IAuthProcessDataContainer, EAAFAuthProcessDataConstants {
-	private static final Logger log = LoggerFactory.getLogger(AuthProcessDataWrapper.class);
-	
-	protected Map<String, Object> authProcessData;
-	
-	public AuthProcessDataWrapper(Map<String, Object> authProcessData) {
-		this.authProcessData = authProcessData;
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getIssueInstant()
-	 */
-	@Override
-	public String getIssueInstant() {
-		return wrapStringObject(VALUE_ISSUEINSTANT, null, String.class);
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setIssueInstant(java.lang.String)
-	 */
-	@Override
-	public void setIssueInstant(String issueInstant) {
-		authProcessData.put(VALUE_ISSUEINSTANT, issueInstant);
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isAuthenticated()
-	 */
-	@Override
-	public boolean isAuthenticated() {
-		return wrapStringObject(FLAG_IS_AUTHENTICATED, false, Boolean.class);
-
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setAuthenticated(boolean)
-	 */
-	@Override
-	public void setAuthenticated(boolean authenticated) {
-		authProcessData.put(FLAG_IS_AUTHENTICATED, authenticated);
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getIdentityLink()
-	 */
-	@Override
-	public IIdentityLink getIdentityLink() {
-		return wrapStringObject(VALUE_IDENTITYLINK, null, IIdentityLink.class);
-		
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setIdentityLink(at.gv.egovernment.moa.id.auth.data.IdentityLink)
-	 */
-	@Override
-	public void setIdentityLink(IIdentityLink identityLink) {
-		authProcessData.put(VALUE_IDENTITYLINK, identityLink);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isMandateUsed()
-	 */
-	@Override
-	public boolean isMandateUsed() {
-		return wrapStringObject(FLAG_USE_MANDATE, false, Boolean.class);
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setUseMandates(boolean)
-	 */
-	@Override
-	public void setUseMandates(boolean useMandates) {
-		authProcessData.put(FLAG_USE_MANDATE, useMandates);
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getQAALevel()
-	 */
-	@Override
-	public String getQAALevel() {
-		return wrapStringObject(VALUE_QAALEVEL, null, String.class);
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setQAALevel(java.lang.String)
-	 */
-	@Override
-	public void setQAALevel(String qAALevel) {
-		authProcessData.put(VALUE_QAALEVEL, qAALevel);
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isForeigner()
-	 */
-	@Override
-	public boolean isForeigner() {
-		return wrapStringObject(FLAG_IS_FOREIGNER, false, Boolean.class);
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setForeigner(boolean)
-	 */
-	@Override
-	public void setForeigner(boolean isForeigner) {
-		authProcessData.put(FLAG_IS_FOREIGNER, isForeigner);
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isOW()
-	 */
-	@Override
-	public boolean isOW() {
-		return wrapStringObject(FLAG_IS_ORGANWALTER, false, Boolean.class);
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setOW(boolean)
-	 */
-	@Override
-	public void setOW(boolean isOW) {
-		authProcessData.put(FLAG_IS_ORGANWALTER, isOW);
-
-	}
-	
-	@Override
-	public boolean isEIDProcess() {
-		return wrapStringObject(FLAG_IS_NEW_EID_PROCESS, false, Boolean.class);
-	}
-
-	@Override
-	public void setEIDProcess(boolean value) {
-		authProcessData.put(FLAG_IS_NEW_EID_PROCESS, value);
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getSessionCreated()
-	 */
-	@Override
-	public Date getSessionCreated() {
-		return wrapStringObject(EAAFConstants.AUTH_DATA_CREATED, null, Date.class);
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getGenericSessionDataStorage()
-	 */
-	@Override
-	public Map<String, Object> getGenericSessionDataStorage() {
-		final Map<String, Object> result = new HashMap<String, Object>();		
-		for (final String el : authProcessData.keySet()) {
-			if (el.startsWith(GENERIC_PREFIX))
-				result.put(el.substring(GENERIC_PREFIX.length()), authProcessData.get(el));
-			
-		}
-		
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getGenericDataFromSession(java.lang.String)
-	 */
-	@Override
-	public Object getGenericDataFromSession(String key) {
-		return authProcessData.get(GENERIC_PREFIX + key); 
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getGenericDataFromSession(java.lang.String, java.lang.Class)
-	 */
-	@Override
-	public <T> T getGenericDataFromSession(String key, Class<T> clazz) {
-		return wrapStringObject(GENERIC_PREFIX + key, null, clazz);
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setGenericDataToSession(java.lang.String, java.lang.Object)
-	 */
-	@Override
-	public void setGenericDataToSession(String key, Object object) throws EAAFStorageException {
-		authProcessData.put(GENERIC_PREFIX + key, object);
-
-	}
-	
-	protected <T> T wrapStringObject(String key, Object defaultValue, Class<T> clazz) {		
-		if (StringUtils.isNotEmpty(key)) {
-			final Object obj = authProcessData.get(key);
-			if (obj != null && clazz.isInstance(obj))
-				return (T) obj;
-		}
-		
-		if (defaultValue == null)
-			return null;
-		
-		else if (clazz.isInstance(defaultValue))
-			return (T)defaultValue;
-			
-		else {
-			log.error("DefaultValue: " + defaultValue.getClass().getName() + " is not of Type:" + clazz.getName());
-			throw new IllegalStateException("DefaultValue: " + defaultValue.getClass().getName() + " is not of Type:" + clazz.getName());
-				
-		}		
-	}
+public class AuthProcessDataWrapper
+    implements IAuthProcessDataContainer, EaafAuthProcessDataConstants {
+  private static final Logger log = LoggerFactory.getLogger(AuthProcessDataWrapper.class);
+
+  protected Map<String, Object> authProcessData;
+
+  public AuthProcessDataWrapper(final Map<String, Object> authProcessData) {
+    this.authProcessData = authProcessData;
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getIssueInstant()
+   */
+  @Override
+  public String getIssueInstant() {
+    return wrapStringObject(VALUE_ISSUEINSTANT, null, String.class);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setIssueInstant(java.lang.String)
+   */
+  @Override
+  public void setIssueInstant(final String issueInstant) {
+    authProcessData.put(VALUE_ISSUEINSTANT, issueInstant);
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isAuthenticated()
+   */
+  @Override
+  public boolean isAuthenticated() {
+    return wrapStringObject(FLAG_IS_AUTHENTICATED, false, Boolean.class);
+
+  }
+
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setAuthenticated(boolean)
+   */
+  @Override
+  public void setAuthenticated(final boolean authenticated) {
+    authProcessData.put(FLAG_IS_AUTHENTICATED, authenticated);
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getIdentityLink()
+   */
+  @Override
+  public IIdentityLink getIdentityLink() {
+    return wrapStringObject(VALUE_IDENTITYLINK, null, IIdentityLink.class);
+
+  }
+
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setIdentityLink(at.gv.egovernment.moa
+   * .id.auth.data.IdentityLink)
+   */
+  @Override
+  public void setIdentityLink(final IIdentityLink identityLink) {
+    authProcessData.put(VALUE_IDENTITYLINK, identityLink);
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isMandateUsed()
+   */
+  @Override
+  public boolean isMandateUsed() {
+    return wrapStringObject(FLAG_USE_MANDATE, false, Boolean.class);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setUseMandates(boolean)
+   */
+  @Override
+  public void setUseMandates(final boolean useMandates) {
+    authProcessData.put(FLAG_USE_MANDATE, useMandates);
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getQAALevel()
+   */
+  @Override
+  public String getQAALevel() {
+    return wrapStringObject(VALUE_QAALEVEL, null, String.class);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setQAALevel(java.lang.String)
+   */
+  @Override
+  public void setQAALevel(final String qAALevel) {
+    authProcessData.put(VALUE_QAALEVEL, qAALevel);
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isForeigner()
+   */
+  @Override
+  public boolean isForeigner() {
+    return wrapStringObject(FLAG_IS_FOREIGNER, false, Boolean.class);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setForeigner(boolean)
+   */
+  @Override
+  public void setForeigner(final boolean isForeigner) {
+    authProcessData.put(FLAG_IS_FOREIGNER, isForeigner);
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#isOW()
+   */
+  @Override
+  public boolean isOW() {
+    return wrapStringObject(FLAG_IS_ORGANWALTER, false, Boolean.class);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setOW(boolean)
+   */
+  @Override
+  public void setOW(final boolean isOW) {
+    authProcessData.put(FLAG_IS_ORGANWALTER, isOW);
+
+  }
+
+  @Override
+  public boolean isEIDProcess() {
+    return wrapStringObject(FLAG_IS_NEW_EID_PROCESS, false, Boolean.class);
+  }
+
+  @Override
+  public void setEIDProcess(final boolean value) {
+    authProcessData.put(FLAG_IS_NEW_EID_PROCESS, value);
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getSessionCreated()
+   */
+  @Override
+  public Date getSessionCreated() {
+    return wrapStringObject(EAAFConstants.AUTH_DATA_CREATED, null, Date.class);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getGenericSessionDataStorage()
+   */
+  @Override
+  public Map<String, Object> getGenericSessionDataStorage() {
+    final Map<String, Object> result = new HashMap<>();
+    for (final Map.Entry<String,Object> el : authProcessData.entrySet()) {
+      if (el.getKey().startsWith(GENERIC_PREFIX)) {
+        result.put(el.getKey().substring(GENERIC_PREFIX.length()), el.getValue());
+      }
+
+    }
+
+    return result;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getGenericDataFromSession(java.lang.
+   * String)
+   */
+  @Override
+  public Object getGenericDataFromSession(final String key) {
+    return authProcessData.get(GENERIC_PREFIX + key);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getGenericDataFromSession(java.lang.
+   * String, java.lang.Class)
+   */
+  @Override
+  public <T> T getGenericDataFromSession(final String key, final Class<T> clazz) {
+    return wrapStringObject(GENERIC_PREFIX + key, null, clazz);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setGenericDataToSession(java.lang.
+   * String, java.lang.Object)
+   */
+  @Override
+  public void setGenericDataToSession(final String key, final Object object)
+      throws EaafStorageException {
+    authProcessData.put(GENERIC_PREFIX + key, object);
+
+  }
+
+  protected <T> T wrapStringObject(final String key, final Object defaultValue,
+      final Class<T> clazz) {
+    if (StringUtils.isNotEmpty(key)) {
+      final Object obj = authProcessData.get(key);
+      if (obj != null && clazz.isInstance(obj)) {
+        return (T) obj;
+      }
+    }
+
+    if (defaultValue == null) {
+      return null;
+    } else if (clazz.isInstance(defaultValue)) {
+      return (T) defaultValue;
+    } else {
+      log.error("DefaultValue: " + defaultValue.getClass().getName() + " is not of Type:"
+          + clazz.getName());
+      throw new IllegalStateException("DefaultValue: " + defaultValue.getClass().getName()
+          + " is not of Type:" + clazz.getName());
+
+    }
+  }
 }
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
index 367643ec..a1faa0a4 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
@@ -1,306 +1,375 @@
 /*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- * 
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
+ * Copyright 2014 Federal Chancellery Austria MOA-ID has been developed in a cooperation between
+ * BRZ, the Federal Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at: http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
  ******************************************************************************/
 /*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ * Copyright 2003 Federal Chancellery Austria MOA-ID has been developed in a cooperation between
+ * BRZ, the Federal Chancellery Austria - ICT staff unit, and Graz University of Technology.
  *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at: http://www.osor.eu/eupl/
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
  *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
 
 package at.gv.egiz.eaaf.core.impl.idp.auth.data;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.Serializable;
 import java.security.PublicKey;
-
 import javax.xml.transform.TransformerException;
-
-import org.w3c.dom.Element;
-
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
+import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
+import org.w3c.dom.Element;
 
 
 /**
- * Data contained in an identity link issued by BMI, relevant to the MOA ID component.
- * <br><code>"IdentityLink"</code> is the translation of <code>"Personenbindung"</code>.
- * 
+ * Data contained in an identity link issued by BMI, relevant to the MOA ID component. <br>
+ * <code>"IdentityLink"</code> is the translation of <code>"Personenbindung"</code>.
+ *
  * @author Paul Ivancsics
  * @version $Id$
  */
-public class IdentityLink implements Serializable, IIdentityLink{
-
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * <code>"identificationValue"</code> is the translation of <code>"Stammzahl"</code>.
-	 */
-	private String identificationValue;
-	/**
-	* <code>"identificationType"</code> type of the identificationValue in the IdentityLink.
-	*/
-	private String identificationType;
-	/**
-	 * first name
-	 */
-	private String givenName;
-	/**
-	 * family name
-	 */
-	private String familyName;
-  
-	/**
-	 * date of birth
-	 */
-	private String dateOfBirth;
+public class IdentityLink implements Serializable, IIdentityLink {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * <code>"identificationValue"</code> is the translation of <code>"Stammzahl"</code>.
+   */
+  private String identificationValue;
+  /**
+   * <code>"identificationType"</code> type of the identificationValue in the IdentityLink.
+   */
+  private String identificationType;
+  /**
+   * first name
+   */
+  private String givenName;
+  /**
+   * family name
+   */
+  private String familyName;
+
+  /**
+   * date of birth
+   */
+  private String dateOfBirth;
   /**
    * the original saml:Assertion-Element
    */
-	private Element samlAssertion;
+  private transient Element samlAssertion;
   /**
    * the serializes saml:Assertion
    */
   private String serializedSamlAssertion;
-	/**
-	 * Element /saml:Assertion/saml:AttributeStatement/saml:Subject/saml:SubjectConfirmation/saml:SubjectConfirmationData/pr:Person
-	 */
-	private Element prPerson;
   /**
-   * we need for each dsig:Reference Element all
-   * transformation elements
+   * Element
+   * /saml:Assertion/saml:AttributeStatement/saml:Subject/saml:SubjectConfirmation/saml:SubjectConfirmationData/pr:Person
+   */
+  private transient Element prPerson = null;
+  /**
+   * we need for each dsig:Reference Element all transformation elements
    */
-  private Element[] dsigReferenceTransforms;
-  
+  private transient Element[] dsigReferenceTransforms = null;
+
   /**
    * The issuing time of the identity link SAML assertion.
    */
   private String issueInstant;
 
   /**
-   * we need all public keys stored in 
-   * the identity link
+   * we need all public keys stored in the identity link
    */
   private PublicKey[] publicKey;
 
-	/**
-	 * Constructor for IdentityLink
-	 */
-	public IdentityLink() {
-	}
+  /**
+   * Constructor for IdentityLink
+   */
+  public IdentityLink() {}
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getDateOfBirth()
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getDateOfBirth()
+   */
   @Override
-public String getDateOfBirth() {
+  public String getDateOfBirth() {
     return dateOfBirth;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getFamilyName()
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getFamilyName()
+   */
   @Override
-public String getFamilyName() {
+  public String getFamilyName() {
     return familyName;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getGivenName()
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getGivenName()
+   */
   @Override
-public String getGivenName() {
+  public String getGivenName() {
     return givenName;
   }
-  
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getName()
- */
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getName()
+   */
   @Override
   @Deprecated
   public String getName() {
     return givenName + " " + familyName;
-    
+
   }
-  
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIdentificationValue()
- */
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIdentificationValue()
+   */
   @Override
-public String getIdentificationValue() {
+  public String getIdentificationValue() {
     return identificationValue;
   }
 
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIdentificationType()
-	 */
-	@Override
-	public String getIdentificationType() {
-		return identificationType;
-	}
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIdentificationType()
+   */
+  @Override
+  public String getIdentificationType() {
+    return identificationType;
+  }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDateOfBirth(java.lang.String)
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDateOfBirth(java.lang.String)
+   */
   @Override
-public void setDateOfBirth(String dateOfBirth) {
+  public void setDateOfBirth(final String dateOfBirth) {
     this.dateOfBirth = dateOfBirth;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setFamilyName(java.lang.String)
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setFamilyName(java.lang.String)
+   */
   @Override
-public void setFamilyName(String familyName) {
+  public void setFamilyName(final String familyName) {
     this.familyName = familyName;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setGivenName(java.lang.String)
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setGivenName(java.lang.String)
+   */
   @Override
-public void setGivenName(String givenName) {
+  public void setGivenName(final String givenName) {
     this.givenName = givenName;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationValue(java.lang.String)
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationValue(java.lang.String)
+   */
   @Override
-public void setIdentificationValue(String identificationValue) {
+  public void setIdentificationValue(final String identificationValue) {
     this.identificationValue = identificationValue;
   }
-  
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationType(java.lang.String)
-	 */
-	@Override
-	public void setIdentificationType(String identificationType) {
-		this.identificationType = identificationType;
-	}
-
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getSamlAssertion()
- */
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationType(java.lang.String)
+   */
   @Override
-public Element getSamlAssertion() {
-    return samlAssertion;
+  public void setIdentificationType(final String identificationType) {
+    this.identificationType = identificationType;
   }
-  
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getSerializedSamlAssertion()
- */
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getSamlAssertion()
+   */
   @Override
-public String getSerializedSamlAssertion() {
+  public Element getSamlAssertion() {
+    if (this.samlAssertion == null) {
+      try {
+        this.samlAssertion = DomUtils.parseXmlNonValidating(
+            new ByteArrayInputStream(serializedSamlAssertion.getBytes("UTF-8")));
+
+      } catch (final Exception e) {
+        throw new RuntimeException(e);
+
+      }
+    }
+
+    return this.samlAssertion;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getSerializedSamlAssertion()
+   */
+  @Override
+  public String getSerializedSamlAssertion() {
     return serializedSamlAssertion;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setSamlAssertion(org.w3c.dom.Element)
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setSamlAssertion(org.w3c.dom.Element)
+   */
   @Override
-public void setSamlAssertion(Element samlAssertion) throws TransformerException, IOException {
+  public void setSamlAssertion(final Element samlAssertion)
+      throws TransformerException, IOException {
     this.samlAssertion = samlAssertion;
-    this.serializedSamlAssertion = DOMUtils.serializeNode(samlAssertion);    
+    this.serializedSamlAssertion = DomUtils.serializeNode(samlAssertion);
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getDsigReferenceTransforms()
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getDsigReferenceTransforms()
+   */
   @Override
-public Element[] getDsigReferenceTransforms() {
-    return dsigReferenceTransforms;
+  public Element[] getDsigReferenceTransforms() {
+    if (dsigReferenceTransforms != null) {
+      return dsigReferenceTransforms.clone();
+
+    } else {
+      return null;
+
+    }
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDsigReferenceTransforms(org.w3c.dom.Element[])
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDsigReferenceTransforms(org.w3c.dom.Element
+   * [])
+   */
   @Override
-public void setDsigReferenceTransforms(Element[] dsigReferenceTransforms) {
-    this.dsigReferenceTransforms = dsigReferenceTransforms;
+  public void setDsigReferenceTransforms(final Element[] dsigReferenceTransforms) {
+    if (dsigReferenceTransforms != null) {
+      this.dsigReferenceTransforms = dsigReferenceTransforms.clone();
+
+    }
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getPublicKey()
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getPublicKey()
+   */
   @Override
-public PublicKey[] getPublicKey() {
-    return publicKey;
+  public PublicKey[] getPublicKey() {
+    if (publicKey != null) {
+      return publicKey.clone();
+
+    } else {
+      return null;
+
+    }
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPublicKey(java.security.PublicKey[])
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPublicKey(java.security.PublicKey[])
+   */
   @Override
-public void setPublicKey(PublicKey[] publicKey) {
-    this.publicKey = publicKey;
+  public void setPublicKey(final PublicKey[] publicKey) {
+    if (publicKey != null) {
+      this.publicKey = publicKey.clone();
+
+    }
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getPrPerson()
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getPrPerson()
+   */
   @Override
-public Element getPrPerson() {
+  public Element getPrPerson() {
+    if (prPerson == null) {
+      prPerson = (Element) XPathUtils.selectSingleNode(
+          getSamlAssertion(), SimpleIdentityLinkAssertionParser.PERSON_XPATH);
+
+    }
+
     return prPerson;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPrPerson(org.w3c.dom.Element)
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPrPerson(org.w3c.dom.Element)
+   */
   @Override
-public void setPrPerson(Element prPerson) {
+  public void setPrPerson(final Element prPerson) {
     this.prPerson = prPerson;
   }
-  
-   /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIssueInstant()
- */
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIssueInstant()
+   */
   @Override
-public String getIssueInstant() {
+  public String getIssueInstant() {
     return issueInstant;
   }
 
-  /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIssueInstant(java.lang.String)
- */
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIssueInstant(java.lang.String)
+   */
   @Override
-public void setIssueInstant(String issueInstant) {
+  public void setIssueInstant(final String issueInstant) {
     this.issueInstant = issueInstant;
   }
 
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java
index 658e6a42..220469d3 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java
@@ -1,46 +1,36 @@
 /*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- * 
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
+ * Copyright 2014 Federal Chancellery Austria MOA-ID has been developed in a cooperation between
+ * BRZ, the Federal Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at: http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
  ******************************************************************************/
 /*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ * Copyright 2003 Federal Chancellery Austria MOA-ID has been developed in a cooperation between
+ * BRZ, the Federal Chancellery Austria - ICT staff unit, and Graz University of Technology.
  *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at: http://www.osor.eu/eupl/
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
  *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
 
@@ -50,22 +40,19 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.springframework.util.Base64Utils;
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
 import at.gv.egiz.eaaf.core.api.data.XMLNamespaceConstants;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.exceptions.EAAFParserException;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.exceptions.EaafParserException;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
+import org.springframework.util.Base64Utils;
+import org.w3c.dom.Element;
+import org.w3c.dom.traversal.NodeIterator;
 
 /**
- * Parses MDS from an identity link <code>&lt;saml:Assertion&gt;</code>
- * <br>
+ * Parses MDS from an identity link <code>&lt;saml:Assertion&gt;</code> <br>
  * <b>This IDL parser extract NO key information!</b>
-
+ *
  */
 public class SimpleIdentityLinkAssertionParser {
 
@@ -79,246 +66,163 @@ public class SimpleIdentityLinkAssertionParser {
   private static final String SAML = XMLNamespaceConstants.SAML_PREFIX + ":";
   /** Xpath prefix for reaching XML-DSIG Namespaces */
   private static final String DSIG = XMLNamespaceConstants.DSIG_PREFIX + ":";
-  /** Xpath prefix for reaching ECDS Namespaces */
-  private static final String ECDSA = XMLNamespaceConstants.ECDSA_PREFIX + ":";
-  /** Xpath expression to the root element */  
-	private static final String ROOT = "";
- /** Xpath expression to the SAMLSubjectConfirmationData element */
+  /** Xpath expression to the root element */
+  private static final String ROOT = "";
+  /** Xpath expression to the SAMLSubjectConfirmationData element */
   private static final String SAML_SUBJECT_CONFIRMATION_DATA_XPATH =
-      ROOT
-      + SAML
-      + "AttributeStatement/"
-      + SAML
-      + "Subject/"
-      + SAML
-      + "SubjectConfirmation/"
-      + SAML
-      + "SubjectConfirmationData";
+      ROOT + SAML + "AttributeStatement/" + SAML + "Subject/" + SAML + "SubjectConfirmation/" + SAML
+          + "SubjectConfirmationData";
   /** Xpath expression to the PersonData element */
-	private static final String PERSON_XPATH =
-		SAML_SUBJECT_CONFIRMATION_DATA_XPATH
-      + "/"
-      + PDATA
-      + "Person";
-  /** Xpath expression to the PersonData GivenName element */      
+  public static final String PERSON_XPATH =
+      SAML_SUBJECT_CONFIRMATION_DATA_XPATH + "/" + PDATA + "Person";
+  /** Xpath expression to the PersonData GivenName element */
   public static final String PERSON_GIVEN_NAME_XPATH =
-    PERSON_XPATH
-    	+ "/"
-      + PDATA
-      + "Name/"
-      + PDATA
-      + "GivenName";
+      PERSON_XPATH + "/" + PDATA + "Name/" + PDATA + "GivenName";
   /** Xpath expression to the PersonData FamilyName element */
   public static final String PERSON_FAMILY_NAME_XPATH =
-    PERSON_XPATH
-    	+ "/"
-      + PDATA
-      + "Name/"
-      + PDATA
-      + "FamilyName";
+      PERSON_XPATH + "/" + PDATA + "Name/" + PDATA + "FamilyName";
   /** Xpath expression to the PersonData DateOfBirth element */
   public static final String PERSON_DATE_OF_BIRTH_XPATH =
-    PERSON_XPATH
-    	+ "/"
-      + PDATA
-      + "DateOfBirth";
-  /** Xpath expression to the Identification element */
-  private static final String PERSON_IDENT_XPATH =
-    PERSON_XPATH
-    	+ "/"
-      + PDATA
-      + "Identification";
-
-  /** Xpath expression to the Identification Value element */	
+      PERSON_XPATH + "/" + PDATA + "DateOfBirth";
+  /** Xpath expression to the Identification Value element */
   public static final String PERSON_IDENT_VALUE_XPATH =
-    PERSON_XPATH
-    	+ "/"
-      + PDATA
-      + "Identification/"
-      + PDATA
-      + "Value";
+      PERSON_XPATH + "/" + PDATA + "Identification/" + PDATA + "Value";
 
-	/** Xpath expression to the Identification Value element */	
-	public static final String PERSON_IDENT_TYPE_XPATH =
-		PERSON_XPATH
-			+ "/"
-			+ PDATA
-			+ "Identification/"
-			+ PDATA
-			+ "Type";
+  /** Xpath expression to the Identification Value element */
+  public static final String PERSON_IDENT_TYPE_XPATH =
+      PERSON_XPATH + "/" + PDATA + "Identification/" + PDATA + "Type";
 
-  /** Xpath expression to the RSAKeyValue element */
-  private static final String RSA_KEY_VALUE_XPATH =
-    ROOT
-      + SAML
-      + "AttributeStatement/"
-      + SAML
-      + "Attribute/"
-      + SAML
-      + "AttributeValue/"
-      + DSIG
-      + "RSAKeyValue";
+  /** Xpath expression to the DSIG X509Certificate element */
+  private static final String DSIG_CERTIFICATES_XPATH = ROOT + DSIG + "Signature/" + DSIG
+      + "KeyInfo/" + DSIG + "X509Data/" + DSIG + "X509Certificate";
+  /** Xpath expression to the DSIG Transforms element */
+  private static final String DSIG_REFERENCE_TRANSFORMATION_XPATH =
+      ROOT + DSIG + "Signature/" + DSIG + "SignedInfo/" + DSIG + "Reference/" + DSIG + "Transforms";
 
-  /** Xpath expression to the ECKeyValue element */
-  private static final String ECDSA_KEY_VALUE_XPATH =
-    ROOT
-      + SAML
-      + "AttributeStatement/"
-      + SAML
-      + "Attribute/"
-      + SAML
-      + "AttributeValue/"
-      + ECDSA
-      + "ECDSAKeyValue";
+  /** The IssueInstant attribute of the SAML assertion */
+  private static final String ISSUE_INSTANT_ATTR = "IssueInstant";
 
-  
-  /** Xpath expression to the RSA Modulus element */
-  private static final String RSA_KEY_MODULUS_XPATH = DSIG + "Modulus";
-  /** Xpath expression to the RSA Exponent element */
-  private static final String RSA_KEY_EXPONENT_XPATH = DSIG + "Exponent";
-  /** Xpath expression to the DSIG X509Certificate element */
-  private static final String DSIG_CERTIFICATES_XPATH =
-    ROOT
-      + DSIG
-      + "Signature/"
-      + DSIG
-      + "KeyInfo/"
-      + DSIG
-      + "X509Data/"
-      + DSIG
-      + "X509Certificate";
- /** Xpath expression to the DSIG Transforms element */
- private static final String DSIG_REFERENCE_TRANSFORMATION_XPATH = 
-   ROOT 
-   + DSIG 
-   + "Signature/" 
-   + DSIG 
-   + "SignedInfo/" 
-   + DSIG 
-   + "Reference/" 
-   + DSIG 
-   + "Transforms";
- 
- /** The IssueInstant attribute of the SAML assertion */
- private static final String ISSUE_INSTANT_ATTR = "IssueInstant";
- 
- public static final String ASSERTIONID = "AssertionID";
-      
-  /**This is the root element of the XML-Document provided by the Security Layer Card*/
+  public static final String ASSERTIONID = "AssertionID";
+
+  /** This is the root element of the XML-Document provided by the Security Layer Card */
   private Element assertionElem;
 
   /**
-   * Constructor for <code>IdentityLinkAssertionParser</code>.
-   * A DOM-representation of the incoming String will be created
+   * Constructor for <code>IdentityLinkAssertionParser</code>. A DOM-representation of the incoming
+   * String will be created
+   *
    * @param xmlAssertion <code>&lt;saml:Assertion&gt;</code> as String
-   * @throws EAAFParserException on any parsing error
+   * @throws EaafParserException on any parsing error
    */
-  public SimpleIdentityLinkAssertionParser(String xmlAssertion) throws EAAFParserException {
+  public SimpleIdentityLinkAssertionParser(final String xmlAssertion) throws EaafParserException {
     try {
-      InputStream s = new ByteArrayInputStream(xmlAssertion.getBytes("UTF-8"));
-      assertionElem = DOMUtils.parseXmlValidating(s);
-      
-    }
-    catch (Throwable t) {
-      throw new EAAFParserException("parser.01", new Object[] { t.toString()}, t);
-      
+      final InputStream s = new ByteArrayInputStream(xmlAssertion.getBytes("UTF-8"));
+      assertionElem = DomUtils.parseXmlValidating(s);
+
+    } catch (final Throwable t) {
+      throw new EaafParserException("parser.01", new Object[] {t.toString()}, t);
+
     }
   }
-  
+
   /**
    * Sets the <@link assertionElem>.
+   *
    * @param xmlAssertion the assertion element
-   * @throws EAAFParserException on any parsing error
+   * @throws EaafParserException on any parsing error
    */
-  public SimpleIdentityLinkAssertionParser(Element xmlAssertion) throws EAAFParserException {
+  public SimpleIdentityLinkAssertionParser(final Element xmlAssertion) throws EaafParserException {
     assertionElem = xmlAssertion;
   }
 
   /**
-   * Constructor for <code>IdentityLinkAssertionParser</code>.
-   * A DOM-representation of the incoming Inputstream will be created
+   * Constructor for <code>IdentityLinkAssertionParser</code>. A DOM-representation of the incoming
+   * Inputstream will be created
+   *
    * @param xmlAssertion <code>&lt;saml:Assertion&gt;</code> as InputStream
-   * @throws EAAFParserException on any parsing error
+   * @throws EaafParserException on any parsing error
    */
-  public SimpleIdentityLinkAssertionParser(InputStream xmlAssertion) throws EAAFParserException {
+  public SimpleIdentityLinkAssertionParser(final InputStream xmlAssertion)
+      throws EaafParserException {
     try {
-      assertionElem = DOMUtils.parseXmlValidating(xmlAssertion);
-      
-    }
-    catch (Throwable t) {
-      throw new EAAFParserException("parser.01", new Object[] { t.toString() },  t);
-      
+      assertionElem = DomUtils.parseXmlValidating(xmlAssertion);
+
+    } catch (final Throwable t) {
+      throw new EaafParserException("parser.01", new Object[] {t.toString()}, t);
+
     }
   }
 
   /**
    * Parses the identity link from the <code>&lt;saml:Assertion&gt;</code>
+   *
    * @return Identity link
-   * @throws EAAFParserException on any parsing error
+   * @throws EaafParserException on any parsing error
    */
 
-  public IIdentityLink parseIdentityLink() throws EAAFParserException {
+  public IIdentityLink parseIdentityLink() throws EaafParserException {
     IIdentityLink identityLink;
     try {
       identityLink = new IdentityLink();
       identityLink.setSamlAssertion(assertionElem);
       identityLink.setIssueInstant(assertionElem.getAttribute(ISSUE_INSTANT_ATTR));
-      identityLink.setPrPerson((Element)
-      	XPathUtils.selectSingleNode(assertionElem, PERSON_XPATH));
+      identityLink.setPrPerson((Element) XPathUtils.selectSingleNode(assertionElem, PERSON_XPATH));
       identityLink.setIdentificationValue(
-        XPathUtils.getElementValue(assertionElem, PERSON_IDENT_VALUE_XPATH, ""));
-			identityLink.setIdentificationType(
-				XPathUtils.getElementValue(assertionElem, PERSON_IDENT_TYPE_XPATH, ""));
-			
-	  String givenname = XPathUtils.getElementValue(assertionElem, PERSON_GIVEN_NAME_XPATH, "");
-	  String familyname = XPathUtils.getElementValue(assertionElem, PERSON_FAMILY_NAME_XPATH, "");
+          XPathUtils.getElementValue(assertionElem, PERSON_IDENT_VALUE_XPATH, ""));
+      identityLink.setIdentificationType(
+          XPathUtils.getElementValue(assertionElem, PERSON_IDENT_TYPE_XPATH, ""));
+
+      final String givenname =
+          XPathUtils.getElementValue(assertionElem, PERSON_GIVEN_NAME_XPATH, "");
+      final String familyname =
+          XPathUtils.getElementValue(assertionElem, PERSON_FAMILY_NAME_XPATH, "");
+
+      // replace ' in name with &#39;
+      // givenname = givenname.replaceAll("'", "&#39;");
+      // familyname = familyname.replaceAll("'", "&#39;");
 
-	  // replace ' in name with &#39;
-//	  givenname = givenname.replaceAll("'", "&#39;");
-//	  familyname = familyname.replaceAll("'", "&#39;");			
-		
       identityLink.setGivenName(givenname);
       identityLink.setFamilyName(familyname);
       identityLink.setDateOfBirth(
-        XPathUtils.getElementValue(assertionElem, PERSON_DATE_OF_BIRTH_XPATH, ""));
-			 NodeIterator dsigRefTransforms = 
-			 XPathUtils.selectNodeIterator(assertionElem, DSIG_REFERENCE_TRANSFORMATION_XPATH);
-       List transElems = new ArrayList();
-       Element transformsElem;
-       while ((transformsElem = (Element) dsigRefTransforms.nextNode()) != null) {
-          transElems.add(transformsElem);
-       }
-       Element[] result = new Element[transElems.size()];
-       transElems.toArray(result);  
-       identityLink.setDsigReferenceTransforms(result);
-       
-       //identityLink.setPublicKey(getPublicKeys());
-   
-    }
-    catch (Throwable t) {
-      throw new EAAFParserException("parser.01", new Object[] { t.toString() }, t);
+          XPathUtils.getElementValue(assertionElem, PERSON_DATE_OF_BIRTH_XPATH, ""));
+      final NodeIterator dsigRefTransforms =
+          XPathUtils.selectNodeIterator(assertionElem, DSIG_REFERENCE_TRANSFORMATION_XPATH);
+      final List transElems = new ArrayList();
+      Element transformsElem;
+      while ((transformsElem = (Element) dsigRefTransforms.nextNode()) != null) {
+        transElems.add(transformsElem);
+      }
+      final Element[] result = new Element[transElems.size()];
+      transElems.toArray(result);
+      identityLink.setDsigReferenceTransforms(result);
+
+      // identityLink.setPublicKey(getPublicKeys());
+
+    } catch (final Throwable t) {
+      throw new EaafParserException("parser.01", new Object[] {t.toString()}, t);
     }
 
     return identityLink;
   }
 
   /**
-    * Parses a string array of decoded base64 certificates from 
-    * the <code>&lt;InfoboxReadResponse&gt;</code> found in the dsig-signature
-    * @return String[] with raw-certificates from the dsig-signature keyinfo
-    * @throws Exception
-    */
+   * Parses a string array of decoded base64 certificates from the
+   * <code>&lt;InfoboxReadResponse&gt;</code> found in the dsig-signature
+   *
+   * @return String[] with raw-certificates from the dsig-signature keyinfo
+   * @throws Exception
+   */
   public String[] getCertificates() throws Exception {
-    List certs = new ArrayList();
-    NodeIterator rsaIter =
-      XPathUtils.selectNodeIterator(assertionElem, DSIG_CERTIFICATES_XPATH);
+    final List certs = new ArrayList();
+    final NodeIterator rsaIter =
+        XPathUtils.selectNodeIterator(assertionElem, DSIG_CERTIFICATES_XPATH);
     Element certElem;
     while ((certElem = (Element) rsaIter.nextNode()) != null) {
-      String content = DOMUtils.getText(certElem);
-      certs.add(new String(Base64Utils.decodeFromString(content)));
-      
+      final String content = DomUtils.getText(certElem);
+      certs.add(new String(Base64Utils.decodeFromString(content), "UTF-8"));
+
     }
-    String[] result = new String[certs.size()];
+    final String[] result = new String[certs.size()];
     certs.toArray(result);
     return result;