[java-identity-provider] branch main updated: Move Spring expression support to new package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 16:48:40 UTC 2022
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=ec72cbba35e8574270fa54d3c6974879721bed06
The following commit(s) were added to refs/heads/main by this push:
new ec72cbba3 Move Spring expression support to new package.
ec72cbba3 is described below
commit ec72cbba35e8574270fa54d3c6974879721bed06
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 12:48:38 2022 -0400
Move Spring expression support to new package.
---
.../src/main/resources/net/shibboleth/idp/conf/audit-system.xml | 8 ++++----
.../src/main/resources/net/shibboleth/idp/conf/conditions.xml | 2 +-
.../src/main/resources/net/shibboleth/idp/conf/functions.xml | 8 ++++----
.../shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml | 2 +-
.../context/navigate/SpringExpressionContextLookupFunction.java | 2 +-
.../shibboleth/idp/profile/logic/SpringExpressionPredicate.java | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
index 25acb4a85..ff0243112 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/audit-system.xml
@@ -142,7 +142,7 @@
<constructor-arg name="g">
<bean class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="forPredicate">
<constructor-arg>
- <bean class="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
+ <bean class="net.shibboleth.shared.spring.expression.SpringExpressionPredicate"
c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).isMessageSigned(#input) : false" />
</constructor-arg>
</bean>
@@ -374,7 +374,7 @@
<constructor-arg name="g">
<bean class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="forPredicate">
<constructor-arg>
- <bean class="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
+ <bean class="net.shibboleth.shared.spring.expression.SpringExpressionPredicate"
c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).isMessageSigned(#input) : false" />
</constructor-arg>
</bean>
@@ -676,7 +676,7 @@
<constructor-arg name="g">
<bean class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="forPredicate">
<constructor-arg>
- <bean class="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
+ <bean class="net.shibboleth.shared.spring.expression.SpringExpressionPredicate"
c:_0="#input != null and #input.getAssertionEncryptionParameters() != null" />
</constructor-arg>
</bean>
@@ -957,7 +957,7 @@
</key>
<bean parent="shibboleth.Functions.Compose">
<constructor-arg name="g">
- <bean class="net.shibboleth.ext.spring.util.SpringExpressionFunction"
+ <bean class="net.shibboleth.shared.spring.expression.SpringExpressionFunction"
p:inputType="org.opensaml.messaging.context.MessageContext" p:outputType="java.net.URI" p:hideExceptions="true"
c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).getEndpointURL(#input) : null" />
</constructor-arg>
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 41478716e..548d9000e 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
@@ -44,7 +44,7 @@
<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" />
+ class="net.shibboleth.shared.spring.expression.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 bf509201e..d5fc6b44c 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
@@ -23,7 +23,7 @@
<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" />
+ class="net.shibboleth.shared.spring.expression.SpringExpressionFunction" abstract="true" />
<bean id="shibboleth.BiFunctions.Constant"
class="net.shibboleth.utilities.java.support.logic.BiFunctionSupport" factory-method="constant" abstract="true" />
@@ -33,16 +33,16 @@
<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" />
+ class="net.shibboleth.shared.spring.expression.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" />
+ class="net.shibboleth.shared.spring.expression.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" />
+ class="net.shibboleth.shared.spring.expression.SpringExpressionBiConsumer" abstract="true" />
<!-- Parent bean for accessing relying party's metadata. -->
<bean id="shibboleth.EntityDescriptorLookup.RelyingParty" parent="shibboleth.Functions.Compose">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
index 22c4f45b3..4a8fd4cfe 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
@@ -29,7 +29,7 @@
static-field="org.opensaml.saml.saml2.metadata.SPSSODescriptor.DEFAULT_ELEMENT_NAME" />
<bean id="shibboleth.OutgoingBindingsLookupStrategy"
- class="net.shibboleth.ext.spring.util.SpringExpressionFunction"
+ class="net.shibboleth.shared.spring.expression.SpringExpressionFunction"
c:expression="#custom[#input.isBrowserProfile() ? 'full' : 'soap']">
<property name="customObject">
<map>
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java
index ba7a87f75..14a22d13e 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java
@@ -20,7 +20,7 @@ package net.shibboleth.idp.profile.context.navigate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.ext.spring.util.SpringExpressionFunction;
+import net.shibboleth.shared.spring.expression.SpringExpressionFunction;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SpringExpressionPredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SpringExpressionPredicate.java
index 86f10dfef..9b4fd255a 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SpringExpressionPredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SpringExpressionPredicate.java
@@ -32,7 +32,7 @@ import org.springframework.expression.EvaluationContext;
* @author Daniel Lutz
*/
public class SpringExpressionPredicate
- extends net.shibboleth.ext.spring.util.SpringExpressionPredicate<ProfileRequestContext> {
+ extends net.shibboleth.shared.spring.expression.SpringExpressionPredicate<ProfileRequestContext> {
/**
* Constructor.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list