[java-identity-provider] branch main updated: Add beans for new scripted function/predicate variants.

[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=313aad210a394c52df50645fae02360f5cfc2689

The following commit(s) were added to refs/heads/main by this push:
       new  313aad210 Add beans for new scripted function/predicate variants.
313aad210 is described below

commit 313aad210a394c52df50645fae02360f5cfc2689
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 24 14:57:59 2021 -0500

    Add beans for new scripted function/predicate variants.
---
 .../resources/net/shibboleth/idp/conf/conditions.xml     |  3 +++
 .../main/resources/net/shibboleth/idp/conf/functions.xml | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

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 1289b0e21..76f526229 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
@@ -40,6 +40,9 @@
     <bean id="shibboleth.Conditions.Expression"
         class="net.shibboleth.idp.profile.logic.SpringExpressionPredicate" abstract="true" />
 
+    <bean id="shibboleth.BiConditions.Scripted"
+        class="net.shibboleth.utilities.java.support.logic.ScriptedBiPredicate" abstract="true" />
+
     <!-- Parent bean for building custom predicates that act on a RP's EntityDescriptor. -->
     <bean id="shibboleth.Conditions.EntityDescriptor" abstract="true"
         class="net.shibboleth.utilities.java.support.logic.StrategyIndirectedPredicate"
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 58d10db6c..84eebd59f 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
@@ -20,15 +20,23 @@
     <bean id="shibboleth.Functions.PredicateDriven"
         class="net.shibboleth.utilities.java.support.logic.PredicateDrivenFunction" abstract="true" />
 
+    <bean id="shibboleth.Functions.Scripted"
+        class="net.shibboleth.utilities.java.support.logic.ScriptedFunction" abstract="true" />
+    <bean id="shibboleth.Functions.Expression"
+        class="net.shibboleth.ext.spring.util.SpringExpressionFunction" abstract="true" />
+
     <bean id="shibboleth.BiFunctions.Constant"
         class="net.shibboleth.utilities.java.support.logic.BiFunctionSupport" factory-method="constant" abstract="true" />
     <bean id="shibboleth.BiFunctions.Compose"
         class="net.shibboleth.utilities.java.support.logic.BiFunctionSupport" factory-method="compose" abstract="true" />
 
-    <bean id="shibboleth.Functions.Scripted"
-        class="net.shibboleth.utilities.java.support.logic.ScriptedFunction" abstract="true" />
-    <bean id="shibboleth.Functions.Expression"
-        class="net.shibboleth.ext.spring.util.SpringExpressionFunction" abstract="true" />
+    <bean id="shibboleth.BiFunctions.Scripted"
+        class="net.shibboleth.utilities.java.support.logic.ScriptedBiFunction" abstract="true" />
+
+    <bean id="shibboleth.Consumers.Scripted"
+        class="net.shibboleth.utilities.java.support.logic.ScriptedConsumer" abstract="true" />
+    <bean id="shibboleth.BiConsumers.Scripted"
+        class="net.shibboleth.utilities.java.support.logic.ScriptedBiConsumer" 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.