[java-opensaml] branch maint-4 updated: IDP-1793 Use Suppliers for HttpRequest/Response
Rod Widdowson
rdw at steadingsoftware.com
Thu Nov 24 10:19:39 UTC 2022
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=26dbad767baa689be8d314ecab972af45a42d3a9
The following commit(s) were added to refs/heads/maint-4 by this push:
new 26dbad767 IDP-1793 Use Suppliers for HttpRequest/Response
26dbad767 is described below
commit 26dbad767baa689be8d314ecab972af45a42d3a9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Nov 21 14:05:00 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.
---
.../AbstractHttpServletRequestMessageDecoder.java | 21 +++++++-------
.../servlet/HttpServletRequestMessageDecoder.java | 6 ++--
.../AbstractHttpServletResponseMessageEncoder.java | 10 +++----
.../servlet/HttpServletResponseMessageEncoder.java | 6 ++--
.../profile/action/AbstractProfileAction.java | 33 +++++++++++-----------
.../BaseSAMLSimpleSignatureSecurityHandler.java | 8 +++---
.../impl/ReceivedEndpointSecurityHandler.java | 9 +++---
...ecuritySAML20AssertionTokenSecurityHandler.java | 22 +++++++--------
.../impl/ReceivedEndpointSecurityHandlerTest.java | 8 +++---
.../SAMLMDClientCertAuthSecurityHandlerTest.java | 12 ++++----
.../binding/decoding/impl/HTTPPostDecoderTest.java | 12 ++++----
.../decoding/impl/HTTPSOAP11DecoderTest.java | 9 +++---
.../binding/encoding/impl/HTTPPostEncoderTest.java | 4 +--
.../encoding/impl/HTTPSOAP11EncoderTest.java | 5 ++--
.../binding/decoding/impl/HTTPPostDecoderTest.java | 5 ++--
.../impl/HTTPRedirectDeflateDecoderTest.java | 4 +--
.../decoding/impl/HTTPSOAP11DecoderTest.java | 9 +++---
.../binding/encoding/impl/HTTPPostEncoderTest.java | 6 ++--
.../impl/HTTPPostSimpleSignEncoderTest.java | 8 +++---
.../impl/HTTPRedirectDeflateEncoderTest.java | 14 ++++-----
.../encoding/impl/HTTPSOAP11EncoderTest.java | 5 ++--
...SAML2HTTPPostSimpleSignSecurityHandlerTest.java | 18 ++++++------
...edirectDeflateSignatureSecurityHandlerTest.java | 14 ++++-----
.../impl/AddSubjectConfirmationToSubjectsTest.java | 11 ++++----
.../saml2/profile/impl/ValidateAssertionsTest.java | 6 ++--
...itySAML20AssertionTokenSecurityHandlerTest.java | 4 +--
.../impl/BaseClientCertAuthSecurityHandler.java | 8 +++---
.../decoder/http/impl/HTTPSOAP11DecoderTest.java | 4 +--
.../encoder/http/impl/HTTPSOAP11EncoderTest.java | 22 +++++++--------
.../storage/impl/client/ClientStorageService.java | 22 +++++++--------
30 files changed, 160 insertions(+), 165 deletions(-)
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java
index a0f2e8049..72f356af8 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java
@@ -17,21 +17,20 @@
package org.opensaml.messaging.decoder.servlet;
-import java.util.function.Supplier;
-
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
+import org.opensaml.messaging.decoder.AbstractMessageDecoder;
+import org.opensaml.messaging.decoder.MessageDecodingException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-import org.opensaml.messaging.decoder.AbstractMessageDecoder;
-import org.opensaml.messaging.decoder.MessageDecodingException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Abstract implementation of {@link HttpServletRequestMessageDecoder}.
@@ -43,7 +42,7 @@ public abstract class AbstractHttpServletRequestMessageDecoder extends AbstractM
private final Logger log = LoggerFactory.getLogger(AbstractHttpServletRequestMessageDecoder.class);
/** Current HTTP request, if available. */
- @Nullable private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** {@inheritDoc} */
@Override
@@ -59,7 +58,7 @@ public abstract class AbstractHttpServletRequestMessageDecoder extends AbstractM
*
* @return current HTTP request
*/
- @Nullable public Supplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -73,7 +72,7 @@ public abstract class AbstractHttpServletRequestMessageDecoder extends AbstractM
if (request != null && !(request instanceof ThreadLocalHttpServletRequestProxy)) {
log.warn("Unsafe HttpServletRequest injected");
}
- httpServletRequestSupplier = new Supplier<>() {
+ httpServletRequestSupplier = new NonnullSupplier<>() {
public HttpServletRequest get() {
return request;
};
@@ -82,7 +81,7 @@ public abstract class AbstractHttpServletRequestMessageDecoder extends AbstractM
/** {@inheritDoc} */
@Override
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletRequestSupplier = requestSupplier;
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/HttpServletRequestMessageDecoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/HttpServletRequestMessageDecoder.java
index 048fa468b..76ae76135 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/HttpServletRequestMessageDecoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/HttpServletRequestMessageDecoder.java
@@ -17,13 +17,13 @@
package org.opensaml.messaging.decoder.servlet;
-import java.util.function.Supplier;
-
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import org.opensaml.messaging.decoder.MessageDecoder;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* A specialization of {@link MessageDecoder} that operates on a source message data type of {@link HttpServletRequest}.
@@ -50,7 +50,7 @@ public interface HttpServletRequestMessageDecoder extends MessageDecoder {
*
* @param requestSupplier the HTTP servlet request
*/
- default void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ default void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
setHttpServletRequest(requestSupplier.get());
}
}
\ No newline at end of file
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java
index 5314f3060..61e9790d3 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java
@@ -17,7 +17,6 @@
package org.opensaml.messaging.encoder.servlet;
-import java.util.function.Supplier;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletResponse;
@@ -31,6 +30,7 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Abstract implementation of {@link HttpServletResponseMessageEncoder}.
@@ -42,7 +42,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
private final Logger log = LoggerFactory.getLogger(AbstractHttpServletResponseMessageEncoder.class);
/** Supplier for the Current HTTP servlet response, if available. */
- @Nullable private Supplier<HttpServletResponse> httpServletResponseSupplier;
+ @Nullable private NonnullSupplier<HttpServletResponse> httpServletResponseSupplier;
/**
* {@inheritDoc}
@@ -57,7 +57,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
/**
* {@inheritDoc}
*/
- public synchronized void setHttpServletResponseSupplier(@Nullable final Supplier<HttpServletResponse> supplier) {
+ public synchronized void setHttpServletResponseSupplier(@Nullable final NonnullSupplier<HttpServletResponse> supplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletResponseSupplier = supplier;
@@ -68,7 +68,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
*
* @return the supplier for the current HTTP response or null
*/
- @Nullable public Supplier<HttpServletResponse> getHttpServletResponseSupplier() {
+ @Nullable public NonnullSupplier<HttpServletResponse> getHttpServletResponseSupplier() {
return httpServletResponseSupplier;
}
@@ -84,7 +84,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
if (response != null && !(response instanceof ThreadLocalHttpServletResponseProxy)) {
log.warn("Unsafe HttpServletRequest injected");
}
- httpServletResponseSupplier = new Supplier<>() {
+ httpServletResponseSupplier = new NonnullSupplier<>() {
public HttpServletResponse get() {
return response;
};
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/HttpServletResponseMessageEncoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/HttpServletResponseMessageEncoder.java
index ee3f48e8c..556dae9ae 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/HttpServletResponseMessageEncoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/HttpServletResponseMessageEncoder.java
@@ -17,13 +17,13 @@
package org.opensaml.messaging.encoder.servlet;
-import java.util.function.Supplier;
-
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletResponse;
import org.opensaml.messaging.encoder.MessageEncoder;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* A specialization of {@link MessageEncoder} that operates on a sink message data type of {@link HttpServletResponse}.
*/
@@ -49,7 +49,7 @@ public interface HttpServletResponseMessageEncoder extends MessageEncoder {
*
* @param responseSupplier the supplier for the HTTP servlet response
*/
- default void setHttpServletResponseSupplier(@Nullable final Supplier<HttpServletResponse> responseSupplier) {
+ default void setHttpServletResponseSupplier(@Nullable final NonnullSupplier<HttpServletResponse> responseSupplier) {
setHttpServletResponse(responseSupplier.get());
}
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
index fb58abd76..b3d7f35f2 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
@@ -17,13 +17,18 @@
package org.opensaml.profile.action;
-import java.util.function.Supplier;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.opensaml.profile.context.EventContext;
+import org.opensaml.profile.context.MetricContext;
+import org.opensaml.profile.context.PreviousEventContext;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.utilities.java.support.annotation.Prototype;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
@@ -32,13 +37,7 @@ import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestPr
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-import org.opensaml.profile.context.EventContext;
-import org.opensaml.profile.context.MetricContext;
-import org.opensaml.profile.context.PreviousEventContext;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Base class for profile actions.
@@ -55,10 +54,10 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
@Nullable private String logPrefix;
/** Supplier for the Current HTTP request, if available. */
- @Nullable private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Current HTTP response, if available. */
- @Nullable private Supplier<HttpServletResponse> httpServletResponseSupplier;
+ @Nullable private NonnullSupplier<HttpServletResponse> httpServletResponseSupplier;
/**
* Get the current HTTP request if available.
@@ -77,7 +76,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @return current HTTP request
*/
- @Nullable public Supplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -94,7 +93,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
if (request != null && !(request instanceof ThreadLocalHttpServletRequestProxy)) {
log.warn("Unsafe HttpServletRequest injected");
}
- httpServletRequestSupplier = new Supplier<>() {
+ httpServletRequestSupplier = new NonnullSupplier<>() {
public HttpServletRequest get() {
return request;
};
@@ -106,7 +105,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletRequestSupplier = requestSupplier;
@@ -129,7 +128,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @return current HTTP response supplier or null
*/
- @Nullable public Supplier<HttpServletResponse> getHttpServletResponseSupplier() {
+ @Nullable public NonnullSupplier<HttpServletResponse> getHttpServletResponseSupplier() {
return httpServletResponseSupplier;
}
@@ -147,7 +146,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
if (response != null && !(response instanceof ThreadLocalHttpServletResponseProxy)) {
log.warn("Unsafe HttpServletRequest injected");
}
- httpServletResponseSupplier = new Supplier<>() {
+ httpServletResponseSupplier = new NonnullSupplier<>() {
public HttpServletResponse get() {
return response;
};
@@ -159,7 +158,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @param supplier what to set
*/
- public void setHttpServletResponseSupplier(@Nullable final Supplier<HttpServletResponse> supplier) {
+ public void setHttpServletResponseSupplier(@Nullable final NonnullSupplier<HttpServletResponse> supplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletResponseSupplier = supplier;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
index 73950684a..d73e2eab0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
@@ -19,7 +19,6 @@ package org.opensaml.saml.common.binding.security.impl;
import java.util.Collections;
import java.util.List;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -52,6 +51,7 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.DecodingException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
@@ -64,7 +64,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
@Nonnull private final Logger log = LoggerFactory.getLogger(BaseSAMLSimpleSignatureSecurityHandler.class);
/** The HttpServletRequest being processed. */
- @NonnullAfterInit private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** The context representing the SAML peer entity. */
@Nullable private SAMLPeerEntityContext peerContext;
@@ -101,7 +101,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
*
* @return current HTTP request
*/
- @Nullable public Supplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -110,7 +110,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletRequestSupplier = requestSupplier;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
index d9356a726..11330402e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
@@ -17,8 +17,6 @@
package org.opensaml.saml.common.binding.security.impl;
-import java.util.function.Supplier;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
@@ -39,6 +37,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.net.URIComparator;
import net.shibboleth.utilities.java.support.net.URIException;
import net.shibboleth.utilities.java.support.net.impl.BasicURLComparator;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
@@ -54,7 +53,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
@Nonnull private URIComparator uriComparator;
/** The HttpServletRequest being processed. */
- @NonnullAfterInit private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Constructor. */
public ReceivedEndpointSecurityHandler() {
@@ -99,7 +98,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
*
* @return current HTTP request
*/
- @Nullable public Supplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -108,7 +107,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletRequestSupplier = requestSupplier;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
index dc913c68b..9f80d4c36 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
@@ -20,19 +20,11 @@ package org.opensaml.saml.saml2.wssecurity.messaging.impl;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.collection.LazyList;
-import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.opensaml.core.xml.XMLObject;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.AbstractMessageHandler;
@@ -56,6 +48,14 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Strings;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.collection.LazyList;
+import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* A security handler which resolves SAML 2.0 Assertion tokens from a SOAP envelope's
* wsse:Security header, validates them, and makes them available via via the
@@ -67,7 +67,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
@Nonnull private final Logger log = LoggerFactory.getLogger(WSSecuritySAML20AssertionTokenSecurityHandler.class);
/** Supplier for the Current HTTP request, if available. */
- @Nullable private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Flag which indicates whether a failure of Assertion validation should be considered fatal. */
private boolean invalidFatal;
@@ -138,7 +138,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
*
* @return current HTTP request
*/
- @Nullable public Supplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -147,7 +147,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletRequestSupplier = requestSupplier;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
index ad97b8142..8685317a7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
@@ -19,12 +19,9 @@ package org.opensaml.saml.common.binding.security.impl;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.MessageException;
import org.opensaml.messaging.context.MessageContext;
@@ -38,6 +35,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test the received endpoint check message handler.
*/
@@ -68,7 +68,7 @@ public class ReceivedEndpointSecurityHandlerTest extends XMLObjectBaseTestCase {
intendedDestinationUri = SAMLBindingSupport.getIntendedDestinationEndpointURI(messageContext);
handler = new ReceivedEndpointSecurityHandler();
- handler.setHttpServletRequestSupplier(new Supplier<>() { public HttpServletRequest get() {return httpRequest;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() { public HttpServletRequest get() {return httpRequest;}});
handler.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
index 18973615d..8b76aaec9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
@@ -21,12 +21,9 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.MessageHandlerException;
@@ -40,8 +37,8 @@ import org.opensaml.saml.saml2.core.AuthnRequest;
import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.impl.CollectionCredentialResolver;
-import org.opensaml.security.messaging.ServletRequestX509CredentialAdapter;
import org.opensaml.security.messaging.ClientTLSSecurityParametersContext;
+import org.opensaml.security.messaging.ServletRequestX509CredentialAdapter;
import org.opensaml.security.trust.TrustEngine;
import org.opensaml.security.trust.impl.ExplicitX509CertificateTrustEngine;
import org.opensaml.security.x509.BasicX509Credential;
@@ -54,6 +51,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test SAML client cert auth message handler.
@@ -161,7 +161,7 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
params.setCertificateNameOptions(nameOptions);
handler = new SAMLMDClientCertAuthSecurityHandler();
- handler.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() {return request;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return request;}});
handler.initialize();
messageContext = new MessageContext();
@@ -202,7 +202,7 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
handler = new SAMLMDClientCertAuthSecurityHandler();
handler.setEntityContextClass(SAMLPresenterEntityContext.class);
- handler.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() {return request;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return request;}});
handler.initialize();
messageContext.removeSubcontext(SAMLPeerEntityContext.class);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
index e496e8642..a43385cc8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -19,14 +19,9 @@ package org.opensaml.saml.saml1.binding.decoding.impl;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.utilities.java.support.codec.Base64Support;
-import net.shibboleth.utilities.java.support.codec.DecodingException;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
-
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.MessageDecodingException;
@@ -38,6 +33,11 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.codec.Base64Support;
+import net.shibboleth.utilities.java.support.codec.DecodingException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+
/**
* Test case for SAML 1 HTTP POST decoding.
*/
@@ -60,7 +60,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPPostDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index 42abdda64..5593aa90e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -17,10 +17,6 @@
package org.opensaml.saml.saml1.binding.decoding.impl;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -34,6 +30,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+
/**
* Test case for SAML 1.X HTTP SOAP 1.1 message decoder.
*/
@@ -51,7 +50,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
index 16db65ceb..50905353c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -20,7 +20,6 @@ package org.opensaml.saml.saml1.binding.encoding.impl;
import java.io.ByteArrayInputStream;
import java.time.Instant;
import java.util.List;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -50,6 +49,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.codec.Base64Support;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Test class for SAML 1 HTTP Post encoding.
@@ -97,7 +97,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index 820db710e..529f081ff 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -19,7 +19,6 @@ package org.opensaml.saml.saml1.binding.encoding.impl;
import java.io.ByteArrayInputStream;
import java.time.Instant;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -40,6 +39,8 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test case for SAML 1.X HTTP SOAP 1.1 binding encoding.
*/
@@ -76,7 +77,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
index 13c658aad..60cd8a85e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -17,8 +17,6 @@
package org.opensaml.saml.saml2.binding.decoding.impl;
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -33,6 +31,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.codec.DecodingException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Test case for HTTP POST decoders.
@@ -56,7 +55,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPPostDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
index 0458347d6..db91b634f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.function.Supplier;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
@@ -44,6 +43,7 @@ import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.EncodingException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
/**
@@ -68,7 +68,7 @@ public class HTTPRedirectDeflateDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPRedirectDeflateDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index c522b2c6f..1ce1c8969 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -17,10 +17,6 @@
package org.opensaml.saml.saml2.binding.decoding.impl;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -34,6 +30,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+
/**
* Test case for HTTP SOAP 1.1 decoder.
*/
@@ -51,7 +50,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
index 3b29ddf27..0388a8b6d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -20,7 +20,6 @@ package org.opensaml.saml.saml2.binding.encoding.impl;
import java.io.ByteArrayInputStream;
import java.time.Instant;
import java.util.List;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -53,6 +52,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.codec.Base64Support;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
@@ -117,7 +117,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
@@ -211,7 +211,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
index 44e00feb4..a8e91c864 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream;
import java.security.KeyPair;
import java.time.Instant;
import java.util.List;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -63,6 +62,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.codec.Base64Support;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
@@ -127,7 +127,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
@@ -221,7 +221,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
@@ -323,7 +323,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
index 4d5398b69..bd9b7774c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream;
import java.security.KeyPair;
import java.time.Instant;
import java.util.Map;
-import java.util.function.Supplier;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
@@ -53,6 +52,7 @@ import org.w3c.dom.Document;
import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.net.URISupport;
import net.shibboleth.utilities.java.support.net.URLBuilder;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Unit test for redirect encoding.
@@ -104,7 +104,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -181,7 +181,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -262,7 +262,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -353,7 +353,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -441,7 +441,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -491,7 +491,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response2;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response2;}});
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index c6bea3155..52402253f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -19,7 +19,6 @@ package org.opensaml.saml.saml2.binding.encoding.impl;
import java.io.ByteArrayInputStream;
import java.time.Instant;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -42,6 +41,8 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test for SAML 2 SOAP 1.1 message encoder.
*/
@@ -89,7 +90,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
index f8ca8574c..d4231f209 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
@@ -25,18 +25,11 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.codec.DecodingException;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.xml.BasicParserPool;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
-
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -74,6 +67,13 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import net.shibboleth.utilities.java.support.codec.DecodingException;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.xml.BasicParserPool;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.utilities.java.support.xml.XMLParserException;
+
/**
* Test SAML simple signature via HTTP POST-SimpleSign binding
*/
@@ -224,7 +224,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
handler = new SAML2HTTPPostSimpleSignSecurityHandler();
final HttpServletRequest request = buildServletRequest();
- handler.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
handler.setParser(parserPool);
handler.setKeyInfoResolver(kiResolver);
handler.initialize();
@@ -419,7 +419,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
final HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(mc);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
encoder.setVelocityTemplateId("/templates/saml2-post-simplesign-binding.vm");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
index 1b36817c4..079c1753f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
@@ -25,15 +25,10 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.net.URLBuilder;
-
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.encoder.MessageEncodingException;
@@ -67,6 +62,11 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.net.URLBuilder;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test SAML simple signature for HTTP Redirect DEFLATE binding.
@@ -206,7 +206,7 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
handler = new SAML2HTTPRedirectDeflateSignatureSecurityHandler();
final HttpServletRequest request = buildServletRequest();
- handler.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
handler.initialize();
messageContext = new MessageContext();
@@ -331,7 +331,7 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
final HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(mc);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
try {
encoder.initialize();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
index d9b1be826..ca6886fe9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
@@ -17,11 +17,6 @@
package org.opensaml.saml.saml2.profile.impl;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
@@ -42,6 +37,10 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.logic.FunctionSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** Test for {@link AddSubjectConfirmationToSubjects}. */
@SuppressWarnings("javadoc")
@@ -57,7 +56,7 @@ public class AddSubjectConfirmationToSubjectsTest extends OpenSAMLInitBaseTestCa
action = new AddSubjectConfirmationToSubjects();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
}
@Test(expectedExceptions = ComponentInitializationException.class)
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
index e100e7f93..4f25f43cf 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -44,6 +43,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
@@ -66,8 +66,8 @@ public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
resultsMap = new HashMap<>();
action = new ValidateAssertions();
- action.setHttpServletRequestSupplier(new Supplier<>() { public MockHttpServletRequest get() {return httpRequest;}});
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return httpResponse;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<>() { public MockHttpServletRequest get() {return httpRequest;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return httpResponse;}});
action.setValidationContextBuilder(new MockAssertionValidationContextBuilder());
action.setAssertionValidator(new MockAssertionValidator(resultsMap));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
index 7afc6c410..348f4df22 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
@@ -21,7 +21,6 @@ import java.net.URISyntaxException;
import java.security.KeyException;
import java.security.cert.CertificateException;
import java.util.function.Function;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -62,6 +61,7 @@ import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
*
@@ -85,7 +85,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandlerTest extends XMLObject
httpServletRequest = buildHttpServletRequest();
handler = new WSSecuritySAML20AssertionTokenSecurityHandler();
- handler.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() {return httpServletRequest;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return httpServletRequest;}});
// do init in the test methods
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
index 19fd2d8c0..e9f52e645 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
@@ -21,7 +21,6 @@ import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -50,6 +49,7 @@ import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
@@ -99,7 +99,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
@Nullable private CertificateNameOptions certNameOptions;
/** The HttpServletRequest being processed. */
- @NonnullAfterInit private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/**
* Get the current HTTP request if available.
@@ -118,7 +118,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
*
* @return current HTTP request
*/
- @Nullable public Supplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -127,7 +127,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletRequestSupplier = requestSupplier;
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
index 8f6509821..34c6c9c1c 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
@@ -18,7 +18,6 @@
package org.opensaml.soap.soap11.decoder.http.impl;
import java.io.IOException;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
@@ -38,6 +37,7 @@ import org.testng.annotations.Test;
import com.google.common.io.Resources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Test basic SOAP 1.1 message decoding.
@@ -56,7 +56,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
// Let actual test method do the initialize(), so can set own body handler.
}
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
index e40951075..fe88f48df 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
@@ -20,13 +20,9 @@ package org.opensaml.soap.soap11.encoder.http.impl;
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.util.List;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
-
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.XMLObjectBuilder;
@@ -53,6 +49,10 @@ import org.w3c.dom.Element;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Diff;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.xml.XMLParserException;
+
/**
* Test basic SOAP 1.1 message encoding.
*/
@@ -84,7 +84,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -140,7 +140,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -203,7 +203,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -267,7 +267,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -300,7 +300,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -351,7 +351,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -387,7 +387,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new Supplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
index af5ab75a7..1ee26e9c3 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
@@ -26,7 +26,6 @@ import java.util.TimerTask;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -39,6 +38,14 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.opensaml.storage.AbstractMapBackedStorageService;
+import org.opensaml.storage.MutableStorageRecord;
+import org.opensaml.storage.StorageCapabilitiesEx;
+import org.opensaml.storage.impl.client.ClientStorageServiceStore.Factory;
+import org.opensaml.storage.impl.client.JSONClientStorageServiceStore.JSONClientStorageServiceStoreFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -48,20 +55,13 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.net.CookieManager;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.security.DataExpiredException;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import net.shibboleth.utilities.java.support.security.DataSealerKeyStrategy;
-import org.opensaml.storage.AbstractMapBackedStorageService;
-import org.opensaml.storage.MutableStorageRecord;
-import org.opensaml.storage.StorageCapabilitiesEx;
-import org.opensaml.storage.impl.client.ClientStorageServiceStore.Factory;
-import org.opensaml.storage.impl.client.JSONClientStorageServiceStore.JSONClientStorageServiceStoreFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Implementation of {@link org.opensaml.storage.StorageService} that stores data in-memory in a
* shared session attribute.
@@ -100,7 +100,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
@Nonnull @NotEmpty private Map<ClientStorageSource,Integer> capabilityMap;
/** Servlet request Supplier. */
- @NonnullAfterInit private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Manages creation of cookies. */
@NonnullAfterInit private CookieManager cookieManager;
@@ -169,7 +169,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
*
* @param requestSupplier supplier for the servlet request in which to manage data
*/
- public void setHttpServletRequestSupplier(@Nonnull final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nonnull final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpServletRequestSupplier = Constraint.isNotNull(requestSupplier, "HttpServletRequest cannot be null");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list