[java-shib-attribute] branch main updated: Nullability

[Rod Widdowson]

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=fb369c598e6ab289616a18134c96064e6981c2c9

The following commit(s) were added to refs/heads/main by this push:
     new fb369c598 Nullability
fb369c598 is described below

commit fb369c598e6ab289616a18134c96064e6981c2c9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Feb 4 15:28:58 2023 +0000

    Nullability
---
 .../idp/attribute/filter/matcher/logic/impl/NotMatcher.java          | 2 ++
 .../idp/attribute/resolver/impl/AttributeResolverImplTest.java       | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java
index 84a6631a2..88ff02287 100644
--- a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java
+++ b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java
@@ -66,6 +66,8 @@ public final class NotMatcher extends AbstractIdentifiableInitializableComponent
      * @return matcher that is being negated
      */
     @Nonnull public Matcher getNegatedMatcher() {
+        checkComponentActive();
+        assert negatedMatcher != null;
         return negatedMatcher;
     }
 
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index bb872f057..f16258997 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -60,6 +60,7 @@ import net.shibboleth.idp.attribute.resolver.testing.MockAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.testing.MockDataConnector;
 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;
 import net.shibboleth.shared.component.DestroyedComponentException;
@@ -1018,8 +1019,8 @@ public class AttributeResolverImplTest {
         final AttributeResolverImpl result = new AttributeResolverImpl();
         result.setId(resolverId);
         
-        result.setAttributeDefinitions(definitions == null ? Collections.emptyList() : definitions);
-        result.setDataConnectors(connectors == null ? Collections.emptyList() : connectors);
+        result.setAttributeDefinitions(definitions == null ? CollectionSupport.emptyList() : definitions);
+        result.setDataConnectors(connectors == null ? CollectionSupport.emptyList() : connectors);
         return result;
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.