[java-identity-provider COMMIT] in /trunk/idp-consent: pom.xml src/main/java/net/shibboleth/idp/consent/flow/Abstract...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Nov 18 18:54:19 2014
New Revision: 6945

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

Added:
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ar/AttributeReleaseFlowDescriptorTest.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ar/CreateGlobalAttributeReleaseResultTest.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ar/ReleaseAttributesTest.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageActionTest.java   (with props)
Modified:
    trunk/idp-consent/pom.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/AbstractConsentAction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AbstractAttributeReleaseAction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateGlobalAttributeReleaseResult.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/ReleaseAttributes.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageAction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/CreateResult.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/ReadConsentFromStorage.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/RevokeConsent.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/UpdateStorageIndex.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ar/AbstractAttributeReleaseActionTest.java

Modified: trunk/idp-consent/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/pom.xml?rev=6945&r1=6944&r2=6945&view=diff
==============================================================================
--- trunk/idp-consent/pom.xml (original)
+++ trunk/idp-consent/pom.xml Tue Nov 18 18:54:19 2014
@@ -54,6 +54,12 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-storage-impl</artifactId>
+            <version>${opensaml.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Managed Dependencies -->
     </dependencies>

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/AbstractConsentAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/AbstractConsentAction.java?rev=6945&r1=6944&r2=6945&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/AbstractConsentAction.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/AbstractConsentAction.java Tue Nov 18 18:54:19 2014
@@ -37,7 +37,7 @@
 /**
  * Base class for consent actions.
  * 
- * Ensures that
+ * Ensures that :
  * <ul>
  * <li>a consent context exists in the profile request context</li>
  * <li>the flow descriptor is a {@link ConsentFlowDescriptor}</li>

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AbstractAttributeReleaseAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AbstractAttributeReleaseAction.java?rev=6945&r1=6944&r2=6945&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AbstractAttributeReleaseAction.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AbstractAttributeReleaseAction.java Tue Nov 18 18:54:19 2014
@@ -25,6 +25,7 @@
 import net.shibboleth.idp.consent.flow.AbstractConsentAction;
 import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.profile.action.ActionSupport;
@@ -41,12 +42,12 @@
  * 
  * Ensures that
  * <ul>
- * <li>the {@link ProfileInterceptorContext} is a {@link AttributeReleaseContext}</li>
- * <li>the flow descriptor is a {@link AttributeReleaseFlowDescriptor}</li>
- * <li>an {@link AttributeContext} is available from the {@link ProfileRequestContext}
+ * <li>an {@link AttributeReleaseContext} is available from the {@link ProfileRequestContext}</li>
+ * <li>the interceptor attempted flow is an {@link AttributeReleaseFlowDescriptor}</li>
+ * <li>an {@link AttributeContext} is available from the {@link ProfileRequestContext}</li>
  * </ul>
  * 
- * TODO details
+ * @pre See above.
  */
 public abstract class AbstractAttributeReleaseAction extends AbstractConsentAction {
 

[... 471 lines stripped ...]