[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Dec 15 20:59:07 2014
New Revision: 7111

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7111&view=rev
Log:
IDP-511 and IDP-499 Checkpoint second try at secondary index implementation.
Consent actions now write to the storage service rather than passing to the interceptor context action to do so.
The secondary storage index is now maintained per context/flow.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentIndexedStorageAction.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/storage/CollectionSerializer.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentIndexedStorageActionTest.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/storage/CollectionSerializerTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/CreateGlobalConsentResult.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/RevokeConsent.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptorTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageActionTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/CreateGlobalConsentResultTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/CreateResultTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/ReadConsentFromStorageTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/RevokeConsentTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml?rev=7111&r1=7110&r2=7111&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml Mon Dec 15 20:59:07 2014
@@ -59,6 +59,23 @@
         c:functionA-ref="shibboleth.consent.UserStorageKey"
         c:functionB-ref="shibboleth.RelyingPartyIdLookup.Simple" />
 
+    <!--
+    Function to return the storage key of the index record containing all storage keys
+    of the storage context.
+    -->
+    <bean id="shibboleth.consent.UserStorageIndexKey"
+        class="net.shibboleth.idp.consent.logic.JoinFunction"
+        c:functionA-ref="shibboleth.consent.UserStorageKey">
+        <constructor-arg name="functionB">
+            <bean class="com.google.common.base.Functions" factory-method="constant">
+                <constructor-arg>
+                    <util:constant
+                        static-field="net.shibboleth.idp.consent.flow.storage.AbstractConsentIndexedStorageAction.DEFAULT_STORAGE_INDEX_KEY" />
+                </constructor-arg>
+            </bean>
+        </constructor-arg>
+    </bean>
+
     <!-- Action beans -->
 
     <bean id="InitializeConsentContext"
@@ -88,11 +105,13 @@
 
     <bean id="RevokeConsent"
         class="net.shibboleth.idp.consent.flow.storage.RevokeConsent" scope="prototype"
-        p:storageKeyLookupStrategy-ref="shibboleth.consent.UserAndRelyingPartyStorageKey"/>
+        p:storageKeyLookupStrategy-ref="shibboleth.consent.UserAndRelyingPartyStorageKey"
+        p:storageIndexKeyLookupStrategy-ref="shibboleth.consent.UserStorageIndexKey" />
 
     <bean id="RevokeGlobalAttributeConsent"
         class="net.shibboleth.idp.consent.flow.storage.RevokeConsent" scope="prototype"
-        p:storageKeyLookupStrategy-ref="shibboleth.consent.UserStorageKey" />
+        p:storageKeyLookupStrategy-ref="shibboleth.consent.UserStorageKey"
+        p:storageIndexKeyLookupStrategy-ref="shibboleth.consent.UserStorageIndexKey" />
 
     <bean id="ReadConsentFromStorage"
         class="net.shibboleth.idp.consent.flow.storage.ReadConsentFromStorage" scope="prototype"
@@ -114,18 +133,16 @@
 
     <bean id="CreateResult"
         class="net.shibboleth.idp.consent.flow.storage.CreateResult" scope="prototype"
-        p:storageKeyLookupStrategy-ref="shibboleth.consent.UserAndRelyingPartyStorageKey" />
+        p:storageKeyLookupStrategy-ref="shibboleth.consent.UserAndRelyingPartyStorageKey" 

[... 716 lines stripped ...]