[java-identity-provider COMMIT] in /trunk/idp-consent/src: main/java/net/shibboleth/idp/consent/logic/MessageSourceCo...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Nov 20 21:43:56 2014
New Revision: 6979

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6979&view=rev
Log:
Checkpoint consent cleanup and tests.

Added:
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunctionTest.java   (with props)
Modified:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunction.java

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunction.java?rev=6979&r1=6978&r2=6979&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunction.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunction.java Thu Nov 20 21:43:56 2014
@@ -28,6 +28,7 @@
 import net.shibboleth.idp.consent.flow.ConsentFlowDescriptor;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -154,6 +155,19 @@
         localeLookupStrategy = Constraint.isNotNull(strategy, "Locale lookup strategy cannot be null");
     }
 
+    /** {@inheritDoc} */
+    @Override protected void doInitialize() throws ComponentInitializationException {
+        super.doInitialize();
+
+        if (consentIdMessageCode == null) {
+            throw new ComponentInitializationException("Consent ID message code cannot be null");
+        }
+
+        if (consentValueMessageCode == null) {
+            throw new ComponentInitializationException("Consent value message code cannot be null");
+        }
+    }
+
     /**
      * Get the consent id.
      *