[java-identity-provider] branch maint-4 updated: JSPT-119 - Deprecate servlet request/response proxies

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/maint-4 by this push:
     new af230ed53 JSPT-119 - Deprecate servlet request/response proxies
af230ed53 is described below

commit af230ed53444bee109632bd013583dbcd45c4655
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 10 09:23:41 2022 -0500

    JSPT-119 - Deprecate servlet request/response proxies
    
    https://shibboleth.atlassian.net/browse/JSPT-119
    
    Mark the originals lazy-init.
---
 .../src/test/resources/spring/test-flow-beans.xml         |  6 ------
 .../resources/net/shibboleth/idp/conf/global-system.xml   | 15 +++++++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml b/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
index 4753d6ae2..1027263c8 100644
--- a/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
+++ b/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
@@ -31,12 +31,6 @@
     <bean id="shibboleth.StorageService"
           class="org.opensaml.storage.impl.MemoryStorageService" />
 
-    <bean id="shibboleth.HttpServletRequest" destroy-method=""
-          class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" />
-
-    <bean id="shibboleth.HttpServletResponse"  destroy-method=""
-          class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" />
-
     <bean id="shibboleth.HttpServletRequestSupplier"
         class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestSupplier" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 870c9c152..dffa15c4e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -172,10 +172,17 @@
         <value>#{'classpath:' + T(net.shibboleth.idp.saml.xmlobject.ExtensionsConstants).SHIB_MDEXT10_SCHEMA_LOCATION }</value>
     </util:list>
 
-    <bean id="shibboleth.HttpServletRequest" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" />
-    <bean id="shibboleth.HttpServletRequestSupplier" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestSupplier" />
-    <bean id="shibboleth.HttpServletResponse" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" />
-    <bean id="shibboleth.HttpServletResponseSupplier" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseSupplier" />
+    <!-- Deprecated beans. -->
+    <bean id="shibboleth.HttpServletRequest"
+        class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" lazy-init="true" />
+    <bean id="shibboleth.HttpServletResponse"
+        class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" lazy-init="true" />
+    
+    <!-- Replacement beans. -->
+    <bean id="shibboleth.HttpServletRequestSupplier"
+        class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestSupplier" />
+    <bean id="shibboleth.HttpServletResponseSupplier"
+        class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseSupplier" />
 
     <bean id="shibboleth.DefaultResponseHeaderMap"
             class="org.springframework.beans.factory.config.MapFactoryBean">

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