1 files changed, 7 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java
index 0afd71bc1..7d5f1d998 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java
@@ -4,32 +4,29 @@ import java.io.IOException;
 
 import javax.xml.transform.TransformerException;
 
-import org.opensaml.saml2.core.Attribute;
-
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.DOMUtils;
 
-public class MandateFullMandateAttributeBuilder extends BaseAttributeBuilder {
+public class MandateFullMandateAttributeBuilder implements IPVPAttributeBuilder {
 
 	public String getName() {
 		return MANDATE_FULL_MANDATE_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession, 
-			OAAuthParameter oaParam, AuthenticationData authData)
-			throws PVP2Exception {
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
 		if (authSession.getUseMandate()) {
 			if (authSession.getMandate() != null) {
 				String fullMandate;
 				try {
 					fullMandate = DOMUtils.serializeNode(authSession
 							.getMandate());
-					return buildStringAttribute(MANDATE_FULL_MANDATE_FRIENDLY_NAME,
+					return g.buildStringAttribute(MANDATE_FULL_MANDATE_FRIENDLY_NAME,
 							MANDATE_FULL_MANDATE_NAME, Base64Utils.encode(fullMandate.getBytes()));
 				} catch (TransformerException e) {
 					Logger.error("Failed to generate Full Mandate", e);
@@ -42,8 +39,8 @@ public class MandateFullMandateAttributeBuilder extends BaseAttributeBuilder {
 
 	}
 
-	public Attribute buildEmpty() {
-		return buildemptyAttribute(MANDATE_FULL_MANDATE_FRIENDLY_NAME,
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(MANDATE_FULL_MANDATE_FRIENDLY_NAME,
 				MANDATE_FULL_MANDATE_NAME);
 	}