[java-opensaml] branch main updated: IDP-1793 Use Suppliers for HttpRequest/Response
Rod Widdowson
rdw at steadingsoftware.com
Thu Nov 24 11:01:22 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=f8d93ea9fb005f70858fd44108802fd0837687e2
The following commit(s) were added to refs/heads/main by this push:
new f8d93ea9f IDP-1793 Use Suppliers for HttpRequest/Response
f8d93ea9f is described below
commit f8d93ea9fb005f70858fd44108802fd0837687e2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Nov 24 10:46:30 2022 +0000
IDP-1793 Use Suppliers for HttpRequest/Response
https://shibboleth.atlassian.net/browse/IDP-1793
NonNullSupplier becomes NonnullSupplier
---
.../AbstractHttpServletRequestMessageDecoder.java | 8 ++++----
.../servlet/HttpServletRequestMessageDecoder.java | 4 ++--
.../AbstractHttpServletResponseMessageEncoder.java | 8 ++++----
.../servlet/HttpServletResponseMessageEncoder.java | 4 ++--
.../opensaml/profile/action/AbstractProfileAction.java | 14 +++++++-------
.../impl/BaseSAMLSimpleSignatureSecurityHandler.java | 8 ++++----
.../security/impl/ReceivedEndpointSecurityHandler.java | 8 ++++----
.../WSSecuritySAML20AssertionTokenSecurityHandler.java | 8 ++++----
.../impl/ReceivedEndpointSecurityHandlerTest.java | 4 ++--
.../impl/SAMLMDClientCertAuthSecurityHandlerTest.java | 6 +++---
.../saml1/binding/decoding/impl/HTTPPostDecoderTest.java | 4 ++--
.../binding/decoding/impl/HTTPSOAP11DecoderTest.java | 4 ++--
.../saml1/binding/encoding/impl/HTTPPostEncoderTest.java | 4 ++--
.../binding/encoding/impl/HTTPSOAP11EncoderTest.java | 4 ++--
.../saml2/binding/decoding/impl/HTTPPostDecoderTest.java | 4 ++--
.../decoding/impl/HTTPRedirectDeflateDecoderTest.java | 4 ++--
.../binding/decoding/impl/HTTPSOAP11DecoderTest.java | 4 ++--
.../saml2/binding/encoding/impl/HTTPPostEncoderTest.java | 6 +++---
.../encoding/impl/HTTPPostSimpleSignEncoderTest.java | 8 ++++----
.../encoding/impl/HTTPRedirectDeflateEncoderTest.java | 14 +++++++-------
.../binding/encoding/impl/HTTPSOAP11EncoderTest.java | 4 ++--
.../impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java | 6 +++---
...2HTTPRedirectDeflateSignatureSecurityHandlerTest.java | 6 +++---
.../impl/AddSubjectConfirmationToSubjectsTest.java | 4 ++--
.../saml/saml2/profile/impl/ValidateAssertionsTest.java | 6 +++---
...SSecuritySAML20AssertionTokenSecurityHandlerTest.java | 4 ++--
.../impl/BaseClientCertAuthSecurityHandler.java | 8 ++++----
.../soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java | 4 ++--
.../soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java | 16 ++++++++--------
.../storage/impl/client/ClientStorageService.java | 6 +++---
30 files changed, 96 insertions(+), 96 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 9c0394766..2a073c655 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
@@ -24,7 +24,7 @@ import org.opensaml.messaging.decoder.MessageDecodingException;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Abstract implementation of {@link HttpServletRequestMessageDecoder}.
@@ -33,7 +33,7 @@ public abstract class AbstractHttpServletRequestMessageDecoder extends AbstractM
implements HttpServletRequestMessageDecoder {
/** Current HTTP request, if available. */
- @Nullable private NonNullSupplier<HttpServletRequest> httpServletRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** {@inheritDoc} */
@Override
@@ -49,13 +49,13 @@ public abstract class AbstractHttpServletRequestMessageDecoder extends AbstractM
*
* @return current HTTP request
*/
- @Nullable public NonNullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
/** {@inheritDoc} */
@Override
- public void setHttpServletRequestSupplier(@Nullable final NonNullSupplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
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 bee4f456b..5aa05d255 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
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.decoder.MessageDecoder;
import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
@@ -42,6 +42,6 @@ public interface HttpServletRequestMessageDecoder extends MessageDecoder {
*
* @param requestSupplier the HTTP servlet request
*/
- void setHttpServletRequestSupplier(@Nullable final NonNullSupplier<HttpServletRequest> requestSupplier);
+ void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier);
}
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 80c43ac19..41889ddfe 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
@@ -23,7 +23,7 @@ import org.opensaml.messaging.encoder.AbstractMessageEncoder;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Abstract implementation of {@link HttpServletResponseMessageEncoder}.
@@ -32,7 +32,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
implements HttpServletResponseMessageEncoder {
/** Supplier for the Current HTTP servlet response, if available. */
- @Nullable private NonNullSupplier<HttpServletResponse> httpServletResponseSupplier;
+ @Nullable private NonnullSupplier<HttpServletResponse> httpServletResponseSupplier;
/**
* {@inheritDoc}
@@ -47,7 +47,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
/**
* {@inheritDoc}
*/
- public synchronized void setHttpServletResponseSupplier(@Nullable final NonNullSupplier<HttpServletResponse> supplier) {
+ public synchronized void setHttpServletResponseSupplier(@Nullable final NonnullSupplier<HttpServletResponse> supplier) {
checkSetterPreconditions();
httpServletResponseSupplier = supplier;
}
@@ -57,7 +57,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
*
* @return the supplier for the current HTTP response or null
*/
- @Nullable public NonNullSupplier<HttpServletResponse> getHttpServletResponseSupplier() {
+ @Nullable public NonnullSupplier<HttpServletResponse> getHttpServletResponseSupplier() {
return httpServletResponseSupplier;
}
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 d208ce8a9..8c72cddc2 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
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.encoder.MessageEncoder;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* A specialization of {@link MessageEncoder} that operates on a sink message data type of {@link HttpServletResponse}.
@@ -41,7 +41,7 @@ public interface HttpServletResponseMessageEncoder extends MessageEncoder {
*
* @param responseSupplier the supplier for the HTTP servlet response
*/
- void setHttpServletResponseSupplier(@Nullable final NonNullSupplier<HttpServletResponse> responseSupplier);
+ void setHttpServletResponseSupplier(@Nullable final NonnullSupplier<HttpServletResponse> responseSupplier);
}
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 7c9b49f59..dc4332f24 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
@@ -31,7 +31,7 @@ import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.annotation.Prototype;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractInitializableComponent;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Base class for profile actions.
@@ -45,10 +45,10 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
@Nullable private String logPrefix;
/** Supplier for the Current HTTP request, if available. */
- @Nullable private NonNullSupplier<HttpServletRequest> httpServletRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Current HTTP response, if available. */
- @Nullable private NonNullSupplier<HttpServletResponse> httpServletResponseSupplier;
+ @Nullable private NonnullSupplier<HttpServletResponse> httpServletResponseSupplier;
/**
* Get the current HTTP request if available.
@@ -67,7 +67,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @return current HTTP request
*/
- @Nullable public NonNullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -76,7 +76,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final NonNullSupplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
httpServletRequestSupplier = requestSupplier;
}
@@ -98,7 +98,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @return current HTTP response supplier or null
*/
- @Nullable public NonNullSupplier<HttpServletResponse> getHttpServletResponseSupplier() {
+ @Nullable public NonnullSupplier<HttpServletResponse> getHttpServletResponseSupplier() {
return httpServletResponseSupplier;
}
@@ -107,7 +107,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
*
* @param supplier what to set
*/
- public void setHttpServletResponseSupplier(@Nullable final NonNullSupplier<HttpServletResponse> supplier) {
+ public void setHttpServletResponseSupplier(@Nullable final NonnullSupplier<HttpServletResponse> supplier) {
checkSetterPreconditions();
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 621d71e78..ef07ea026 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
@@ -50,7 +50,7 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.DecodingException;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.resolver.CriteriaSet;
/**
@@ -63,7 +63,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
@Nonnull private final Logger log = LoggerFactory.getLogger(BaseSAMLSimpleSignatureSecurityHandler.class);
/** The HttpServletRequest being processed. */
- @NonnullAfterInit private NonNullSupplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** The context representing the SAML peer entity. */
@Nullable private SAMLPeerEntityContext peerContext;
@@ -100,7 +100,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
*
* @return current HTTP request
*/
- @Nullable public NonNullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -109,7 +109,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final NonNullSupplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
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 c74a50859..34ceb27cc 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
@@ -36,7 +36,7 @@ import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.net.URIComparator;
import net.shibboleth.shared.net.URIException;
import net.shibboleth.shared.net.impl.BasicURLComparator;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.primitive.StringSupport;
/**
@@ -52,7 +52,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
@Nonnull private URIComparator uriComparator;
/** The HttpServletRequest being processed. */
- @NonnullAfterInit private NonNullSupplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Constructor. */
public ReceivedEndpointSecurityHandler() {
@@ -96,7 +96,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
*
* @return current HTTP request
*/
- @NonnullAfterInit public NonNullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @NonnullAfterInit public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -105,7 +105,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final NonNullSupplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
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 23c5ffa9c..6e6eb22ce 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
@@ -53,7 +53,7 @@ import net.shibboleth.shared.collection.LazyList;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* A security handler which resolves SAML 2.0 Assertion tokens from a SOAP envelope's
@@ -66,7 +66,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 NonNullSupplier<HttpServletRequest> httpServletRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Flag which indicates whether a failure of Assertion validation should be considered fatal. */
private boolean invalidFatal;
@@ -136,7 +136,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
*
* @return current HTTP request
*/
- @Nullable public NonNullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -145,7 +145,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final NonNullSupplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
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 e7a2037c3..f30da44d1 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
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test the received endpoint check message handler.
@@ -67,7 +67,7 @@ public class ReceivedEndpointSecurityHandlerTest extends XMLObjectBaseTestCase {
intendedDestinationUri = SAMLBindingSupport.getIntendedDestinationEndpointURI(messageContext);
handler = new ReceivedEndpointSecurityHandler();
- handler.setHttpServletRequestSupplier(new NonNullSupplier<>() { 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 99d7563c5..26de2fdd5 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
@@ -51,7 +51,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
@@ -160,7 +160,7 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
params.setCertificateNameOptions(nameOptions);
handler = new SAMLMDClientCertAuthSecurityHandler();
- handler.setHttpServletRequestSupplier(new NonNullSupplier<>() {public HttpServletRequest get() {return request;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return request;}});
handler.initialize();
messageContext = new MessageContext();
@@ -201,7 +201,7 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
handler = new SAMLMDClientCertAuthSecurityHandler();
handler.setEntityContextClass(SAMLPresenterEntityContext.class);
- handler.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 bfa7d89b6..dce429bfb 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
@@ -34,7 +34,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.DecodingException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -59,7 +59,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPPostDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 03eddbc2b..331474f7e 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
@@ -29,7 +29,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -49,7 +49,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 d19d8aa67..4838e7f0a 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
@@ -48,7 +48,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test class for SAML 1 HTTP Post encoding.
@@ -96,7 +96,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 7c13c074e..215789b95 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
@@ -38,7 +38,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test case for SAML 1.X HTTP SOAP 1.1 binding encoding.
@@ -76,7 +76,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 ccb8f2431..373b92502 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
@@ -30,7 +30,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.codec.DecodingException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test case for HTTP POST decoders.
@@ -54,7 +54,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPPostDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 9a3cb116e..3bbfe5bc5 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
@@ -42,7 +42,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.EncodingException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -67,7 +67,7 @@ public class HTTPRedirectDeflateDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPRedirectDeflateDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 6a76b2acc..c8dc035e0 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
@@ -29,7 +29,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -49,7 +49,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 7a102d3ae..e7367bfc9 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
@@ -51,7 +51,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
@@ -116,7 +116,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
@@ -210,7 +210,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 246b429c6..c7354d4f1 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
@@ -61,7 +61,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
@@ -126,7 +126,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
@@ -220,7 +220,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.setVelocityEngine(velocityEngine);
@@ -322,7 +322,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 0810e394f..27679629d 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
@@ -51,7 +51,7 @@ import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.net.URISupport;
import net.shibboleth.shared.net.URLBuilder;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Unit test for redirect encoding.
@@ -103,7 +103,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -180,7 +180,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -261,7 +261,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -352,7 +352,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -440,7 +440,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
encoder.initialize();
encoder.prepareContext();
@@ -490,7 +490,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 9d1a8662b..18b04f14c 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
@@ -40,7 +40,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test for SAML 2 SOAP 1.1 message encoder.
@@ -89,7 +89,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 ba001a645..f39b70aea 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
@@ -69,7 +69,7 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.DecodingException;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.shared.xml.XMLParserException;
import net.shibboleth.shared.xml.impl.BasicParserPool;
@@ -224,7 +224,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
handler = new SAML2HTTPPostSimpleSignSecurityHandler();
final HttpServletRequest request = buildServletRequest();
- handler.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 NonNullSupplier<>() {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 4b35ef809..53741e265 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
@@ -64,7 +64,7 @@ import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.net.URLBuilder;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
@@ -205,7 +205,7 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
handler = new SAML2HTTPRedirectDeflateSignatureSecurityHandler();
final HttpServletRequest request = buildServletRequest();
- handler.setHttpServletRequestSupplier(new NonNullSupplier<>() {public HttpServletRequest get() { return request;}});
+ handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
handler.initialize();
messageContext = new MessageContext();
@@ -330,7 +330,7 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
final HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(mc);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 8c3f615a1..7865c1b08 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
@@ -38,7 +38,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.FunctionSupport;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/** Test for {@link AddSubjectConfirmationToSubjects}. */
@@ -55,7 +55,7 @@ public class AddSubjectConfirmationToSubjectsTest extends OpenSAMLInitBaseTestCa
action = new AddSubjectConfirmationToSubjects();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new NonNullSupplier<> () {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 bf2bf3626..a0b2403a7 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
@@ -42,7 +42,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
@@ -65,8 +65,8 @@ public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
resultsMap = new HashMap<>();
action = new ValidateAssertions();
- action.setHttpServletRequestSupplier(new NonNullSupplier<>() { public MockHttpServletRequest get() {return httpRequest;}});
- action.setHttpServletResponseSupplier(new NonNullSupplier<> () {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 a6980a594..4bffb0623 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
@@ -61,7 +61,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
*
@@ -85,7 +85,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandlerTest extends XMLObject
httpServletRequest = buildHttpServletRequest();
handler = new WSSecuritySAML20AssertionTokenSecurityHandler();
- handler.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 3bd966e80..5153d0a28 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
@@ -48,7 +48,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.EncodingException;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.resolver.CriteriaSet;
/**
@@ -98,7 +98,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
@Nullable private CertificateNameOptions certNameOptions;
/** The HttpServletRequest being processed. */
- @NonnullAfterInit private NonNullSupplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/**
* Get the current HTTP request if available.
@@ -117,7 +117,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
*
* @return current HTTP request
*/
- @Nullable public NonNullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ @Nullable public NonnullSupplier<HttpServletRequest> getHttpServletRequestSupplier() {
return httpServletRequestSupplier;
}
@@ -126,7 +126,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
*
* @param requestSupplier Supplier for the current HTTP request
*/
- public void setHttpServletRequestSupplier(@Nullable final NonNullSupplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
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 f6fcf2ee6..099aef4c9 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
@@ -36,7 +36,7 @@ import com.google.common.io.Resources;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
/**
* Test basic SOAP 1.1 message decoding.
@@ -55,7 +55,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonNullSupplier<>() {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 987993454..04ccaedf9 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
@@ -49,7 +49,7 @@ import org.xmlunit.diff.Diff;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.xml.XMLParserException;
/**
@@ -83,7 +83,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -139,7 +139,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -202,7 +202,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -266,7 +266,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -299,7 +299,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -350,7 +350,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
encoder.initialize();
encoder.prepareContext();
@@ -386,7 +386,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonNullSupplier<>() {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 b0ac21122..eb434fde3 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
@@ -54,7 +54,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.net.CookieManager;
-import net.shibboleth.shared.primitive.NonNullSupplier;
+import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.security.DataExpiredException;
import net.shibboleth.shared.security.DataSealer;
@@ -99,7 +99,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
@Nonnull @NotEmpty private Map<ClientStorageSource,Integer> capabilityMap;
/** Servlet request Supplier. */
- @NonnullAfterInit private NonNullSupplier<HttpServletRequest> httpServletRequestSupplier;
+ @NonnullAfterInit private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/** Manages creation of cookies. */
@NonnullAfterInit private CookieManager cookieManager;
@@ -168,7 +168,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
*
* @param requestSupplier supplier for the servlet request in which to manage data
*/
- public void setHttpServletRequestSupplier(@Nonnull final NonNullSupplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nonnull final NonnullSupplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
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