From 296cfab56308cfb4d3b683021d98e65576b0d1ad Mon Sep 17 00:00:00 2001 From: "harald.bratko" Date: Thu, 2 Aug 2007 11:04:25 +0000 Subject: Removed PersonData return value. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@893 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../moa/id/auth/data/InfoboxValidationResult.java | 19 -------- .../id/auth/data/InfoboxValidationresultImpl.java | 52 ++++++---------------- .../moa/id/auth/data/InfoboxValidatorParams.java | 22 +++++---- 3 files changed, 27 insertions(+), 66 deletions(-) (limited to 'id.server/src/at/gv/egovernment/moa/id') diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java index 0ee2f21d5..b8dd7f18e 100644 --- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java +++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java @@ -1,6 +1,5 @@ package at.gv.egovernment.moa.id.auth.data; -import org.w3c.dom.Element; /** * Includes the result of an extended infobox validation. @@ -12,10 +11,6 @@ import org.w3c.dom.Element; * or to both. *
* If validation fails the implementing class has to provide a short error message. - *
- * If the corresponding infobox validator runs in the so called compatibility mode - * a pr:Persondata element to be used in the final saml:Assertion - * ({@see #getPersonData()}) * * @author Harald Bratko */ @@ -58,19 +53,5 @@ public interface InfoboxValidationResult { * @return An short error message if validation fails. */ public String getErrorMessage(); - - /** - * Returns a <pr:PersonData> element to be used in the final - * <saml:Assertion>. - *
- * If the corresponding infobox validator runs in the so called compatibility mode - * the method must return a <pr:PersonData> element to be used within - * the final <saml:Assertion> sent to the online application instead of - * the original <pr:PersonData> element derived from the <Identitylink>. - * - * @return A <pr:PersonData> element if the corresponding infobox validator - * runs in the compatibility mode, otherwise null. - */ - public Element getPersonData(); } diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java index 24eb01e95..ad2e0134f 100644 --- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java +++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java @@ -1,6 +1,5 @@ package at.gv.egovernment.moa.id.auth.data; -import org.w3c.dom.Element; /** * Default implementation of the {@link InfoboxValidationresult} interface. @@ -24,35 +23,26 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult { */ protected ExtendedSAMLAttribute[] extendedSamlAttributes_; - /** - * The <pr:PersonData> element to be used in the final - * <saml:Assertion>, if the validator runs in the - * compatibility mode. - */ - protected Element personData_; /** * Constructor. * - * @param valid - * @param extendedSamlAttributes - * @param errorMessage - * @param personData + * @param valid Global validation result. + * @param extendedSamlAttributes SAML attributes that should be appended to the final + * SAML Assertion or to the AUTH Block + * or to both. + * @param errorMessage An error message if infobox validation fails. */ public InfoboxValidationresultImpl( boolean valid, ExtendedSAMLAttribute[] extendedSamlAttributes, - String errorMessage, - Element personData) + String errorMessage) { valid_ = valid; extendedSamlAttributes_ = extendedSamlAttributes; errorMessage_ = errorMessage; - personData_ = personData; } - - /** * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult#getErrorMessage() @@ -68,13 +58,6 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult { return extendedSamlAttributes_; } - /** - * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult#getPersonData() - */ - public Element getPersonData() { - return personData_; - } - /** * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult#isValid() */ @@ -83,37 +66,28 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult { } /** - * Sets the errorMessage. + * Sets the error message if validation fails.. * - * @param errorMessage The errorMessage to set. + * @param errorMessage The error message to set. */ public void setErrorMessage(String errorMessage) { errorMessage_ = errorMessage; } /** - * Sets the extendedSamlAttributes. + * Sets the SAML attributes returned by the infobox validatior.. * - * @param extendedSamlAttributes The extendedSamlAttributes to set. + * @param extendedSamlAttributes The SAML attributes returned by the infobox validator. */ public void setExtendedSamlAttributes(ExtendedSAMLAttribute[] extendedSamlAttributes) { extendedSamlAttributes_ = extendedSamlAttributes; } /** - * Sets the <pr:PersonData> element. - * - * @param personData <pr:PersonData> to set. - */ - public void setPersonData(Element personData) { - personData_ = personData; - } - - /** - * Specify whether the result is valid or not. + * Sets validation result.. * - * @param valid True if the infobox could be validated successfully, - * otherwise false. + * @param valid True if the infobox could be validated successfully, + * otherwise false. */ public void setValid(boolean valid) { valid_ = valid; diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java index 71d675259..0f78760a8 100644 --- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java +++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java @@ -157,17 +157,23 @@ public interface InfoboxValidatorParams { public boolean getHideStammzahl(); /** - * Indicates if the infobox validator has to run in the so called compatibility mode. + * Indicates if the infobox validator has to run in the so called + * compatibility mode. *
* The compatibility mode is used when the final <saml:Assertion> - * sent to the online application should be rather built on the basis of a <pr:PersonData> - * structure returned by the infobox validator instead of the original identity link. - * This mode is mainly used within the Mandates context - * (please refer MOA-ID specification for more details). + * sent to the online application should be rather built on the basis of a + * <pr:PersonData> structure returned by the infobox validator instead + * of the <pr:PersonData> structure extracted from the original identity link. + * The compatibility mode is only available within the + * Mandates-infobox context. For all other infoboxes the return value of + * this method will be ignored. + * (please refer MOA-ID specification for more details). + *

+ * Note: In the current version the compatibility mode is not yet + * supported! * - * @return True the infobox validator has to run in the so called - * compatibility mode, otherwise false. The default value - * should be false. + * @return True if the infobox validator has to run in the so called + * compatibility mode, otherwise false. */ public boolean getCompMode(); -- cgit v1.2.3