[java-opensaml] 03/12: 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 maint-4
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=8f24285b10cf0e8f54904c221f8ffa9c3c7de1c1

commit 8f24285b10cf0e8f54904c221f8ffa9c3c7de1c1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 30 15:22:42 2022 +0100

    IDP-1793  Use Suppliers for HttpRequest/Response
    
    https://shibboleth.atlassian.net/browse/IDP-1793
    
    Refactor org.opensaml.saml.saml2.profile.impl.ValidateAssertions
    
      1) The parent class already looks after the HttpServletRequest
      so we don't need to.
---
 .../saml2/profile/impl/ValidateAssertions.java     | 34 ++--------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java
index 80b79cb6d..bbfd1d138 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java
@@ -61,9 +61,6 @@ public class ValidateAssertions extends AbstractProfileAction {
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(ValidateAssertions.class);
     
-    /** The HttpServletRequest being processed. */
-    @NonnullAfterInit private HttpServletRequest httpServletRequest;
-    
     /** Flag which indicates whether a failure of Assertion validation should be considered fatal. */
     private boolean invalidFatal;
     
@@ -144,26 +141,6 @@ public class ValidateAssertions extends AbstractProfileAction {
         validationContextBuilder = builder;
     }
 
-    /**
-     * Get the HTTP servlet request being processed.
-     * 
-     * @return the HTTP servlet request
-     */
-    @NonnullAfterInit public HttpServletRequest getHttpServletRequest() {
-        return httpServletRequest;
-    }
-
-    /**
-     * Set the HTTP servlet request being processed.
-     * 
-     * @param request The HTTP servlet request
-     */
-    public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
-        httpServletRequest = request;
-    }
-    
     /**
      * Get flag which indicates whether a failure of Assertion validation should be considered a fatal processing error.
      * 
@@ -258,13 +235,6 @@ public class ValidateAssertions extends AbstractProfileAction {
         }
     }
 
-    /** {@inheritDoc} */
-    protected void doDestroy() {
-        httpServletRequest = null;
-        
-        super.doDestroy();
-    }
-
     /** {@inheritDoc} */
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
         if (!super.doPreExecute(profileRequestContext)) {
@@ -409,7 +379,7 @@ public class ValidateAssertions extends AbstractProfileAction {
     /**
      * Class which holds data relevant to validating a SAML 2.0 Assertion.
      */
-    public class AssertionValidationInput {
+    public static class AssertionValidationInput {
         
         /** The profile request context input. */
         private ProfileRequestContext profileContext;
@@ -451,7 +421,7 @@ public class ValidateAssertions extends AbstractProfileAction {
         @Nonnull public HttpServletRequest getHttpServletRequest() {
             return httpServletRequest;
         }
-        
+
         /**
          * Get the {@link Assertion} being evaluated.
          * 

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