[java-shib-attribute] branch main updated: Use NonNull Set and List creation methods
Rod Widdowson
rdw at steadingsoftware.com
Tue Jan 24 14:33: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-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=d9fc328643f70b3a2cf443659da7c6f188b82cf0
The following commit(s) were added to refs/heads/main by this push:
new d9fc32864 Use NonNull Set and List creation methods
d9fc32864 is described below
commit d9fc328643f70b3a2cf443659da7c6f188b82cf0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 24 14:12:56 2023 +0000
Use NonNull Set and List creation methods
---
.../attribute/resolver/ad/impl/DateTimeAttributeDefinitionTest.java | 3 ++-
.../idp/attribute/resolver/ad/impl/ScopedAttributeTest.java | 3 ++-
.../idp/attribute/resolver/ad/impl/SimpleAttributeTest.java | 3 ++-
.../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java | 3 ++-
.../idp/attribute/resolver/spring/AttributeResolverTest.java | 5 ++---
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinitionTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinitionTest.java
index fad9ef822..c39122f2a 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinitionTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinitionTest.java
@@ -45,6 +45,7 @@ import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImplTest;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.LazySet;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -113,7 +114,7 @@ public class DateTimeAttributeDefinitionTest {
datetime.setIgnoreConversionErrors(ignore);
datetime.initialize();
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", Set.of(datetime, sa), Collections.emptySet());
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", CollectionSupport.setOf(datetime, sa), Collections.emptySet());
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
index 5f7fe0161..c9ed3cd7d 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
@@ -45,6 +45,7 @@ import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImplTest;
import net.shibboleth.idp.attribute.resolver.testing.ResolverTestSupport;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.LazySet;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
@@ -127,7 +128,7 @@ public class ScopedAttributeTest {
// And resolve
final Set<DataConnector> connectorSet = Set.of(TestSources.populatedStaticConnector());
- final Set<AttributeDefinition> attributeSet = Set.of(scoped, TestSources.populatedStaticAttribute("ScopeSource", 1));
+ final Set<AttributeDefinition> attributeSet = CollectionSupport.setOf(scoped, TestSources.populatedStaticAttribute("ScopeSource", 1));
final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
index 171c63f8a..ead114b0f 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
@@ -46,6 +46,7 @@ import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImplTest;
import net.shibboleth.idp.attribute.resolver.testing.ResolverTestSupport;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.LazySet;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -106,7 +107,7 @@ public class SimpleAttributeTest {
simple.setStripNulls(strip);
simple.initialize();
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", Set.of(simple, sa), Collections.emptySet());
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", CollectionSupport.setOf(simple, sa), Collections.emptySet());
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index c84932322..66f94a333 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -67,6 +67,7 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorPars
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.CacheConfigParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
@@ -881,7 +882,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
@Nullable public static List<SearchResultHandler> buildReferralHandlers(
@Nullable final String followReferrals) {
if (followReferrals != null && Boolean.valueOf(followReferrals)) {
- return List.of(new FollowSearchReferralHandler());
+ return CollectionSupport.singletonList(new FollowSearchReferralHandler());
}
return null;
}
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index dcf3b7270..0b33d50ba 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -54,6 +54,7 @@ import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.spring.testing.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
@@ -155,8 +156,6 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
context.refresh();
return context.getBean(ReloadableService.class);
-
-
}
@Test public void service() throws ComponentInitializationException, ServiceException, ResolutionException {
@@ -182,7 +181,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
context.setDisplayName("ApplicationContext: ");
- service.setConverters(Set.of(new StringToDurationConverter(), new StringToResourceConverter()));
+ service.setConverters(CollectionSupport.setOf(new StringToDurationConverter(), new StringToResourceConverter()));
service.afterPropertiesSet();
context.getBeanFactory().setConversionService(service.getObject());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list