[java-identity-provider] branch master updated: JSPT-94 - Add support classes to invert and join BiPredicates

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  ed86f4250 JSPT-94 - Add support classes to invert and join BiPredicates
ed86f4250 is described below

commit ed86f4250d473991dec4272359b271f306b74608
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 8 17:24:32 2020 -0400

    JSPT-94 - Add support classes to invert and join BiPredicates
    
    https://issues.shibboleth.net/jira/browse/JSPT-94
    
    Add utility beans.
---
 idp-conf/src/main/resources/system/conf/utilities.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/utilities.xml b/idp-conf/src/main/resources/system/conf/utilities.xml
index f5de9cb11..37e4cb25d 100644
--- a/idp-conf/src/main/resources/system/conf/utilities.xml
+++ b/idp-conf/src/main/resources/system/conf/utilities.xml
@@ -41,6 +41,13 @@
         class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="not" abstract="true" />
     <bean id="shibboleth.Conditions.OR"
         class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="or" abstract="true" />
+
+    <bean id="shibboleth.BiConditions.AND"
+        class="net.shibboleth.utilities.java.support.logic.BiPredicateSupport" factory-method="and" abstract="true" />
+    <bean id="shibboleth.BiConditions.NOT"
+        class="net.shibboleth.utilities.java.support.logic.BiPredicateSupport" factory-method="not" abstract="true" />
+    <bean id="shibboleth.BiConditions.OR"
+        class="net.shibboleth.utilities.java.support.logic.BiPredicateSupport" factory-method="or" abstract="true" />
     
     <bean id="shibboleth.Conditions.BrowserProfile"
         class="org.opensaml.profile.logic.BrowserProfilePredicate" />
@@ -51,11 +58,15 @@
     <bean id="shibboleth.Conditions.Expression"
         class="net.shibboleth.idp.profile.logic.SpringExpressionPredicate" abstract="true" />
 
+    <bean id="shibboleth.Functions.Constant"
+        class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="constant" abstract="true" />
     <bean id="shibboleth.Functions.Compose"
         class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="compose" abstract="true" />
 
-    <bean id="shibboleth.Functions.Constant"
-        class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="constant" 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" />

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