[java-identity-provider] branch main updated: Use NonNull Set and List creation methods
Rod Widdowson
rdw at steadingsoftware.com
Tue Jan 24 14:38:40 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=324f3e0e40debba1293e5eb5d5895bdfc35ae63c
The following commit(s) were added to refs/heads/main by this push:
new 324f3e0e4 Use NonNull Set and List creation methods
324f3e0e4 is described below
commit 324f3e0e40debba1293e5eb5d5895bdfc35ae63c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 24 14:14:16 2023 +0000
Use NonNull Set and List creation methods
---
.../shibboleth/idp/module/AbstractIdPModule.java | 2 +-
.../DefaultAuthenticationResultSerializer.java | 5 ++--
.../impl/ServiceTicketSerializerTest.java | 4 ++-
.../shibboleth/idp/cli/impl/ModuleManagerCLI.java | 3 ++-
.../idp/test/flows/cas/SamlValidateFlowTest.java | 4 ++-
.../test/flows/cas/ServiceValidateFlowTest.java | 27 ++++++++++---------
.../idp/installer/InstallerProperties.java | 4 +--
.../net/shibboleth/idp/installer/V4Install.java | 5 +---
.../installer/plugin/impl/PluginInstallerCLI.java | 2 +-
.../idp/installer/TestPropertiesWithComments.java | 6 ++---
.../AudienceRestrictionsLookupFunction.java | 3 ++-
.../impl/InitializeAuthenticationContextTest.java | 5 ++--
.../tests/ProxyRestrictionLookupFunctionTest.java | 31 +++++++++++-----------
13 files changed, 55 insertions(+), 46 deletions(-)
diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java b/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java
index 37e9a8f16..8daa0b464 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java
@@ -47,7 +47,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.protocol.HttpClientContext;
import org.opensaml.security.httpclient.HttpClientSecuritySupport;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ResourceUtils;
@@ -56,6 +55,7 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
/**
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java
index aa43bac0d..41d2c9d2d 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java
@@ -64,6 +64,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.codec.Base64Support;
import net.shibboleth.shared.codec.EncodingException;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
@@ -181,11 +182,11 @@ public class DefaultAuthenticationResultSerializer extends AbstractInitializable
.collect(Collectors.toUnmodifiableList());
if (serializers.isEmpty()) {
- principalSerializers = List.of(authnResultPrincipalSerializer);
+ principalSerializers = CollectionSupport.singletonList(authnResultPrincipalSerializer);
} else {
final List<PrincipalSerializer<String>> copy = new ArrayList<>(serializers);
copy.add(authnResultPrincipalSerializer);
- principalSerializers = List.copyOf(copy);
+ principalSerializers = CollectionSupport.copyToList(copy);
}
}
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/ServiceTicketSerializerTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/ServiceTicketSerializerTest.java
index 21a13590c..38aa87d5b 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/ServiceTicketSerializerTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/serialization/impl/ServiceTicketSerializerTest.java
@@ -19,6 +19,8 @@ package net.shibboleth.idp.cas.ticket.serialization.impl;
import net.shibboleth.idp.cas.ticket.ServiceTicket;
import net.shibboleth.idp.cas.ticket.TicketState;
+import net.shibboleth.shared.collection.CollectionSupport;
+
import org.testng.annotations.Test;
import static org.testng.Assert.*;
@@ -78,7 +80,7 @@ public class ServiceTicketSerializerTest {
true);
final TicketState state = new TicketState("idpsess-d2db22058dc178d3b917363859e", "bob",
Instant.now().truncatedTo(ChronoUnit.MILLIS), "Password");
- state.setConsentedAttributeIds(Set.of("foo", "bar"));
+ state.setConsentedAttributeIds(CollectionSupport.setOf("foo", "bar"));
st1.setTicketState(state);
final String serialized = serializer.serialize(st1);
final ServiceTicket st2 = serializer.deserialize(1, "notused", st1.getId(), serialized, null);
diff --git a/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerCLI.java b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerCLI.java
index 297de900b..a44982bcc 100644
--- a/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerCLI.java
+++ b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerCLI.java
@@ -48,6 +48,7 @@ import net.shibboleth.idp.module.IdPModule.ResourceResult;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.idp.module.ModuleContext;
import net.shibboleth.idp.module.ModuleException;
@@ -83,7 +84,7 @@ public final class ModuleManagerCLI extends AbstractIdPHomeAwareCommandLine<Modu
/** {@inheritDoc} */
@Override
@Nonnull @NonnullElements @NotLive @Unmodifiable protected List<Resource> getAdditionalSpringResources() {
- return List.of(new ClassPathResource("net/shibboleth/idp/conf/http-client.xml"));
+ return CollectionSupport.singletonList(new ClassPathResource("net/shibboleth/idp/conf/http-client.xml"));
}
/** {@inheritDoc} */
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
index 3e274b316..8acafbcfa 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
@@ -25,6 +25,8 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.session.IdPSession;
import net.shibboleth.idp.session.SessionManager;
import net.shibboleth.idp.test.flows.AbstractFlowTest;
+import net.shibboleth.shared.collection.CollectionSupport;
+
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -106,7 +108,7 @@ public class SamlValidateFlowTest extends AbstractFlowTest {
final String principal = "john";
final IdPSession session = sessionManager.createSession(principal);
final TicketState state = new TicketState(session.getId(), principal, Instant.now(), "Password");
- state.setConsentedAttributeIds(Set.of("uid", "eduPersonPrincipalName"));
+ state.setConsentedAttributeIds(CollectionSupport.setOf("uid", "eduPersonPrincipalName"));
final ServiceTicket ticket = ticketService.createServiceTicket(
"ST-1415133132-ompog68ygxKyX9BPwPuw0hESQBjuA",
Instant.now().plusSeconds(5),
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
index 01bf099ed..e2a460ea7 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
@@ -17,11 +17,23 @@
package net.shibboleth.idp.test.flows.cas;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
import java.time.Instant;
-import java.util.Set;
import javax.annotation.Nonnull;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.webflow.execution.FlowExecutionOutcome;
+import org.springframework.webflow.executor.FlowExecutionResult;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.context.AttributeContext;
import net.shibboleth.idp.cas.ticket.ServiceTicket;
import net.shibboleth.idp.cas.ticket.TicketService;
@@ -32,18 +44,9 @@ import net.shibboleth.idp.session.SessionManager;
import net.shibboleth.idp.session.SessionResolver;
import net.shibboleth.idp.session.criterion.SessionIdCriterion;
import net.shibboleth.idp.test.flows.AbstractFlowTest;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.webflow.execution.FlowExecutionOutcome;
-import org.springframework.webflow.executor.FlowExecutionResult;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
-
/**
* Tests the flow behind the <code>/serviceValidate</code> endpoint.
*
@@ -141,7 +144,7 @@ public class ServiceValidateFlowTest extends AbstractFlowTest {
final String principal = "john";
final IdPSession session = sessionManager.createSession(principal);
final TicketState state = new TicketState(session.getId(), principal, Instant.now(), "Password");
- state.setConsentedAttributeIds(Set.of("uid", "eduPersonPrincipalName"));
+ state.setConsentedAttributeIds(CollectionSupport.setOf("uid", "eduPersonPrincipalName"));
final ServiceTicket ticket = ticketService.createServiceTicket(
"ST-1415133132-ompog68ygxKyX9BPwPuw0hESQBjuA",
Instant.now().plusSeconds(5),
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java
index cbbdcba33..71c476714 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerProperties.java
@@ -25,6 +25,7 @@ import javax.annotation.Nullable;
import org.apache.tools.ant.BuildException;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.InitializableComponent;
/** Interface to describe simply parameterization and status of the installation.
@@ -32,8 +33,7 @@ import net.shibboleth.shared.component.InitializableComponent;
public interface InstallerProperties extends InitializableComponent {
/** Those modules enabled by default. */
- @SuppressWarnings("null")
- @Nonnull public static final Set<String> DEFAULT_MODULES = Set.of("idp.authn.Password", "idp.admin.Hello");
+ @Nonnull public static final Set<String> DEFAULT_MODULES = CollectionSupport.setOf("idp.authn.Password", "idp.admin.Hello");
/** Get where we are installing/updating/building the war.
* @return the target directory
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index aa4cf6c16..4a24886a0 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -244,15 +244,12 @@ public class V4Install extends AbstractInitializableComponent {
// CheckStyle: CyclomaticComplexity|MethodLength OFF
protected void populatePropertyFiles(final boolean sealerCreated) throws BuildException {
- final Set<String> dnrList = Set.of(
+ @Nonnull final Set<String> doNotReplaceList = CollectionSupport.setOf(
"idp.sealer.storePassword",
"idp.sealer.keyPassword",
"idp.authn.LDAP.bindDNCredential",
"idp.attribute.resolver.LDAP.bindDNCredential",
"idp.persistentId.salt");
- assert dnrList != null;
- @Nonnull final Set<String> doNotReplaceList =dnrList;
-
final Path conf = installerProps.getTargetDir().resolve("conf");
final Path dstConf = installerProps.getTargetDir().resolve("dist").resolve("conf");
if (!currentState.isIdPPropertiesPresent()) {
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index ed363ebcb..4d7262731 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -131,7 +131,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
}
if (args.getUpdateURL() !=null) {
try {
- updateURLs = List.of(new URL(args.getUpdateURL()));
+ updateURLs = CollectionSupport.singletonList(new URL(args.getUpdateURL()));
} catch (final MalformedURLException e) {
log.error("Could not convert update URL {}", args.getUpdateURL(), e);
return RC_INIT;
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java
index 269b8980f..57b749608 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java
@@ -28,13 +28,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.Properties;
-import java.util.Set;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.ConstraintViolationException;
/**
@@ -64,7 +64,7 @@ public class TestPropertiesWithComments {
@Test public void testReplaceValues() throws FileNotFoundException, IOException {
- final PropertiesWithComments pwc = new PropertiesWithComments(Set.of("a", "b", "q"));
+ final PropertiesWithComments pwc = new PropertiesWithComments(CollectionSupport.setOf("a", "b", "q"));
pwc.load(getInputStream());
@@ -88,7 +88,7 @@ public class TestPropertiesWithComments {
}
@Test public void testUnreplaceableList() throws IOException {
- final PropertiesWithComments pwc = new PropertiesWithComments(Set.of("x", "a", "b"));
+ final PropertiesWithComments pwc = new PropertiesWithComments(CollectionSupport.setOf("x", "a", "b"));
pwc.load(getInputStream());
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
index 15547605c..25fd7d554 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
@@ -31,6 +31,7 @@ import net.shibboleth.idp.saml.profile.config.SAMLProfileConfiguration;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.collection.CollectionSupport;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -69,7 +70,7 @@ public class AudienceRestrictionsLookupFunction extends AbstractRelyingPartyLook
}
if (id != null) {
- return List.of(rpc.getRelyingPartyId());
+ return CollectionSupport.singletonList(rpc.getRelyingPartyId());
}
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java
index c13c8ccfe..da8c524c6 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java
@@ -23,6 +23,7 @@ import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileR
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.FunctionSupport;
@@ -216,14 +217,14 @@ public class InitializeAuthenticationContextTest extends OpenSAMLInitBaseTestCas
new RequestContextBuilder().setInboundMessage(authnRequest).buildRequestContext();
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(requestCtx);
- final Scoping scoping = SAML2ActionTestingSupport.buildScoping(0, Set.of("foo", "bar"));
+ final Scoping scoping = SAML2ActionTestingSupport.buildScoping(0, CollectionSupport.setOf("foo", "bar"));
((AuthnRequest) prc.getInboundMessageContext().getMessage()).setScoping(scoping);
final Event event = action.execute(requestCtx);
ActionTestingSupport.assertProceedEvent(event);
final AuthenticationContext authnCtx = prc.getSubcontext(AuthenticationContext.class);
Assert.assertEquals(authnCtx.getProxyCount(), Integer.valueOf(0));
- Assert.assertEquals(authnCtx.getProxiableAuthorities(), Set.of("foo", "bar"));
+ Assert.assertEquals(authnCtx.getProxiableAuthorities(), CollectionSupport.setOf("foo", "bar"));
}
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/tests/ProxyRestrictionLookupFunctionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/tests/ProxyRestrictionLookupFunctionTest.java
index a8ab47a88..8e44d6792 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/tests/ProxyRestrictionLookupFunctionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/tests/ProxyRestrictionLookupFunctionTest.java
@@ -29,6 +29,7 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
import net.shibboleth.idp.saml.saml2.profile.config.navigate.ProxyRestrictionLookupFunction;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -126,33 +127,33 @@ public class ProxyRestrictionLookupFunctionTest extends OpenSAMLInitBaseTestCase
public void testOneAudienceSet() {
final ProxyAuthenticationPrincipal proxy = new ProxyAuthenticationPrincipal();
proxy.setProxyCount(10);
- proxy.getAudiences().addAll(Set.of("foo", "bar"));
+ proxy.getAudiences().addAll(CollectionSupport.setOf("foo", "bar"));
sc.getAuthenticationResults().get("test2").getSubject().getPrincipals().add(proxy);
result = fn.apply(prc);
Assert.assertEquals(result.getFirst(), Integer.valueOf(9));
- Assert.assertEquals(result.getSecond(), Set.of("foo", "bar"));
+ Assert.assertEquals(result.getSecond(), CollectionSupport.setOf("foo", "bar"));
}
@Test
public void testTwoAudienceSets() {
final ProxyAuthenticationPrincipal proxy1 = new ProxyAuthenticationPrincipal();
proxy1.setProxyCount(10);
- proxy1.getAudiences().addAll(Set.of("foo", "bar"));
+ proxy1.getAudiences().addAll(CollectionSupport.setOf("foo", "bar"));
sc.getAuthenticationResults().get("test1").getSubject().getPrincipals().add(proxy1);
final ProxyAuthenticationPrincipal proxy2 = new ProxyAuthenticationPrincipal();
- proxy2.getAudiences().addAll(Set.of("foo", "bar"));
+ proxy2.getAudiences().addAll(CollectionSupport.setOf("foo", "bar"));
sc.getAuthenticationResults().get("test2").getSubject().getPrincipals().add(proxy2);
result = fn.apply(prc);
Assert.assertEquals(result.getFirst(), Integer.valueOf(9));
- Assert.assertEquals(result.getSecond(), Set.of("foo", "bar"));
+ Assert.assertEquals(result.getSecond(), CollectionSupport.setOf("foo", "bar"));
proxy1.getAudiences().clear();
proxy1.getAudiences().add("bar");
result = fn.apply(prc);
- Assert.assertEquals(result.getSecond(), Set.of("bar"));
+ Assert.assertEquals(result.getSecond(), CollectionSupport.singleton("bar"));
proxy2.getAudiences().clear();
proxy2.getAudiences().add("foo");
@@ -163,12 +164,12 @@ public class ProxyRestrictionLookupFunctionTest extends OpenSAMLInitBaseTestCase
@Test
public void testConfigOnly() {
config.setProxyCount(5);
- config.setProxyAudiences(Set.of("foo", "bar"));
+ config.setProxyAudiences(CollectionSupport.setOf("foo", "bar"));
prc.removeSubcontext(sc);
result = fn.apply(prc);
Assert.assertEquals(result.getFirst(), Integer.valueOf(5));
- Assert.assertEquals(result.getSecond(), Set.of("foo", "bar"));
+ Assert.assertEquals(result.getSecond(), CollectionSupport.setOf("foo", "bar"));
}
@Test
@@ -200,26 +201,26 @@ public class ProxyRestrictionLookupFunctionTest extends OpenSAMLInitBaseTestCase
@Test
public void testJointAudiences() {
- config.setProxyAudiences(Set.of("foo", "bar"));
+ config.setProxyAudiences(CollectionSupport.setOf("foo", "bar"));
final ProxyAuthenticationPrincipal proxy1 = new ProxyAuthenticationPrincipal();
- proxy1.getAudiences().addAll(Set.of("foo", "bar"));
+ proxy1.getAudiences().addAll(CollectionSupport.setOf("foo", "bar"));
sc.getAuthenticationResults().get("test1").getSubject().getPrincipals().add(proxy1);
final ProxyAuthenticationPrincipal proxy2 = new ProxyAuthenticationPrincipal();
- proxy2.getAudiences().addAll(Set.of("foo", "bar"));
+ proxy2.getAudiences().addAll(CollectionSupport.setOf("foo", "bar"));
sc.getAuthenticationResults().get("test2").getSubject().getPrincipals().add(proxy2);
result = fn.apply(prc);
Assert.assertNull(result.getFirst());
- Assert.assertEquals(result.getSecond(), Set.of("foo", "bar"));
+ Assert.assertEquals(result.getSecond(), CollectionSupport.setOf("foo", "bar"));
- config.setProxyAudiences(Set.of("foo", "baz"));
+ config.setProxyAudiences(CollectionSupport.setOf("foo", "baz"));
result = fn.apply(prc);
- Assert.assertEquals(result.getSecond(), Set.of("foo"));
+ Assert.assertEquals(result.getSecond(), CollectionSupport.singleton("foo"));
proxy2.getAudiences().clear();
- proxy2.getAudiences().addAll(Set.of("foo", "bar", "baz"));
+ proxy2.getAudiences().addAll(CollectionSupport.setOf("foo", "bar", "baz"));
result = fn.apply(prc);
Assert.assertEquals(result.getSecond(), Set.of("foo"));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list