[java-identity-provider] branch maint-4 updated: IDP-1793 Use Suppliers for HttpRequest/Response
Rod Widdowson
rdw at steadingsoftware.com
Thu Nov 24 10:21:05 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-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8e1617ebd7b775f0d99054af46a82de80fa03b9a
The following commit(s) were added to refs/heads/maint-4 by this push:
new 8e1617ebd IDP-1793 Use Suppliers for HttpRequest/Response
8e1617ebd is described below
commit 8e1617ebd7b775f0d99054af46a82de80fa03b9a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Nov 21 14:39:32 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.
---
.../idp/admin/impl/DoStorageOperationTest.java | 6 ++--
...ializeAdministrativeProfileContextTreeTest.java | 20 ++++++------
.../impl/StorageBackedAccountLockoutManager.java | 6 ++--
.../revocation/impl/RevocationCacheCondition.java | 6 ++--
.../ExtractDuoAuthenticationFromHeadersTest.java | 23 +++++++-------
.../idp/authn/impl/ExtractRemoteUserTest.java | 16 +++++-----
.../authn/impl/ExtractUserAgentAddressTest.java | 19 ++++++------
.../authn/impl/ExtractUserAgentIdentifierTest.java | 19 ++++++------
.../ExtractUsernamePasswordFromBasicAuthTest.java | 5 ++-
...ExtractUsernamePasswordFromFormRequestTest.java | 19 ++++++------
.../ExtractX509CertificateFromRequestTest.java | 18 +++++------
.../impl/HTPasswdCredentialValidatorTest.java | 20 ++++++------
.../authn/impl/JAASCredentialValidatorTest.java | 32 +++++++++----------
.../authn/impl/LDAPCredentialValidatorTest.java | 32 +++++++++----------
.../impl/PreserveAuthenticationFlowStateTest.java | 16 +++++-----
.../StorageBackedAccountLockoutManagerTest.java | 16 +++++-----
.../idp/authn/impl/ValidateCredentialsTest.java | 30 +++++++++---------
.../impl/ValidateExternalAuthenticationTest.java | 16 +++++-----
.../idp/authn/impl/ValidateRemoteUserTest.java | 16 +++++-----
.../authn/impl/ValidateUserAgentAddressTest.java | 16 +++++-----
.../X509CertificateCredentialValidatorTest.java | 16 +++++-----
.../proxy/impl/ExtractDiscoveryResponseTest.java | 17 +++++-----
.../spnego/impl/SPNEGOAutoLoginManagerTest.java | 10 +++---
.../idp/consent/flow/impl/ExtractConsentTest.java | 19 ++++++------
.../idp/profile/audit/impl/WriteAuditLogTest.java | 17 +++++-----
.../relyingparty/metadata/ReloadMetadataTest.java | 24 +++++++--------
.../metadata/ReloadServiceConfigurationTest.java | 22 ++++++-------
.../AddAuthenticationStatementToAssertionTest.java | 34 ++++++++++----------
.../IdPInitiatedSSORequestMessageDecoderTest.java | 12 ++++----
.../impl/DecorateDelegatedAssertionTest.java | 36 +++++++++++-----------
.../impl/LibertyHTTPSOAP11DecoderTest.java | 9 +++---
.../impl/LibertyHTTPSOAP11EncoderTest.java | 8 ++---
.../impl/AddAuthnStatementToAssertionTest.java | 36 ++++++++++------------
.../IdPInitiatedSSORequestMessageDecoderTest.java | 10 +++---
.../ProcessAssertionsForAuthenticationTest.java | 6 ++--
.../session/impl/StorageBackedSessionManager.java | 30 +++++++++---------
.../session/impl/PopulateSessionContextTest.java | 11 +++----
.../idp/session/impl/ProcessLogoutTest.java | 30 +++++++++---------
.../StorageBackedIdPSessionSerializerTest.java | 11 ++++---
.../impl/testing/SessionManagerBaseTestCase.java | 10 +++---
.../idp/ui/context/RelyingPartyUIContext.java | 6 ++--
41 files changed, 355 insertions(+), 370 deletions(-)
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
index 83c466c1b..ffb6ad2a7 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
+++ b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.text.ParseException;
import java.time.Duration;
import java.util.Map;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
@@ -46,6 +45,7 @@ import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Unit test for {@link DoStorageOperation} action.
@@ -91,8 +91,8 @@ public class DoStorageOperationTest {
mapper.setSerializationInclusion(Include.NON_NULL);
action = new DoStorageOperation();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() {return response;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() {return response;}});
action.setStorageService(storageService);
action.setObjectMapper(mapper);
action.initialize();
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
index b772a6366..5d21aed22 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
+++ b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
@@ -18,16 +18,19 @@
package net.shibboleth.idp.admin.impl;
import java.util.Collections;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.admin.BasicAdministrativeFlowDescriptor;
-import net.shibboleth.idp.profile.IdPEventIds;
-
import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.RequestContext;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import net.shibboleth.idp.admin.BasicAdministrativeFlowDescriptor;
+import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
@@ -35,12 +38,7 @@ import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.idp.ui.context.RelyingPartyUIContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.primitive.LangBearingString;
-
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link InitializeAdministrativeProfileContextTree} unit test. */
@SuppressWarnings("javadoc")
@@ -69,7 +67,7 @@ public class InitializeAdministrativeProfileContextTreeTest extends OpenSAMLInit
action = new InitializeAdministrativeProfileContextTree();
action.setAdministrativeFlowDescriptor(descriptor);
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() {
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() {
return (HttpServletRequest) src.getExternalContext().getNativeRequest();
}
});
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManager.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManager.java
index dfd967c00..cb79ce263 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManager.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManager.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.time.Duration;
import java.time.Instant;
import java.util.function.Function;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -48,6 +47,7 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import net.shibboleth.utilities.java.support.net.HttpServletSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/**
* Implementation of {@link AccountLockoutManager} interface that relies on a {@link StorageService}
@@ -390,14 +390,14 @@ public class StorageBackedAccountLockoutManager extends AbstractIdentifiableInit
public static class UsernameIPLockoutKeyStrategy implements Function<ProfileRequestContext,String> {
/** Supplier for the Servlet request to pull client ip from. **/
- @Nullable private Supplier<HttpServletRequest> httpRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpRequestSupplier;
/**
* Set the Supplier for the servlet request to read from.
*
* @param requestSupplier servlet request Supplier
*/
- public void setHttpServletRequestSupplier(@Nonnull final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nonnull final NonnullSupplier<HttpServletRequest> requestSupplier) {
httpRequestSupplier = Constraint.isNotNull(requestSupplier, "HttpServletRequest cannot be null");
}
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheCondition.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheCondition.java
index 5801b10a2..cc7bb5198 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheCondition.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheCondition.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.function.BiPredicate;
import java.util.function.Function;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -43,6 +42,7 @@ import net.shibboleth.utilities.java.support.component.AbstractInitializableComp
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 condition for login flows that checks for revocation against a {@link RevocationCache}.
@@ -71,7 +71,7 @@ public class RevocationCacheCondition extends AbstractInitializableComponent
@NonnullAfterInit private Function<ProfileRequestContext,String> principalNameLookupStrategy;
/** Servlet request Supplier. */
- @Nullable private Supplier<HttpServletRequest> httpServletRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpServletRequestSupplier;
/**
* Set {@link RevocationCache} to use.
@@ -102,7 +102,7 @@ public class RevocationCacheCondition extends AbstractInitializableComponent
*
* @param supplier servlet request interface
*/
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> supplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> supplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java
index 107c186ff..9f03ff7ec 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java
@@ -18,16 +18,6 @@
package net.shibboleth.idp.authn.duo.impl;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.duo.DuoAuthAPI;
-import net.shibboleth.idp.authn.duo.context.DuoAuthenticationContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -36,6 +26,15 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.duo.DuoAuthAPI;
+import net.shibboleth.idp.authn.duo.context.DuoAuthenticationContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link ExtractDuoAuthenticationFromHeaders} unit test. */
public class ExtractDuoAuthenticationFromHeadersTest extends BaseAuthenticationContextTest {
@@ -46,7 +45,7 @@ public class ExtractDuoAuthenticationFromHeadersTest extends BaseAuthenticationC
action = new ExtractDuoAuthenticationFromHeaders();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
@@ -66,7 +65,7 @@ public class ExtractDuoAuthenticationFromHeadersTest extends BaseAuthenticationC
@Test public void testNoAuto() throws ComponentInitializationException {
action = new ExtractDuoAuthenticationFromHeaders();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.setAutoAuthenticationSupported(false);
action.initialize();
final Event event = action.execute(src);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
index c791dbd34..183897b71 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
@@ -19,10 +19,15 @@ package net.shibboleth.idp.authn.impl;
import java.util.Arrays;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.webflow.execution.Event;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.UsernameContext;
@@ -30,12 +35,7 @@ import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.webflow.execution.Event;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link ExtractRemoteUser} unit test. */
public class ExtractRemoteUserTest extends BaseAuthenticationContextTest {
@@ -47,7 +47,7 @@ public class ExtractRemoteUserTest extends BaseAuthenticationContextTest {
action = new ExtractRemoteUser();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testNoConfig() {
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
index 0b023c336..686d037ae 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
@@ -18,15 +18,6 @@
package net.shibboleth.idp.authn.impl;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.UserAgentContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -35,6 +26,14 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.UserAgentContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link ExtractUserAgentAddress} unit test. */
public class ExtractUserAgentAddressTest extends BaseAuthenticationContextTest {
@@ -45,7 +44,7 @@ public class ExtractUserAgentAddressTest extends BaseAuthenticationContextTest {
action = new ExtractUserAgentAddress();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
index 23a12139f..c281e6254 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
@@ -18,15 +18,6 @@
package net.shibboleth.idp.authn.impl;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.UserAgentContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -35,6 +26,14 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.UserAgentContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link ExtractUserAgentIdentifier} unit test. */
public class ExtractUserAgentIdentifierTest extends BaseAuthenticationContextTest {
@@ -45,7 +44,7 @@ public class ExtractUserAgentIdentifierTest extends BaseAuthenticationContextTes
action = new ExtractUserAgentIdentifier();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
index 417708fa8..5b6542f8c 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
@@ -18,8 +18,6 @@
package net.shibboleth.idp.authn.impl;
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -36,6 +34,7 @@ import net.shibboleth.idp.authn.context.UsernamePasswordContext;
import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link ExtractUsernamePasswordFromBasicAuth} unit test. */
public class ExtractUsernamePasswordFromBasicAuthTest extends BaseAuthenticationContextTest {
@@ -47,7 +46,7 @@ public class ExtractUsernamePasswordFromBasicAuthTest extends BaseAuthentication
action = new ExtractUsernamePasswordFromBasicAuth();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}}); action.initialize();
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}}); action.initialize();
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
index 41d4ee44f..51b43cc52 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
@@ -18,15 +18,6 @@
package net.shibboleth.idp.authn.impl;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.UsernamePasswordContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -35,6 +26,14 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.UsernamePasswordContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link ExtractUsernamePasswordFromFormRequest} unit test. */
public class ExtractUsernamePasswordFromFormRequestTest extends BaseAuthenticationContextTest {
@@ -47,7 +46,7 @@ public class ExtractUsernamePasswordFromFormRequestTest extends BaseAuthenticati
action.setUsernameFieldName("j_username");
action.setPasswordFieldName("j_password");
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
index 7ba6b16f9..a0c0eb55b 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
@@ -20,17 +20,9 @@ package net.shibboleth.idp.authn.impl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.CertificateContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.security.x509.X509Support;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
@@ -38,6 +30,14 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.CertificateContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link ExtractX509CertificateFromRequest} unit test. */
public class ExtractX509CertificateFromRequestTest extends BaseAuthenticationContextTest {
@@ -93,7 +93,7 @@ public class ExtractX509CertificateFromRequestTest extends BaseAuthenticationCon
action = new ExtractX509CertificateFromRequest();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
index 863461775..8cc841a85 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
@@ -22,12 +22,19 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.function.Supplier;
import java.util.regex.Pattern;
import javax.security.auth.login.LoginException;
import javax.servlet.http.HttpServletRequest;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.webflow.execution.Event;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
@@ -39,14 +46,7 @@ import net.shibboleth.idp.authn.principal.impl.ExactPrincipalEvalPredicateFactor
import net.shibboleth.idp.authn.testing.TestPrincipal;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.webflow.execution.Event;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** Unit test for htpasswd file validation. */
public class HTPasswdCredentialValidatorTest extends BaseAuthenticationContextTest {
@@ -73,7 +73,7 @@ public class HTPasswdCredentialValidatorTest extends BaseAuthenticationContextTe
action.setClassifiedMessages(mappings);
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testMissingFlow() throws ComponentInitializationException {
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
index 560bac7c4..13dbe085f 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
@@ -26,26 +26,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.function.Supplier;
import java.util.regex.Pattern;
import javax.security.auth.login.LoginException;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
-import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
-import net.shibboleth.idp.authn.context.UsernamePasswordContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.idp.authn.principal.impl.ExactPrincipalEvalPredicateFactory;
-import net.shibboleth.idp.authn.testing.TestPrincipal;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.net.URISupport;
-
import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
@@ -60,6 +45,21 @@ import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
+import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
+import net.shibboleth.idp.authn.context.UsernamePasswordContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.authn.principal.UsernamePrincipal;
+import net.shibboleth.idp.authn.principal.impl.ExactPrincipalEvalPredicateFactory;
+import net.shibboleth.idp.authn.testing.TestPrincipal;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.net.URISupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** Unit test for JAAS validation. */
public class JAASCredentialValidatorTest extends BaseAuthenticationContextTest {
@@ -110,7 +110,7 @@ public class JAASCredentialValidatorTest extends BaseAuthenticationContextTest {
action.setClassifiedMessages(mappings);
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testMissingFlow() throws ComponentInitializationException {
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
index 6280b4107..12cf009ca 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
@@ -24,25 +24,10 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
-import java.util.function.Supplier;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.authn.AuthenticationResult;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.TemplateSearchDnResolver;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
-import net.shibboleth.idp.authn.context.AuthenticationWarningContext;
-import net.shibboleth.idp.authn.context.LDAPResponseContext;
-import net.shibboleth.idp.authn.context.UsernamePasswordContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
-
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.LdapException;
import org.ldaptive.auth.AccountState;
@@ -69,6 +54,21 @@ import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
+import net.shibboleth.idp.authn.AuthenticationResult;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.TemplateSearchDnResolver;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
+import net.shibboleth.idp.authn.context.AuthenticationWarningContext;
+import net.shibboleth.idp.authn.context.LDAPResponseContext;
+import net.shibboleth.idp.authn.context.UsernamePasswordContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.authn.principal.UsernamePrincipal;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
+
/** Unit test for LDAP credential validation. */
public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
@@ -138,7 +138,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
mappings.put("ExpiredPassword", Arrays.asList("PASSWORD_EXPIRED", "CHANGE_AFTER_RESET"));
action.setClassifiedMessages(mappings);
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testMissingFlow() throws ComponentInitializationException {
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
index e13b6a150..b78a57369 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
@@ -18,13 +18,7 @@
package net.shibboleth.idp.authn.impl;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import java.util.Arrays;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
@@ -34,6 +28,12 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link PreserveAuthenticationFlowState} unit test. */
public class PreserveAuthenticationFlowStateTest extends BaseAuthenticationContextTest {
@@ -44,7 +44,7 @@ public class PreserveAuthenticationFlowStateTest extends BaseAuthenticationConte
action = new PreserveAuthenticationFlowState();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.setParameterNames(Arrays.asList("foo", "foo2"));
action.initialize();
}
@@ -62,7 +62,7 @@ public class PreserveAuthenticationFlowStateTest extends BaseAuthenticationConte
@Test public void testNoParameters() throws ComponentInitializationException {
action = new PreserveAuthenticationFlowState();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier <> () {public HttpServletRequest get() { return request;}});
action.initialize();
final Event event = action.execute(src);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java
index cd7875844..077d10be7 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java
@@ -19,22 +19,22 @@ package net.shibboleth.idp.authn.impl;
import java.time.Duration;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.UsernamePasswordContext;
-import net.shibboleth.idp.authn.impl.StorageBackedAccountLockoutManager.UsernameIPLockoutKeyStrategy;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.storage.impl.MemoryStorageService;
import org.springframework.mock.web.MockHttpServletRequest;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.UsernamePasswordContext;
+import net.shibboleth.idp.authn.impl.StorageBackedAccountLockoutManager.UsernameIPLockoutKeyStrategy;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link StorageBackedAccountLockoutManager} unit test. */
public class StorageBackedAccountLockoutManagerTest extends BaseAuthenticationContextTest {
@@ -49,7 +49,7 @@ public class StorageBackedAccountLockoutManagerTest extends BaseAuthenticationCo
final UsernameIPLockoutKeyStrategy keyStrategy = new UsernameIPLockoutKeyStrategy();
final HttpServletRequest request = (HttpServletRequest) src.getExternalContext().getNativeRequest();
- keyStrategy.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() {return request;}});
+ keyStrategy.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return request;}});
manager = new StorageBackedAccountLockoutManager();
manager.setId("test");
manager.setStorageService(ss);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java
index 99fab93aa..e387a85fd 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java
@@ -23,23 +23,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.authn.AuthenticationResult;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.TemplateSearchDnResolver;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
-import net.shibboleth.idp.authn.context.LDAPResponseContext;
-import net.shibboleth.idp.authn.context.UsernamePasswordContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
-
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.auth.AuthenticationResultCode;
import org.ldaptive.auth.Authenticator;
@@ -59,6 +45,20 @@ import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
+import net.shibboleth.idp.authn.AuthenticationResult;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.TemplateSearchDnResolver;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.AuthenticationErrorContext;
+import net.shibboleth.idp.authn.context.LDAPResponseContext;
+import net.shibboleth.idp.authn.context.UsernamePasswordContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.authn.principal.UsernamePrincipal;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
+
/** Unit test for multiple credential validation. */
public class ValidateCredentialsTest extends BaseAuthenticationContextTest {
@@ -134,7 +134,7 @@ public class ValidateCredentialsTest extends BaseAuthenticationContextTest {
mappings.put("ExpiredPassword", Arrays.asList("PASSWORD_EXPIRED", "CHANGE_AFTER_RESET"));
action.setClassifiedMessages(mappings);
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testBadUsername() throws ComponentInitializationException {
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
index 8e2e45a77..c6180fafa 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
@@ -20,12 +20,17 @@ package net.shibboleth.idp.authn.impl;
import java.time.Instant;
import java.util.Arrays;
import java.util.Set;
-import java.util.function.Supplier;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
import javax.servlet.http.HttpServletRequest;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.webflow.execution.Event;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.ExternalAuthentication;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -37,12 +42,7 @@ import net.shibboleth.idp.authn.principal.UsernamePrincipal;
import net.shibboleth.idp.authn.testing.TestPrincipal;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.webflow.execution.Event;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link ValidateExternalAuthentication} unit test. */
public class ValidateExternalAuthenticationTest extends BaseAuthenticationContextTest {
@@ -60,7 +60,7 @@ public class ValidateExternalAuthenticationTest extends BaseAuthenticationContex
action = new ValidateExternalAuthentication();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
index 5f62bd190..696309510 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
@@ -19,23 +19,23 @@ package net.shibboleth.idp.authn.impl;
import java.util.Arrays;
-import java.util.function.Supplier;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.webflow.execution.Event;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.authn.principal.UsernamePrincipal;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.webflow.execution.Event;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link ValidateRemoteUser} unit test. */
public class ValidateRemoteUserTest extends BaseAuthenticationContextTest {
@@ -50,7 +50,7 @@ public class ValidateRemoteUserTest extends BaseAuthenticationContextTest {
action.setDeniedUsernames(Arrays.asList("foo"));
action.setMatchExpression(Pattern.compile("^ba(r|z|n)$"));
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
index 06f0048f0..7feba048a 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
@@ -22,10 +22,15 @@ import java.security.Principal;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.webflow.execution.Event;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
@@ -36,12 +41,7 @@ import net.shibboleth.idp.authn.testing.TestPrincipal;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.net.IPRange;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.webflow.execution.Event;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link ValidateUserAgentAddress} unit test. */
public class ValidateUserAgentAddressTest extends BaseAuthenticationContextTest {
@@ -56,7 +56,7 @@ public class ValidateUserAgentAddressTest extends BaseAuthenticationContextTest
"foo", Arrays.asList(IPRange.parseCIDRBlock("192.168.1.0/24"))));
action.setSupportedPrincipals(Arrays.asList(new TestPrincipal("UserAgentAuthentication")));
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
index bae3d57c5..2b534cbca 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
@@ -21,17 +21,10 @@ package net.shibboleth.idp.authn.impl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Collections;
-import java.util.function.Supplier;
import javax.security.auth.x500.X500Principal;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.security.credential.CredentialResolver;
import org.opensaml.security.credential.impl.StaticCredentialResolver;
import org.opensaml.security.trust.TrustEngine;
@@ -45,6 +38,13 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link X509CertificateCredentialValidator} unit test. */
public class X509CertificateCredentialValidatorTest extends BaseAuthenticationContextTest {
@@ -105,7 +105,7 @@ public class X509CertificateCredentialValidatorTest extends BaseAuthenticationCo
action = new ValidateCredentials();
action.setValidators(Collections.singletonList(validator));
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
index 5d6b85c0c..c3a80f6cd 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
@@ -18,14 +18,6 @@
package net.shibboleth.idp.authn.proxy.impl;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -34,6 +26,13 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link ExtractDiscoveryResponse} unit test. */
public class ExtractDiscoveryResponseTest extends BaseAuthenticationContextTest {
@@ -44,7 +43,7 @@ public class ExtractDiscoveryResponseTest extends BaseAuthenticationContextTest
action = new ExtractDiscoveryResponse();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java
index 78b9955f7..c6b02aab8 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java
@@ -20,9 +20,6 @@ package net.shibboleth.idp.authn.spnego.impl;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.net.CookieManager;
-
-import java.util.function.Supplier;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -30,6 +27,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.net.CookieManager;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
public class SPNEGOAutoLoginManagerTest {
/**
@@ -51,8 +51,8 @@ public class SPNEGOAutoLoginManagerTest {
CookieManager cookieManager = new CookieManager();
final HttpServletRequest request = req != null ? req : new MockHttpServletRequest();
final HttpServletResponse response = res != null ? res : new MockHttpServletResponse();
- cookieManager.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
- cookieManager.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() { return response;}});
+ cookieManager.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
+ cookieManager.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() { return response;}});
cookieManager.initialize();
SPNEGOAutoLoginManager autoLoginManager = new SPNEGOAutoLoginManager();
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
index 83158a123..12c66e528 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
@@ -17,13 +17,6 @@
package net.shibboleth.idp.consent.flow.impl;
-import net.shibboleth.idp.consent.Consent;
-import net.shibboleth.idp.consent.context.ConsentContext;
-import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-
-import java.util.function.Supplier;
-
import javax.servlet.http.HttpServletRequest;
import org.opensaml.profile.action.EventIds;
@@ -33,6 +26,12 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
+import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link ExtractConsent} unit test. */
public class ExtractConsentTest extends AbstractConsentActionTest {
@@ -62,7 +61,7 @@ public class ExtractConsentTest extends AbstractConsentActionTest {
@Test public void testNoUserInput() throws Exception {
action = new ExtractConsent();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
final Event event = action.execute(src);
@@ -84,7 +83,7 @@ public class ExtractConsentTest extends AbstractConsentActionTest {
httpServletRequest.setParameter(ExtractConsent.CONSENT_IDS_REQUEST_PARAMETER, "consent1");
action = new ExtractConsent();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return httpServletRequest;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return httpServletRequest;}});
action.initialize();
final Event event = action.execute(src);
@@ -107,7 +106,7 @@ public class ExtractConsentTest extends AbstractConsentActionTest {
httpServletRequest.addParameter(ExtractConsent.CONSENT_IDS_REQUEST_PARAMETER, "consent2");
action = new ExtractConsent();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return httpServletRequest;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return httpServletRequest;}});
action.initialize();
final Event event = action.execute(src);
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
index 0b5fc33c3..127693f50 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
@@ -19,19 +19,11 @@ package net.shibboleth.idp.profile.audit.impl;
import java.util.Collections;
import java.util.List;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.shibboleth.idp.profile.context.AuditContext;
-import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
@@ -39,6 +31,13 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.profile.context.AuditContext;
+import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link WriteAuditLog} unit test. */
public class WriteAuditLogTest {
@@ -62,7 +61,7 @@ public class WriteAuditLogTest {
mock.setRequestURI("/path/to/foo");
action = new FilteringAction();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return mock;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return mock;}});
}
@Test public void testNoRules() throws Exception {
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java
index 1f9607061..89fa6cb83 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java
@@ -18,17 +18,9 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata;
import java.io.IOException;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.idp.saml.profile.impl.ReloadMetadata;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-
import org.opensaml.profile.action.EventIds;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -40,6 +32,14 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.idp.saml.profile.impl.ReloadMetadata;
+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.service.ReloadableService;
+
@SuppressWarnings("javadoc")
public class ReloadMetadataTest extends AbstractMetadataParserTest {
@@ -73,7 +73,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
final ReloadMetadata action = new ReloadMetadata();
action.setMetadataResolver(service);
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return response;}});
action.initialize();
final Event event = action.execute(src);
@@ -86,7 +86,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
final ReloadMetadata action = new ReloadMetadata();
action.setMetadataResolver(service);
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return response;}});
action.initialize();
src.getFlowScope().put(ReloadMetadata.RESOLVER_ID, "foo");
@@ -101,7 +101,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
src.getFlowScope().put(ReloadMetadata.RESOLVER_ID, "fileEntity");
final ReloadMetadata action = new ReloadMetadata();
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return response;}});
action.setMetadataResolver(service);
action.initialize();
@@ -117,7 +117,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
src.getFlowScope().put(ReloadMetadata.RESOLVER_ID, "fileEntity2");
final ReloadMetadata action = new ReloadMetadata();
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return response;}});
action.setMetadataResolver(chainingservice);
action.initialize();
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
index 46b7700e5..f4d860383 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
@@ -19,18 +19,9 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata;
import java.io.IOException;
import java.time.Instant;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
-import net.shibboleth.idp.profile.impl.ReloadServiceConfiguration;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-
import org.opensaml.profile.action.EventIds;
import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -42,6 +33,15 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.profile.impl.ReloadServiceConfiguration;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.logic.FunctionSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.service.ReloadableService;
+
@SuppressWarnings("javadoc")
public class ReloadServiceConfigurationTest extends AbstractMetadataParserTest {
@@ -78,7 +78,7 @@ public class ReloadServiceConfigurationTest extends AbstractMetadataParserTest {
final MockHttpServletResponse response = new MockHttpServletResponse();
final ReloadServiceConfiguration action = new ReloadServiceConfiguration();
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return response;}});
action.setServiceLookupStrategy(FunctionSupport.constant(null));
action.initialize();
@@ -94,7 +94,7 @@ public class ReloadServiceConfigurationTest extends AbstractMetadataParserTest {
final MockHttpServletResponse response = new MockHttpServletResponse();
final ReloadServiceConfiguration action = new ReloadServiceConfiguration();
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return response;}});
action.setServiceLookupStrategy(FunctionSupport.constant(service));
action.initialize();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
index ba8c9edfd..34e93e390 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
@@ -18,30 +18,13 @@
package net.shibboleth.idp.saml.saml1.profile.impl;
import java.time.Instant;
-import java.util.function.Supplier;
import javax.security.auth.Subject;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
-import net.shibboleth.idp.authn.AuthenticationResult;
-import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
-import net.shibboleth.idp.authn.impl.DefaultAuthenticationResultSerializer;
-
import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
-import net.shibboleth.idp.saml.saml1.profile.SAML1ActionTestingSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.AuthenticationStatement;
import org.opensaml.saml.saml1.core.Response;
@@ -53,6 +36,21 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
+import net.shibboleth.idp.authn.AuthenticationResult;
+import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
+import net.shibboleth.idp.authn.impl.DefaultAuthenticationResultSerializer;
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
+import net.shibboleth.idp.saml.saml1.profile.SAML1ActionTestingSupport;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/** {@link AddAuthenticationStatementToAssertion} unit test. */
public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseTestCase {
@@ -69,7 +67,7 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
action = new AddAuthenticationStatementToAssertion();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
index 1e9965305..d4f16a0ec 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
@@ -17,13 +17,8 @@
package net.shibboleth.idp.saml.saml1.profile.impl;
-import net.shibboleth.idp.saml.profile.impl.BaseIdPInitiatedSSORequestMessageDecoder;
-import net.shibboleth.idp.saml.profile.impl.IdPInitiatedSSORequest;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import java.time.Instant;
import java.time.temporal.ChronoUnit;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
@@ -37,6 +32,11 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.saml.profile.impl.BaseIdPInitiatedSSORequestMessageDecoder;
+import net.shibboleth.idp.saml.profile.impl.IdPInitiatedSSORequest;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test the {@link IdPInitiatedSSORequestMessageDecoder}.
*/
@@ -68,7 +68,7 @@ public class IdPInitiatedSSORequestMessageDecoderTest {
request.setRequestedSessionId(sessionID);
decoder = new IdPInitiatedSSORequestMessageDecoder();
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
decoder.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
index b0e87b5e8..480880464 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
@@ -23,26 +23,9 @@ import java.security.PublicKey;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.idp.saml.saml2.profile.SAML2ActionTestingSupport;
-import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
-import net.shibboleth.idp.saml.saml2.profile.delegation.DelegationContext;
-import net.shibboleth.idp.saml.saml2.profile.delegation.DelegationRequest;
-import net.shibboleth.idp.saml.saml2.profile.delegation.impl.DecorateDelegatedAssertion.LibertySSOSEndpointURLStrategy;
-import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
-
import org.openliberty.xmltooling.disco.MetadataAbstract;
import org.openliberty.xmltooling.disco.ProviderID;
import org.openliberty.xmltooling.disco.SecurityContext;
@@ -84,6 +67,23 @@ import org.xmlunit.diff.Diff;
import com.google.common.base.Predicates;
+import net.shibboleth.idp.profile.config.ProfileConfiguration;
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.idp.saml.saml2.profile.SAML2ActionTestingSupport;
+import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
+import net.shibboleth.idp.saml.saml2.profile.delegation.DelegationContext;
+import net.shibboleth.idp.saml.saml2.profile.delegation.DelegationRequest;
+import net.shibboleth.idp.saml.saml2.profile.delegation.impl.DecorateDelegatedAssertion.LibertySSOSEndpointURLStrategy;
+import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
+import net.shibboleth.utilities.java.support.logic.FunctionSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+
/**
*
*/
@@ -180,7 +180,7 @@ public class DecorateDelegatedAssertionTest extends OpenSAMLInitBaseTestCase {
rpcContext.setRelyingPartyIdContextTree(peerContext);
action = new DecorateDelegatedAssertion();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return servletRequest;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return servletRequest;}});
action.setLibertySSOSEndpointURL(ssosURL);
action.setKeyInfoGeneratorManager(DefaultSecurityConfigurationBootstrap.buildBasicKeyInfoGeneratorManager());
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
index 19de46500..0a4f5b088 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
@@ -17,10 +17,6 @@
package net.shibboleth.idp.saml.saml2.profile.delegation.messaging.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 Liberty HTTP SOAP 1.1 decoder.
*/
@@ -50,7 +49,7 @@ public class LibertyHTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new LibertyHTTPSOAP11Decoder();
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/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
index a3652a8f2..e571a36e1 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
@@ -17,11 +17,8 @@
package net.shibboleth.idp.saml.saml2.profile.delegation.messaging.impl;
-import net.shibboleth.idp.saml.saml2.profile.delegation.impl.LibertyConstants;
-
import java.io.ByteArrayInputStream;
import java.time.Instant;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -46,6 +43,9 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.saml.saml2.profile.delegation.impl.LibertyConstants;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test for Liberty SAML 2 SOAP 1.1 message encoder.
*/
@@ -96,7 +96,7 @@ public class LibertyHTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
LibertyHTTPSOAP11Encoder encoder = new LibertyHTTPSOAP11Encoder();
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/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
index 6a7f15eac..12cf125bd 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
@@ -20,11 +20,25 @@ package net.shibboleth.idp.saml.saml2.profile.impl;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
-import java.util.function.Supplier;
import javax.security.auth.Subject;
import javax.servlet.http.HttpServletRequest;
+import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
+import org.opensaml.profile.action.EventIds;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.saml.saml2.core.Assertion;
+import org.opensaml.saml.saml2.core.AuthnContext;
+import org.opensaml.saml.saml2.core.AuthnStatement;
+import org.opensaml.saml.saml2.core.Response;
+import org.opensaml.storage.StorageSerializer;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.RequestContext;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.AuthnEventIds;
@@ -32,11 +46,6 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
import net.shibboleth.idp.authn.impl.DefaultAuthenticationResultSerializer;
import net.shibboleth.idp.authn.principal.ProxyAuthenticationPrincipal;
-
-import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
-import org.opensaml.profile.action.EventIds;
-import org.opensaml.profile.context.ProfileRequestContext;
-
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
@@ -46,18 +55,7 @@ import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
import net.shibboleth.idp.saml.saml2.profile.SAML2ActionTestingSupport;
import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.opensaml.saml.saml2.core.Assertion;
-import org.opensaml.saml.saml2.core.AuthnContext;
-import org.opensaml.saml.saml2.core.AuthnStatement;
-import org.opensaml.saml.saml2.core.Response;
-import org.opensaml.storage.StorageSerializer;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link AddAuthnStatementToAssertion} unit test. */
@SuppressWarnings("javadoc")
@@ -76,7 +74,7 @@ public class AddAuthnStatementToAssertionTest extends OpenSAMLInitBaseTestCase {
action = new AddAuthnStatementToAssertion();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
index b469499ef..0d538d91d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
@@ -17,12 +17,8 @@
package net.shibboleth.idp.saml.saml2.profile.impl;
-import net.shibboleth.idp.saml.profile.impl.BaseIdPInitiatedSSORequestMessageDecoder;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import java.time.Instant;
import java.time.temporal.ChronoUnit;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
@@ -38,6 +34,10 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.saml.profile.impl.BaseIdPInitiatedSSORequestMessageDecoder;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
+
/**
* Test the {@link IdPInitiatedSSORequestMessageDecoder}.
*/
@@ -69,7 +69,7 @@ public class IdPInitiatedSSORequestMessageDecoderTest extends XMLObjectBaseTestC
request.setRequestedSessionId(sessionID);
decoder = new IdPInitiatedSSORequestMessageDecoder();
- decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
+ decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
decoder.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java
index 95d2c302b..0a27bcf5b 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java
@@ -22,7 +22,6 @@ import java.time.Instant;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
-import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -54,6 +53,7 @@ import com.google.common.base.Predicates;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
public class ProcessAssertionsForAuthenticationTest extends OpenSAMLInitBaseTestCase {
@@ -74,8 +74,8 @@ public class ProcessAssertionsForAuthenticationTest extends OpenSAMLInitBaseTest
httpResponse = new MockHttpServletResponse();
action = new ProcessAssertionsForAuthentication();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return httpRequest;}});
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return httpResponse;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return httpRequest;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return httpResponse;}});
samlResponse = SAML2ActionTestingSupport.buildResponse();
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
index 6025f3198..467900f7b 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
@@ -26,7 +26,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.function.BiPredicate;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -34,6 +33,16 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.opensaml.storage.StorageRecord;
+import org.opensaml.storage.StorageSerializer;
+import org.opensaml.storage.StorageService;
+import org.opensaml.storage.VersionMismatchException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.session.IdPSession;
import net.shibboleth.idp.session.SPSession;
@@ -53,21 +62,12 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.net.CookieManager;
import net.shibboleth.utilities.java.support.net.HttpServletSupport;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
-import org.opensaml.storage.StorageRecord;
-import org.opensaml.storage.StorageSerializer;
-import org.opensaml.storage.StorageService;
-import org.opensaml.storage.VersionMismatchException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-
/**
* Implementation of {@link SessionManager} and {@link SessionResolver} interfaces that relies on a
* {@link StorageService} for persistence and lifecycle management of data.
@@ -122,10 +122,10 @@ public class StorageBackedSessionManager extends AbstractIdentifiableInitializab
@Nonnull private final Logger log = LoggerFactory.getLogger(StorageBackedSessionManager.class);
/** Servlet request to read from. */
- @Nullable private Supplier<HttpServletRequest> httpRequestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> httpRequestSupplier;
/** Servlet response to write to. */
- @Nullable private Supplier<HttpServletResponse> httpResponseSupplier;
+ @Nullable private NonnullSupplier<HttpServletResponse> httpResponseSupplier;
/** Inactivity timeout for sessions. */
@Nonnull private Duration sessionTimeout;
@@ -189,7 +189,7 @@ public class StorageBackedSessionManager extends AbstractIdentifiableInitializab
*
* @param requestSupplier servlet request Supplier
*/
- public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
+ public void setHttpServletRequestSupplier(@Nullable final NonnullSupplier<HttpServletRequest> requestSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpRequestSupplier = requestSupplier;
@@ -200,7 +200,7 @@ public class StorageBackedSessionManager extends AbstractIdentifiableInitializab
*
* @param responseSupplier servlet response Supplier
*/
- public void setHttpServletResponseSupplier(@Nullable final Supplier<HttpServletResponse> responseSupplier) {
+ public void setHttpServletResponseSupplier(@Nullable final NonnullSupplier<HttpServletResponse> responseSupplier) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
httpResponseSupplier = responseSupplier;
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java
index 9ccb2857e..7976734bb 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java
@@ -17,8 +17,6 @@
package net.shibboleth.idp.session.impl;
-import java.util.function.Supplier;
-
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -40,6 +38,7 @@ import net.shibboleth.idp.session.context.SessionContext;
import net.shibboleth.idp.session.impl.testing.SessionManagerBaseTestCase;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.net.HttpServletRequestResponseContext;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
/** {@link PopulateSessionContext} unit test. */
@SuppressWarnings("javadoc")
@@ -56,8 +55,8 @@ public class PopulateSessionContextTest extends SessionManagerBaseTestCase {
prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
action = new PopulateSessionContext();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.initialize();
}
@@ -125,8 +124,8 @@ public class PopulateSessionContextTest extends SessionManagerBaseTestCase {
@Test public void testAddressLookup() throws ComponentInitializationException, SessionException {
action = new PopulateSessionContext();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.setAddressLookupStrategy(input -> requestProxy.getHeader("User-Agent"));
action.initialize();
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java
index 3f658bb42..536287149 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java
@@ -20,12 +20,21 @@ package net.shibboleth.idp.session.impl;
import java.time.Duration;
import java.time.Instant;
import java.util.Collections;
-import java.util.function.Supplier;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.storage.StorageSerializer;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.RequestContext;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
@@ -40,19 +49,10 @@ import net.shibboleth.idp.session.criterion.HttpServletRequestCriterion;
import net.shibboleth.idp.session.impl.testing.SessionManagerBaseTestCase;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.net.HttpServletRequestResponseContext;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.storage.StorageSerializer;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
/** {@link ProcessLogout} unit test. */
@SuppressWarnings("javadoc")
public class ProcessLogoutTest extends SessionManagerBaseTestCase {
@@ -68,8 +68,8 @@ public class ProcessLogoutTest extends SessionManagerBaseTestCase {
prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
action = new ProcessLogout();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.initialize();
}
@@ -191,8 +191,8 @@ public class ProcessLogoutTest extends SessionManagerBaseTestCase {
@Test public void testAddressLookup() throws ComponentInitializationException, SessionException, ResolverException {
action = new ProcessLogout();
- action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
- action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
+ action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.setAddressLookupStrategy(input -> requestProxy.getHeader("User-Agent"));
action.initialize();
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
index 7262439d4..1bc42f897 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
@@ -22,7 +22,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.net.URISyntaxException;
import java.time.Instant;
-import java.util.function.Supplier;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -42,6 +42,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.net.CookieManager;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
/** {@link StorageBackedIdPSessionSerializer} unit test. */
@@ -68,17 +69,17 @@ public class StorageBackedIdPSessionSerializerTest {
CookieManager cookieManager = new CookieManager();
final HttpServletRequest request = new MockHttpServletRequest();
final HttpServletResponse response = new MockHttpServletResponse();
- cookieManager.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
- cookieManager.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() { return response;}});
+ cookieManager.setHttpServletRequestSupplier(new NonnullSupplier() {public HttpServletRequest get() { return request;}});
+ cookieManager.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() { return response;}});
cookieManager.initialize();
manager = new StorageBackedSessionManager();
manager.setStorageService(storageService);
manager.setIDGenerator(new SecureRandomIdentifierGenerationStrategy());
final HttpServletRequest requestProxy = new ThreadLocalHttpServletRequestProxy();
- manager.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() {return requestProxy;}});
+ manager.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return requestProxy;}});
final HttpServletResponse responseProxy = new ThreadLocalHttpServletResponseProxy();
- manager.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return responseProxy;}});
+ manager.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return responseProxy;}});
manager.setCookieManager(cookieManager);
manager.setId("Test Session Manager");
manager.setTrackSPSessions(true);
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/testing/SessionManagerBaseTestCase.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/testing/SessionManagerBaseTestCase.java
index 86294c842..95e889ae8 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/testing/SessionManagerBaseTestCase.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/testing/SessionManagerBaseTestCase.java
@@ -18,7 +18,6 @@
package net.shibboleth.idp.session.impl.testing;
import java.time.Duration;
-import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.servlet.http.Cookie;
@@ -40,6 +39,7 @@ import net.shibboleth.utilities.java.support.net.CookieManager;
import net.shibboleth.utilities.java.support.net.HttpServletRequestResponseContext;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
/** Base class for tests requiring a SessionManager component to be set up. */
@@ -61,16 +61,16 @@ public class SessionManagerBaseTestCase extends OpenSAMLInitBaseTestCase {
storageService.setId("TestStorageService");
CookieManager cookieManager = new CookieManager();
- cookieManager.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return requestProxy;}});
- cookieManager.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() { return responseProxy;}});
+ cookieManager.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return requestProxy;}});
+ cookieManager.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() { return responseProxy;}});
cookieManager.initialize();
sessionManager = new StorageBackedSessionManager();
sessionManager.setSessionTimeout(Duration.ofSeconds(15));
sessionManager.setStorageService(storageService);
sessionManager.setIDGenerator(new SecureRandomIdentifierGenerationStrategy());
- sessionManager.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() {return requestProxy;}});
- sessionManager.setHttpServletResponseSupplier(new Supplier<>() {public HttpServletResponse get() {return responseProxy;}});
+ sessionManager.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return requestProxy;}});
+ sessionManager.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return responseProxy;}});
sessionManager.setCookieManager(cookieManager);
sessionManager.setId("Test Session Manager");
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
index a33d7be9a..20c88698e 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Locale.LanguageRange;
import java.util.Map;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
@@ -59,6 +58,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.logic.Constraint;
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;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
@@ -89,7 +89,7 @@ public final class RelyingPartyUIContext extends BaseContext {
/** A way of getting the current HTTP request, if available.
* Used to define dynamically selected languages. */
- @Nullable private Supplier<HttpServletRequest> requestSupplier;
+ @Nullable private NonnullSupplier<HttpServletRequest> requestSupplier;
/** Constructor. */
public RelyingPartyUIContext() {
@@ -231,7 +231,7 @@ public final class RelyingPartyUIContext extends BaseContext {
* @param what what to set.
* @return this context
*/
- public RelyingPartyUIContext setRequestSupplier(@Nonnull final Supplier<HttpServletRequest> what) {
+ public RelyingPartyUIContext setRequestSupplier(@Nonnull final NonnullSupplier<HttpServletRequest> what) {
requestSupplier = what;
return this;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list