[java-idp-testbed] branch main updated: 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 main
in repository java-idp-testbed.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=6fe18957779a7c3b752dba281b4ff288162505ce

The following commit(s) were added to refs/heads/main by this push:
     new 6fe1895  IDP-1793 Use Suppliers for HttpRequest/Response
6fe1895 is described below

commit 6fe18957779a7c3b752dba281b4ff288162505ce
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Nov 20 14:28:59 2022 +0000

    IDP-1793 Use Suppliers for HttpRequest/Response
    
    https://shibboleth.atlassian.net/browse/IDP-1793
    
    Use the new NonNullSupplier interface for our
    HttpServletXyz objects.
---
 src/main/java/sp/BaseSAMLController.java | 17 ++++++++---------
 src/main/java/sp/SAML2Controller.java    |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/sp/BaseSAMLController.java b/src/main/java/sp/BaseSAMLController.java
index 70dc944..573d0f0 100644
--- a/src/main/java/sp/BaseSAMLController.java
+++ b/src/main/java/sp/BaseSAMLController.java
@@ -17,14 +17,6 @@
 
 package sp;
 
-import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
-import net.shibboleth.shared.xml.ParserPool;
-
-import java.util.function.Supplier;
-
 import org.apache.velocity.app.VelocityEngine;
 import org.opensaml.core.xml.XMLObjectBuilderFactory;
 import org.opensaml.core.xml.io.MarshallerFactory;
@@ -42,6 +34,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
 
+import jakarta.servlet.http.HttpServletRequest;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
+import net.shibboleth.shared.xml.ParserPool;
+
 public abstract class BaseSAMLController {
 
     private Logger log = LoggerFactory.getLogger(BaseSAMLController.class);
@@ -63,7 +62,7 @@ public abstract class BaseSAMLController {
     @Autowired protected ApplicationContext applicationContext;
 
     private void setRequest(final BaseHttpServletRequestXMLMessageDecoder decoder, final HttpServletRequest servletRequest) {
-        decoder.setHttpServletRequestSupplier(new Supplier() {
+        decoder.setHttpServletRequestSupplier(new NonNullSupplier<>() {
             public HttpServletRequest get() {
                 return servletRequest;
             }
diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index a1f286c..91a5a09 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -8,7 +8,6 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.util.Map;
-import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -95,6 +94,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.net.URLBuilder;
+import net.shibboleth.shared.primitive.NonNullSupplier;
 import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.security.IdentifierGenerationStrategy;
 import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
@@ -398,7 +398,7 @@ public class SAML2Controller extends BaseSAMLController {
 	}
 
     private void setupResponse(final AbstractHttpServletResponseMessageEncoder encoder, final HttpServletResponse response) {
-        encoder.setHttpServletResponseSupplier(new Supplier() {
+        encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {
             public HttpServletResponse get() {
                 return response;
             }

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