[java-identity-provider] 07/07: IDP-1793 Use Suppliers for HttpRequest/Response

[Rod Widdowson]

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

rdw pushed a commit to branch dev/4/IDP-1793
in repository java-identity-provider.

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

commit 5c10f113ba0edb2764c6b26ca0270cb1b37a536b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 2 20:32:03 2022 +0100

    IDP-1793  Use Suppliers for HttpRequest/Response
    
    https://shibboleth.atlassian.net/browse/IDP-1793
    
    Response Encodersg ain setters for a Supplier for the HttpResponse
---
 .../net/shibboleth/idp/conf/saml-binding-config.xml    | 18 +++++++++---------
 .../messaging/impl/LibertyHTTPSOAP11EncoderTest.java   |  5 ++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-binding-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-binding-config.xml
index a9447dccd..65f4e401b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-binding-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-binding-config.xml
@@ -150,43 +150,43 @@
 
     <bean id="shibboleth.Encoders.SAML1PostEncoder"
           class="org.opensaml.saml.saml1.binding.encoding.impl.HTTPPostEncoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
           p:velocityEngine-ref="shibboleth.VelocityEngine" />
 
     <bean id="shibboleth.Encoders.SAML1ArtifactEncoder"
           class="org.opensaml.saml.saml1.binding.encoding.impl.HTTPArtifactEncoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
           p:artifactMap-ref="shibboleth.SAMLArtifactMap" />
 
     <bean id="shibboleth.Encoders.SAML1SOAPEncoder"
           class="org.opensaml.saml.saml1.binding.encoding.impl.HTTPSOAP11Encoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier" />
 
     <bean id="shibboleth.Encoders.SAML2RedirectEncoder"
           class="org.opensaml.saml.saml2.binding.encoding.impl.HTTPRedirectDeflateEncoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier" />
 
     <bean id="shibboleth.Encoders.SAML2PostEncoder"
           class="org.opensaml.saml.saml2.binding.encoding.impl.HTTPPostEncoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
           p:velocityEngine-ref="shibboleth.VelocityEngine" />
 
     <bean id="shibboleth.Encoders.SAML2PostSimpleSignEncoder"
           class="org.opensaml.saml.saml2.binding.encoding.impl.HTTPPostSimpleSignEncoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
           p:velocityEngine-ref="shibboleth.VelocityEngine" />
 
     <bean id="shibboleth.Encoders.SAML2ArtifactEncoder"
           class="org.opensaml.saml.saml2.binding.encoding.impl.HTTPArtifactEncoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
           p:artifactMap-ref="shibboleth.SAMLArtifactMap" />
           
     <bean id="shibboleth.Encoders.SAML2SOAPEncoder"
           class="org.opensaml.saml.saml2.binding.encoding.impl.HTTPSOAP11Encoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier" />
           
     <bean id="shibboleth.Encoders.IDWSFSOAPEncoder"
           class="net.shibboleth.idp.saml.saml2.profile.delegation.messaging.impl.LibertyHTTPSOAP11Encoder" scope="prototype" init-method=""
-          p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+          p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier" />
 
 </beans>
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
index ac05d4754..a3652a8f2 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
@@ -21,6 +21,9 @@ import net.shibboleth.idp.saml.saml2.profile.delegation.impl.LibertyConstants;
 
 import java.io.ByteArrayInputStream;
 import java.time.Instant;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletResponse;
 
 import org.opensaml.core.testing.XMLObjectBaseTestCase;
 import org.opensaml.core.xml.XMLObject;
@@ -93,7 +96,7 @@ public class LibertyHTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
         
         LibertyHTTPSOAP11Encoder encoder = new LibertyHTTPSOAP11Encoder();
         encoder.setMessageContext(messageContext);
-        encoder.setHttpServletResponse(response);
+        encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
         
         encoder.initialize();
         encoder.prepareContext();

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