fix another problem in session database

3 files changed, 50 insertions, 11 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
index d306ec005..f5f056ccc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
@@ -34,7 +34,8 @@ import java.util.Map;
 import org.apache.commons.collections4.map.HashedMap;
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
+import at.gv.egovernment.moa.id.commons.api.data.IIdentityLink;
+import at.gv.egovernment.moa.id.commons.api.data.IMISMandate;
 import at.gv.egovernment.moa.id.commons.api.exceptions.SessionDataStorageException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.AssertionAttributeExtractorExeption;
@@ -74,7 +75,7 @@ public class AuthenticationData  implements IAuthData, Serializable {
 		/**
 		 * user identityLink specialized to OAParamter
 		 */
-	  private IdentityLink identityLink;
+	  private IIdentityLink identityLink;
 		
 	  /**
 	   * application specific user identifier (bPK/wbPK)
@@ -138,7 +139,7 @@ public class AuthenticationData  implements IAuthData, Serializable {
 	  private String pvpAttribute_OU = null;
 	  
 	  private boolean useMandate = false;
-	  private MISMandate mandate = null;
+	  private IMISMandate mandate = null;
 	  private String mandateReferenceValue = null;
 	  
 	  private boolean foreigner =false;
@@ -390,14 +391,14 @@ public class AuthenticationData  implements IAuthData, Serializable {
 	/**
 	 * @return the identityLink
 	 */
-	public IdentityLink getIdentityLink() {
+	public IIdentityLink getIdentityLink() {
 		return identityLink;
 	}
 
 	/**
 	 * @param identityLink the identityLink to set
 	 */
-	public void setIdentityLink(IdentityLink identityLink) {
+	public void setIdentityLink(IIdentityLink identityLink) {
 		this.identityLink = identityLink;
 	}
 
@@ -436,7 +437,7 @@ public class AuthenticationData  implements IAuthData, Serializable {
 	/**
 	 * @return the mandate
 	 */
-	public MISMandate getMISMandate() {
+	public IMISMandate getMISMandate() {
 		return mandate;
 	}
 
@@ -461,7 +462,7 @@ public class AuthenticationData  implements IAuthData, Serializable {
 	/**
 	 * @param mandate the mandate to set
 	 */
-	public void setMISMandate(MISMandate mandate) {
+	public void setMISMandate(IMISMandate mandate) {
 		this.mandate = mandate;
 	}
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java
index c32564679..4c15cd3d1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java
@@ -27,7 +27,8 @@ import java.util.List;
 
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
+import at.gv.egovernment.moa.id.commons.api.data.IIdentityLink;
+import at.gv.egovernment.moa.id.commons.api.data.IMISMandate;
 
 /**
  * @author tlenz
@@ -62,7 +63,7 @@ public interface IAuthData {
 
 	 List<String> getEncbPKList();
 	 
-	 IdentityLink getIdentityLink();
+	 IIdentityLink getIdentityLink();
 	 byte[] getSignerCertificate();
 	 String getAuthBlock();
 
@@ -74,7 +75,7 @@ public interface IAuthData {
 	 String getPublicAuthorityCode();
 	 boolean isQualifiedCertificate();
 
-	 MISMandate getMISMandate();
+	 IMISMandate getMISMandate();
 	 Element getMandate();
 	 String getMandateReferenceValue();
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MISMandate.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MISMandate.java
index 81157994e..25d50f57a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MISMandate.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MISMandate.java
@@ -51,12 +51,13 @@ import java.io.Serializable;
 import org.w3c.dom.Element;
 
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
+import at.gv.egovernment.moa.id.commons.api.data.IMISMandate;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
-public class MISMandate implements Serializable{
+public class MISMandate implements Serializable, IMISMandate{
 
 	private static final long serialVersionUID = 1L;
 		
@@ -81,23 +82,47 @@ public class MISMandate implements Serializable{
 	private String owBPK = null;
 //	private boolean isFullMandateIncluded = false;
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#getProfRep()
+	 */
+	@Override
 	public String getProfRep() {
   	return oid;
   }
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#setProfRep(java.lang.String)
+	 */
+	@Override
 	public void setProfRep(String oid) {
   	this.oid = oid;
   }
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#setOWbPK(java.lang.String)
+	 */
+	@Override
 	public void setOWbPK(String oWbPK) {
 		this.owBPK = oWbPK;
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#getOWbPK()
+	 */
+	@Override
 	public String getOWbPK() {
 		return owBPK;
 	}
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#getMandate()
+	 */
+	@Override
 	public byte[] getMandate() {
   	return mandate;
   }
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#getMandateDOM()
+	 */
+	@Override
 	public Element getMandateDOM() {
 		try {
 			byte[] byteMandate = mandate;
@@ -111,6 +136,10 @@ public class MISMandate implements Serializable{
 		}
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#getMandateJaxB()
+	 */
+	@Override
 	public Mandate getMandateJaxB() {
 		Element domMandate = getMandateDOM();
 		if (domMandate != null)
@@ -119,10 +148,18 @@ public class MISMandate implements Serializable{
 		return null;
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#setMandate(byte[])
+	 */
+	@Override
 	public void setMandate(byte[] mandate) {
   	this.mandate = mandate;
   }
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.IMISMandate#getTextualDescriptionOfOID()
+	 */
+	@Override
 	public String getTextualDescriptionOfOID() {
 		if (MiscUtil.isNotEmpty(this.oid)) {
 			if (this.oid.equalsIgnoreCase(OID_NOTAR))