[java-identity-provider] branch main updated: JSPT-109 - Add scripted variants of additional functional interfaces

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=350f4826ff501e64d98045395b248f4fc75b19b0

The following commit(s) were added to refs/heads/main by this push:
       new  350f4826f JSPT-109 - Add scripted variants of additional functional interfaces
350f4826f is described below

commit 350f4826ff501e64d98045395b248f4fc75b19b0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Feb 25 10:19:43 2021 -0500

    JSPT-109 - Add scripted variants of additional functional interfaces
    
    https://issues.shibboleth.net/jira/browse/JSPT-109
    
    Add parent beans for Spring Expression variants.
---
 .../src/main/resources/net/shibboleth/idp/conf/conditions.xml       | 3 +++
 .../src/main/resources/net/shibboleth/idp/conf/functions.xml        | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
index 76f526229..2188aa290 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
@@ -35,6 +35,7 @@
         class="org.opensaml.profile.logic.BrowserProfilePredicate" />
     <bean id="shibboleth.Conditions.RelyingPartyId"
         class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate" abstract="true" />
+        
     <bean id="shibboleth.Conditions.Scripted"
         class="net.shibboleth.idp.profile.logic.ScriptedPredicate" abstract="true" />
     <bean id="shibboleth.Conditions.Expression"
@@ -42,6 +43,8 @@
 
     <bean id="shibboleth.BiConditions.Scripted"
         class="net.shibboleth.utilities.java.support.logic.ScriptedBiPredicate" abstract="true" />
+    <bean id="shibboleth.BiConditions.Expression"
+        class="net.shibboleth.ext.spring.util.SpringExpressionBiPredicate" abstract="true" />
 
     <!-- Parent bean for building custom predicates that act on a RP's EntityDescriptor. -->
     <bean id="shibboleth.Conditions.EntityDescriptor" abstract="true"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml
index 84eebd59f..a9e68aa68 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/functions.xml
@@ -32,11 +32,17 @@
 
     <bean id="shibboleth.BiFunctions.Scripted"
         class="net.shibboleth.utilities.java.support.logic.ScriptedBiFunction" abstract="true" />
+    <bean id="shibboleth.BiFunctions.Expression"
+        class="net.shibboleth.ext.spring.util.SpringExpressionBiFunction" abstract="true" />
 
     <bean id="shibboleth.Consumers.Scripted"
         class="net.shibboleth.utilities.java.support.logic.ScriptedConsumer" abstract="true" />
+    <bean id="shibboleth.Consumers.Expression"
+        class="net.shibboleth.ext.spring.util.SpringExpressionConsumer" abstract="true" />
     <bean id="shibboleth.BiConsumers.Scripted"
         class="net.shibboleth.utilities.java.support.logic.ScriptedBiConsumer" abstract="true" />
+    <bean id="shibboleth.BiConsumers.Expression"
+        class="net.shibboleth.ext.spring.util.SpringExpressionBiConsumer" abstract="true" />
 
     <!-- Parent bean for accessing relying party's metadata. -->
     <bean id="shibboleth.EntityDescriptorLookup.RelyingParty" parent="shibboleth.Functions.Compose">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.