1 files changed, 40 insertions, 30 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java
index f85fd7cae..67d9a356d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java
@@ -26,50 +26,60 @@ import org.w3c.dom.Element;
 
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBodyType;
-import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
-import at.gv.egovernment.moa.id.data.IAuthData;
-import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+import at.gv.egiz.eaaf.core.api.idp.IAttributeGenerator;
+import at.gv.egiz.eaaf.core.api.idp.IAuthData;
+import at.gv.egiz.eaaf.core.api.idp.IPVPAttributeBuilder;
+import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.AttributeBuilderException;
+import at.gv.egiz.eaaf.core.impl.idp.builder.attributes.PVPMETADATA;
+import at.gv.egovernment.moa.id.data.IMOAAuthData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.NoMandateDataAttributeException;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
+@PVPMETADATA
 public class MandateLegalPersonFullNameAttributeBuilder implements IPVPAttributeBuilder {
 	
 	public String getName() {
 		return MANDATE_LEG_PER_FULL_NAME_NAME;
 	}
 	
-	public <ATT> ATT build(IOAAuthParameters oaParam, IAuthData authData,
-			IAttributeGenerator<ATT> g) throws AttributeException {
-		if (authData.isUseMandate()) {
-			
-			//get PVP attribute directly, if exists 
-			String fullName = authData.getGenericData(MANDATE_LEG_PER_FULL_NAME_NAME, String.class);
-			
-			if (MiscUtil.isEmpty(fullName)) {
-				Element mandate = authData.getMandate();
-				if (mandate == null) {
-					throw new NoMandateDataAttributeException();
-					
-				}
-				Mandate mandateObject = MandateBuilder.buildMandate(mandate);
-				if (mandateObject == null) {
-					throw new NoMandateDataAttributeException();
-					
+	public <ATT> ATT build(ISPConfiguration oaParam, IAuthData authData,
+			IAttributeGenerator<ATT> g) throws AttributeBuilderException {
+		if (authData instanceof IMOAAuthData) {
+			if (((IMOAAuthData)authData).isUseMandate()) {
+				
+				//get PVP attribute directly, if exists 
+				String fullName = authData.getGenericData(MANDATE_LEG_PER_FULL_NAME_NAME, String.class);
+				
+				if (MiscUtil.isEmpty(fullName)) {
+					Element mandate = ((IMOAAuthData)authData).getMandate();
+					if (mandate == null) {
+						throw new NoMandateDataAttributeException();
+						
+					}
+					Mandate mandateObject = MandateBuilder.buildMandate(mandate);
+					if (mandateObject == null) {
+						throw new NoMandateDataAttributeException();
+						
+					}
+					CorporateBodyType corporation = mandateObject.getMandator().getCorporateBody();
+					if (corporation == null) {
+						Logger.info("No corporation mandate");
+						throw new NoMandateDataAttributeException();
+						
+					}
+					fullName = corporation.getFullName();
 				}
-				CorporateBodyType corporation = mandateObject.getMandator().getCorporateBody();
-				if (corporation == null) {
-					Logger.info("No corporation mandate");
-					throw new NoMandateDataAttributeException();
-					
-				}
-				fullName = corporation.getFullName();
+				return g.buildStringAttribute(MANDATE_LEG_PER_FULL_NAME_FRIENDLY_NAME, MANDATE_LEG_PER_FULL_NAME_NAME,
+						fullName);
+				
 			}
-			return g.buildStringAttribute(MANDATE_LEG_PER_FULL_NAME_FRIENDLY_NAME, MANDATE_LEG_PER_FULL_NAME_NAME,
-					fullName);
 			
-		}
+		} else
+			Logger.info(MANDATE_LEG_PER_FULL_NAME_FRIENDLY_NAME + " is only available in MOA-ID context");			
+			
 		return null;
 		
 	}