merging

1 files changed, 19 insertions, 21 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java
index fa42fc54f..ef594b91c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java
@@ -5,41 +5,39 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-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.builder.attributes.exceptions.AttributeException;
 
-public class BirthdateAttributeBuilder extends BaseAttributeBuilder {
-
+public class BirthdateAttributeBuilder implements IPVPAttributeBuilder {
+	
 	public static final String IDENTITY_LINK_DATE_FORMAT = "yyyy-MM-dd";
-
+	
 	public String getName() {
 		return BIRTHDATE_NAME;
 	}
-
-	public Attribute build(AuthenticationSession authSession, 
-			OAAuthParameter oaParam, AuthenticationData authData) {
+	
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
 		try {
-			DateFormat identityLinkFormat = new SimpleDateFormat(
-					IDENTITY_LINK_DATE_FORMAT);
-			Date date = identityLinkFormat.parse(authSession.getIdentityLink()
-					.getDateOfBirth());
-			DateFormat pvpDateFormat = new SimpleDateFormat(
-					BIRTHDATE_FORMAT_PATTERN);
+			DateFormat identityLinkFormat = new SimpleDateFormat(IDENTITY_LINK_DATE_FORMAT);
+			Date date = identityLinkFormat.parse(authSession.getIdentityLink().getDateOfBirth());
+			DateFormat pvpDateFormat = new SimpleDateFormat(BIRTHDATE_FORMAT_PATTERN);
 			String dateString = pvpDateFormat.format(date);
-			return buildStringAttribute(BIRTHDATE_FRIENDLY_NAME,
-					BIRTHDATE_NAME, dateString);
-		} catch (ParseException e) {
+			
+			return g.buildStringAttribute(BIRTHDATE_FRIENDLY_NAME, BIRTHDATE_NAME, dateString);
+			
+			//return buildStringAttribute(BIRTHDATE_FRIENDLY_NAME, BIRTHDATE_NAME, dateString);
+		}
+		catch (ParseException e) {
 			e.printStackTrace();
 			return null;
 		}
 	}
 	
-	public Attribute buildEmpty() {
-		return buildemptyAttribute(BIRTHDATE_FRIENDLY_NAME,
-				BIRTHDATE_NAME);
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(BIRTHDATE_FRIENDLY_NAME, BIRTHDATE_NAME);
 	}
-
+	
 }