[java-idp-oidc] branch master updated: Convert Guava function calls to built-in beans.
Scott Cantor
cantor.2 at osu.edu
Mon Jan 13 13:23:12 EST 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=b4e31b923a0f33dde1502fa458be26589712bc29
The following commit(s) were added to refs/heads/master by this push:
new b4e31b9 Convert Guava function calls to built-in beans.
b4e31b9 is described below
commit b4e31b923a0f33dde1502fa458be26589712bc29
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 13 13:23:10 2020 -0500
Convert Guava function calls to built-in beans.
---
.../oidc-abstract-api-info-beans.xml | 3 +-
.../flows/oidc/abstract/oidc-abstract-beans.xml | 12 ++++----
.../flows/oidc/authorize/authorize-beans.xml | 34 +++++++++++++---------
.../resources/flows/oidc/token/token-beans.xml | 29 ++++++++++--------
.../resources/flows/oidc/userinfo/token-beans.xml | 12 ++++----
.../flows/oidc/webfinger/webfinger-beans.xml | 3 +-
6 files changed, 52 insertions(+), 41 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml b/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
index f0a6622..c835f0e 100644
--- a/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
@@ -40,8 +40,7 @@
<util:constant
static-field="org.geant.idpextension.oidc.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
</key>
- <bean class="com.google.common.base.Functions" factory-method="constant"
- c:value="#{getObject('OidcApiInfoFlowAuditName')}" />
+ <bean parent="shibboleth.Functions.Constant" c:_0="#{getObject('OidcApiInfoFlowAuditName')}" />
</entry>
</map>
</property>
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract/oidc-abstract-beans.xml b/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract/oidc-abstract-beans.xml
index afdeab3..b5dc648 100644
--- a/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract/oidc-abstract-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract/oidc-abstract-beans.xml
@@ -110,7 +110,7 @@
</key>
<bean class="org.geant.idpextension.oidc.audit.impl.IsPassiveAuditExtractor">
<constructor-arg>
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
c:f-ref="shibboleth.MessageContextLookup.Inbound" />
</constructor-arg>
@@ -122,7 +122,7 @@
</key>
<bean class="org.geant.idpextension.oidc.audit.impl.ForceAuthnAuditExtractor">
<constructor-arg>
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
c:f-ref="shibboleth.MessageContextLookup.Inbound" />
</constructor-arg>
@@ -134,7 +134,7 @@
</key>
<bean class="org.geant.idpextension.oidc.audit.impl.RevokedTokenAuditExtractor">
<constructor-arg>
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.MessageLookup.oidc.TokenRevocationRequest"
c:f-ref="shibboleth.MessageContextLookup.Inbound" />
</constructor-arg>
@@ -166,7 +166,7 @@
<key>
<util:constant static-field="net.shibboleth.idp.authn.AuthnAuditFields.SSO"/>
</key>
- <bean class="com.google.common.base.Functions" factory-method="compose">
+ <bean parent="shibboleth.Functions.Compose">
<constructor-arg name="g">
<bean class="net.shibboleth.idp.authn.context.navigate.PreviousResultLookupFunction" />
</constructor-arg>
@@ -179,7 +179,7 @@
<key>
<util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.USERNAME"/>
</key>
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.PrincipalNameLookup.Subject"
c:f-ref="shibboleth.ChildLookup.SubjectContext" />
</entry>
@@ -193,7 +193,7 @@
<key>
<util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.SESSION_ID"/>
</key>
- <bean class="com.google.common.base.Functions" factory-method="compose">
+ <bean parent="shibboleth.Functions.Compose">
<constructor-arg name="g">
<bean class="net.shibboleth.idp.session.context.navigate.SessionContextIDLookupFunction" />
</constructor-arg>
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/authorize/authorize-beans.xml b/idp-oidc-extension-impl/src/main/resources/flows/oidc/authorize/authorize-beans.xml
index 96d5006..6159baa 100644
--- a/idp-oidc-extension-impl/src/main/resources/flows/oidc/authorize/authorize-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/flows/oidc/authorize/authorize-beans.xml
@@ -81,13 +81,14 @@
p:configurationLookupStrategy-ref="shibboleth.oidc.SignatureValidationConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.RequestObjectSignatureValidationParametersResolver">
<property name="securityParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookupOrCreate.SecurityParameters"
c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="existingParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.MessageContextLookup.Outbound" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.MessageContextLookup.Outbound" />
</property>
</bean>
@@ -110,8 +111,9 @@
<bean id="ValidateRequestObject" class="org.geant.idpextension.oidc.profile.impl.ValidateRequestObject"
scope="prototype">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
</bean>
@@ -131,13 +133,14 @@
<ref bean="IDTokenRequested" />
</property>
<property name="securityParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookupOrCreate.SecurityParameters"
c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="existingParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.MessageContextLookup.Outbound" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.MessageContextLookup.Outbound" />
</property>
</bean>
@@ -272,8 +275,9 @@
<bean id="AddAccessTokenHashToIDToken"
class="org.geant.idpextension.oidc.profile.impl.AddAccessTokenHashToIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="activationCondition">
<bean parent="shibboleth.Conditions.AND">
@@ -290,8 +294,9 @@
<bean id="AddAuthorizationCodeHashToIDToken"
class="org.geant.idpextension.oidc.profile.impl.AddAuthorizationCodeHashToIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="activationCondition">
<bean parent="shibboleth.Conditions.AND">
@@ -307,8 +312,9 @@
<bean id="SignIDToken" class="org.geant.idpextension.oidc.profile.impl.SignIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="activationCondition">
<ref bean="IDTokenRequested" />
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/flows/oidc/token/token-beans.xml
index 0e675c7..fab78fe 100644
--- a/idp-oidc-extension-impl/src/main/resources/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/flows/oidc/token/token-beans.xml
@@ -45,8 +45,9 @@
class="org.geant.idpextension.oidc.profile.impl.ValidateEndpointAuthentication" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:replayCache-ref="shibboleth.ReplayCache">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
</bean>
@@ -118,13 +119,14 @@
p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.IDTokenSignatureSigningParametersResolver">
<property name="securityParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookupOrCreate.SecurityParameters"
c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="existingParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.MessageContextLookup.Outbound" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.MessageContextLookup.Outbound" />
</property>
</bean>
@@ -183,8 +185,9 @@
<bean id="AddAccessTokenHashToIDToken"
class="org.geant.idpextension.oidc.profile.impl.AddAccessTokenHashToIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
</bean>
@@ -193,8 +196,9 @@
<bean id="SignIDToken" class="org.geant.idpextension.oidc.profile.impl.SignIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
</bean>
@@ -233,13 +237,14 @@
p:configurationLookupStrategy-ref="shibboleth.oidc.SignatureValidationConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.TokenEndpointJwtSignatureValidationParametersResolver">
<property name="securityParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookupOrCreate.SecurityParameters"
c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="existingParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.MessageContextLookup.Outbound" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.MessageContextLookup.Outbound" />
</property>
</bean>
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/userinfo/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/flows/oidc/userinfo/token-beans.xml
index 5153fce..a45a848 100644
--- a/idp-oidc-extension-impl/src/main/resources/flows/oidc/userinfo/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/flows/oidc/userinfo/token-beans.xml
@@ -73,13 +73,14 @@
p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.UserInfoSignatureSigningParametersResolver">
<property name="securityParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
+ <bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookupOrCreate.SecurityParameters"
c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
<property name="existingParametersContextLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.MessageContextLookup.Outbound" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.MessageContextLookup.Outbound" />
</property>
</bean>
@@ -126,8 +127,9 @@
<bean id="SignUserInfoResponse" class="org.geant.idpextension.oidc.profile.impl.SignUserInfoResponse"
scope="prototype">
<property name="securityParametersLookupStrategy">
- <bean class="com.google.common.base.Functions" factory-method="compose"
- c:g-ref="shibboleth.ChildLookup.SecurityParameters" c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+ c:f-ref="shibboleth.ChildLookup.RelyingParty" />
</property>
</bean>
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/webfinger/webfinger-beans.xml b/idp-oidc-extension-impl/src/main/resources/flows/oidc/webfinger/webfinger-beans.xml
index 9afba83..d8b9945 100644
--- a/idp-oidc-extension-impl/src/main/resources/flows/oidc/webfinger/webfinger-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/flows/oidc/webfinger/webfinger-beans.xml
@@ -56,8 +56,7 @@
<util:constant
static-field="org.geant.idpextension.oidc.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
</key>
- <bean class="com.google.common.base.Functions" factory-method="constant"
- c:value="#{getObject('FlowAuditName')}" />
+ <bean parent="shibboleth.Functions.Constant" c:value="#{getObject('FlowAuditName')}" />
</entry>
</map>
</property>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list