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

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Nov 20 01:02:36 2014
New Revision: 6965

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6965&view=rev
Log:
Rename functions to end with "Function".

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupFunction.java
      - copied, changed from r6955, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookup.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/LocaleLookupFunction.java
      - copied, changed from r6955, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/LocaleLookupStrategy.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupFunctionTest.java
      - copied, changed from r6955, trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupTest.java
Modified:
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeReleaseConsentFunction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookup.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/IsConsentRequiredPredicate.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/LocaleLookupStrategy.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunction.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupTest.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=6965&r1=6964&r2=6965&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 Thu Nov 20 01:02:36 2014
@@ -13,7 +13,7 @@
 
    <bean id="AttributeReleaseConsentFunction" class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseConsentFunction" scope="prototype" />
 
-    <bean id="AttributeConsentFlowDescriptorLookupStrategy" class="net.shibboleth.idp.consent.logic.FlowDescriptorLookup" scope="prototype"
+    <bean id="AttributeConsentFlowDescriptorLookupStrategy" class="net.shibboleth.idp.consent.logic.FlowDescriptorLookupFunction" scope="prototype"
         c:type="#{ T(net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor) }" />
 
     <bean id="GlobalAttributeConsentPredicate" class="net.shibboleth.idp.consent.logic.GlobalAttributeConsentPredicate" scope="prototype" />

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeReleaseConsentFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeReleaseConsentFunction.java?rev=6965&r1=6964&r2=6965&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeReleaseConsentFunction.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeReleaseConsentFunction.java Thu Nov 20 01:02:36 2014
@@ -32,7 +32,7 @@
 import net.shibboleth.idp.consent.context.ConsentContext;
 import net.shibboleth.idp.consent.flow.ConsentFlowDescriptor;
 import net.shibboleth.idp.consent.logic.AttributeValuesHashFunction;
-import net.shibboleth.idp.consent.logic.FlowDescriptorLookup;
+import net.shibboleth.idp.consent.logic.FlowDescriptorLookupFunction;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
@@ -63,7 +63,7 @@
     public AttributeReleaseConsentFunction() {
         consentContextLookupStrategy = new ChildContextLookup<>(ConsentContext.class, false);
         consentFlowDescriptorLookupStrategy =
-                new FlowDescriptorLookup<ConsentFlowDescriptor>(ConsentFlowDescriptor.class);
+                new FlowDescriptorLookupFunction<ConsentFlowDescriptor>(ConsentFlowDescriptor.class);
         attributeReleaseContextLookupStrategy = new ChildContextLookup<>(AttributeReleaseContext.class, false);
         attributeValuesHashFunction = new AttributeValuesHashFunction();
     }

Copied: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupFunction.java (from r6955, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookup.java)

[... 155 lines stripped ...]