[java-opensaml] branch main updated: Pre-clean for annotations
Rod Widdowson
rdw at steadingsoftware.com
Fri Nov 25 13:59:45 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=34d38e40bf5dd78c3d893cf9052d58702cb29d74
The following commit(s) were added to refs/heads/main by this push:
new 34d38e40b Pre-clean for annotations
34d38e40b is described below
commit 34d38e40bf5dd78c3d893cf9052d58702cb29d74
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Nov 25 13:59:25 2022 +0000
Pre-clean for annotations
Use the new test class ConstantSupplier rather than an inline
instantiation (which would require annotation).
---
.../impl/ReceivedEndpointSecurityHandlerTest.java | 5 ++---
.../impl/SAMLMDClientCertAuthSecurityHandlerTest.java | 7 +++----
.../saml1/binding/decoding/impl/HTTPPostDecoderTest.java | 5 ++---
.../binding/decoding/impl/HTTPSOAP11DecoderTest.java | 5 ++---
.../saml1/binding/encoding/impl/HTTPPostEncoderTest.java | 5 ++---
.../binding/encoding/impl/HTTPSOAP11EncoderTest.java | 5 ++---
.../saml2/binding/decoding/impl/HTTPPostDecoderTest.java | 5 ++---
.../decoding/impl/HTTPRedirectDeflateDecoderTest.java | 5 ++---
.../binding/decoding/impl/HTTPSOAP11DecoderTest.java | 5 ++---
.../saml2/binding/encoding/impl/HTTPPostEncoderTest.java | 7 +++----
.../encoding/impl/HTTPPostSimpleSignEncoderTest.java | 9 ++++-----
.../encoding/impl/HTTPRedirectDeflateEncoderTest.java | 14 +++++++-------
.../binding/encoding/impl/HTTPSOAP11EncoderTest.java | 5 ++---
.../impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java | 9 ++++-----
...2HTTPRedirectDeflateSignatureSecurityHandlerTest.java | 7 +++----
.../impl/AddSubjectConfirmationToSubjectsTest.java | 5 ++---
.../saml/saml2/profile/impl/ValidateAssertionsTest.java | 7 +++----
...SSecuritySAML20AssertionTokenSecurityHandlerTest.java | 5 ++---
opensaml-soap-impl/pom.xml | 6 +++++-
.../soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java | 5 ++---
.../soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java | 16 ++++++++--------
.../opensaml/storage/impl/MemoryStorageServiceTest.java | 1 -
22 files changed, 64 insertions(+), 79 deletions(-)
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
index f30da44d1..8c9aa338a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
@@ -33,9 +33,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test the received endpoint check message handler.
@@ -67,7 +66,7 @@ public class ReceivedEndpointSecurityHandlerTest extends XMLObjectBaseTestCase {
intendedDestinationUri = SAMLBindingSupport.getIntendedDestinationEndpointURI(messageContext);
handler = new ReceivedEndpointSecurityHandler();
- handler.setHttpServletRequestSupplier(new NonnullSupplier<>() { public HttpServletRequest get() {return httpRequest;}});
+ handler.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
handler.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
index 26de2fdd5..7d35a90c9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
@@ -49,9 +49,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
@@ -160,7 +159,7 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
params.setCertificateNameOptions(nameOptions);
handler = new SAMLMDClientCertAuthSecurityHandler();
- handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return request;}});
+ handler.setHttpServletRequestSupplier(new ConstantSupplier<>(request));
handler.initialize();
messageContext = new MessageContext();
@@ -201,7 +200,7 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
handler = new SAMLMDClientCertAuthSecurityHandler();
handler.setEntityContextClass(SAMLPresenterEntityContext.class);
- handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return request;}});
+ handler.setHttpServletRequestSupplier(new ConstantSupplier<>(request));
handler.initialize();
messageContext.removeSubcontext(SAMLPeerEntityContext.class);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
index dce429bfb..5cd6458ca 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -31,10 +31,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.DecodingException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -59,7 +58,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPPostDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index 331474f7e..321915944 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -28,8 +28,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -49,7 +48,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
index 4838e7f0a..78bd5b795 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -46,9 +46,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test class for SAML 1 HTTP Post encoding.
@@ -96,7 +95,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.setVelocityEngine(velocityEngine);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index 215789b95..c034be666 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -37,8 +37,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test case for SAML 1.X HTTP SOAP 1.1 binding encoding.
@@ -76,7 +75,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
index 373b92502..a05e96171 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -28,9 +28,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.codec.DecodingException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test case for HTTP POST decoders.
@@ -54,7 +53,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPPostDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
index 3bbfe5bc5..bfda59c08 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoderTest.java
@@ -39,10 +39,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.EncodingException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -67,7 +66,7 @@ public class HTTPRedirectDeflateDecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPRedirectDeflateDecoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index c8dc035e0..c12073787 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -28,8 +28,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -49,7 +48,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
decoder.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
index e7367bfc9..b1c2caf6c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -49,9 +49,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
@@ -116,7 +115,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.setVelocityEngine(velocityEngine);
@@ -210,7 +209,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
HTTPPostEncoder encoder = new HTTPPostEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.setVelocityEngine(velocityEngine);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
index c7354d4f1..766c6f691 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
@@ -59,9 +59,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
@@ -126,7 +125,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.setVelocityEngine(velocityEngine);
@@ -220,7 +219,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.setVelocityEngine(velocityEngine);
@@ -322,7 +321,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.setVelocityEngine(velocityEngine);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
index 27679629d..50ececf86 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
@@ -51,7 +51,7 @@ import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.net.URISupport;
import net.shibboleth.shared.net.URLBuilder;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Unit test for redirect encoding.
@@ -103,7 +103,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -180,7 +180,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -261,7 +261,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -352,7 +352,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -440,7 +440,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -490,7 +490,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response2;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response2));
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index 18b04f14c..b2971d1f8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -39,8 +39,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test for SAML 2 SOAP 1.1 message encoder.
@@ -89,7 +88,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
index f39b70aea..aab033c9a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
@@ -66,10 +66,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.codec.DecodingException;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.shared.xml.XMLParserException;
import net.shibboleth.shared.xml.impl.BasicParserPool;
@@ -223,8 +222,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
sigValParams.setSignatureTrustEngine(signatureTrustEngine);
handler = new SAML2HTTPPostSimpleSignSecurityHandler();
- final HttpServletRequest request = buildServletRequest();
- handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
+ final HttpServletRequest httpRequest = buildServletRequest();
+ handler.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
handler.setParser(parserPool);
handler.setKeyInfoResolver(kiResolver);
handler.initialize();
@@ -419,7 +418,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
final HTTPPostSimpleSignEncoder encoder = new HTTPPostSimpleSignEncoder();
encoder.setMessageContext(mc);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.setVelocityEngine(velocityEngine);
encoder.setVelocityTemplateId("/templates/saml2-post-simplesign-binding.vm");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
index 53741e265..4a066b0ce 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
@@ -60,11 +60,10 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.net.URLBuilder;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
@@ -205,7 +204,7 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
handler = new SAML2HTTPRedirectDeflateSignatureSecurityHandler();
final HttpServletRequest request = buildServletRequest();
- handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return request;}});
+ handler.setHttpServletRequestSupplier(new ConstantSupplier<>(request));
handler.initialize();
messageContext = new MessageContext();
@@ -330,7 +329,7 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
final HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(mc);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public HttpServletResponse get() {return response;}});
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
try {
encoder.initialize();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
index 7865c1b08..dab672997 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
@@ -35,10 +35,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.FunctionSupport;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/** Test for {@link AddSubjectConfirmationToSubjects}. */
@@ -55,7 +54,7 @@ public class AddSubjectConfirmationToSubjectsTest extends OpenSAMLInitBaseTestCa
action = new AddSubjectConfirmationToSubjects();
final MockHttpServletRequest request = new MockHttpServletRequest();
- action.setHttpServletRequestSupplier(new NonnullSupplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletRequestSupplier(new ConstantSupplier<>(request));
}
@Test(expectedExceptions = ComponentInitializationException.class)
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
index a0b2403a7..1b4aa9706 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
@@ -40,9 +40,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
@@ -65,8 +64,8 @@ public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
resultsMap = new HashMap<>();
action = new ValidateAssertions();
- action.setHttpServletRequestSupplier(new NonnullSupplier<>() { public MockHttpServletRequest get() {return httpRequest;}});
- action.setHttpServletResponseSupplier(new NonnullSupplier<> () {public HttpServletResponse get() { return httpResponse;}});
+ action.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
+ action.setHttpServletResponseSupplier(new ConstantSupplier<>(httpResponse));
action.setValidationContextBuilder(new MockAssertionValidationContextBuilder());
action.setAssertionValidator(new MockAssertionValidator(resultsMap));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
index 4bffb0623..bfdb8d35e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
@@ -58,10 +58,9 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
*
@@ -85,7 +84,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandlerTest extends XMLObject
httpServletRequest = buildHttpServletRequest();
handler = new WSSecuritySAML20AssertionTokenSecurityHandler();
- handler.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() {return httpServletRequest;}});
+ handler.setHttpServletRequestSupplier(new ConstantSupplier<>(httpServletRequest));
// do init in the test methods
}
diff --git a/opensaml-soap-impl/pom.xml b/opensaml-soap-impl/pom.xml
index 471e201e4..18d2ac2f1 100644
--- a/opensaml-soap-impl/pom.xml
+++ b/opensaml-soap-impl/pom.xml
@@ -98,7 +98,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
index 099aef4c9..7a7751841 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
@@ -34,9 +34,8 @@ import org.testng.annotations.Test;
import com.google.common.io.Resources;
-import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test basic SOAP 1.1 message decoding.
@@ -55,7 +54,7 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new HTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequestSupplier(new NonnullSupplier<>() {public HttpServletRequest get() { return httpRequest;}});
+ decoder.setHttpServletRequestSupplier(new ConstantSupplier<>(httpRequest));
// Let actual test method do the initialize(), so can set own body handler.
}
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
index 04ccaedf9..4708cb1dd 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
@@ -49,7 +49,7 @@ import org.xmlunit.diff.Diff;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.NonnullSupplier;
+import net.shibboleth.shared.testing.ConstantSupplier;
import net.shibboleth.shared.xml.XMLParserException;
/**
@@ -83,7 +83,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -139,7 +139,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -202,7 +202,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response) );
encoder.initialize();
encoder.prepareContext();
@@ -266,7 +266,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -299,7 +299,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -350,7 +350,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
@@ -386,7 +386,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
encoder.setMessageContext(messageContext);
- encoder.setHttpServletResponseSupplier(new NonnullSupplier<>() {public MockHttpServletResponse get() { return response;}} );
+ encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
encoder.initialize();
encoder.prepareContext();
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/MemoryStorageServiceTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/MemoryStorageServiceTest.java
index 95abee306..2db56090b 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/MemoryStorageServiceTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/MemoryStorageServiceTest.java
@@ -22,7 +22,6 @@ import java.time.Duration;
import javax.annotation.Nonnull;
import org.opensaml.storage.StorageService;
-import org.opensaml.storage.impl.MemoryStorageService;
import org.opensaml.storage.testing.StorageServiceTest;
import org.testng.annotations.Test;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list