[java-shib-attribute] 02/02: IDP-2069 Null handling task
Rod Widdowson
rdw at steadingsoftware.com
Wed May 3 15:29:16 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=021320350b2d1390ce670a4fd0b39b6cafaae1d1
commit 021320350b2d1390ce670a4fd0b39b6cafaae1d1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed May 3 16:24:24 2023 +0100
IDP-2069 Null handling task
https://shibboleth.atlassian.net/browse/IDP-2069
Remove all warning from attribute-filter-spring
(including tests)
---
.../filter/spring/basic/ScriptedTest.java | 15 ++++++++---
.../matcher/AttributeValueMatcherParserTest.java | 30 ++++++++++++++--------
.../policy/AttributeRequesterRuleParserTest.java | 15 ++++++++---
.../filter/spring/policy/DataSources.java | 3 +++
.../policy/ProxiedRequesterRuleParserTest.java | 19 ++++++++++----
.../saml/IssuerInEntityGroupRuleParserTest.java | 4 ++-
...roxiedRequesterInEntityGroupRuleParserTest.java | 4 ++-
.../saml/RequesterInEntityGroupRuleParserTest.java | 4 ++-
.../testing/BaseAttributeFilterParserTest.java | 5 ++--
9 files changed, 71 insertions(+), 28 deletions(-)
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
index a2d0f2339..65ad0eec0 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
@@ -39,6 +39,7 @@ import net.shibboleth.idp.attribute.filter.matcher.impl.ScriptedMatcher;
import net.shibboleth.idp.attribute.filter.policyrule.impl.ScriptedPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.shared.annotation.constraint.NonnullBeforeTest;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -48,8 +49,8 @@ import net.shibboleth.shared.component.ComponentInitializationException;
@SuppressWarnings("javadoc")
public class ScriptedTest extends BaseAttributeFilterParserTest {
- private Map<String, IdPAttribute> epaUid;
-
+ @NonnullBeforeTest private Map<String, IdPAttribute> epaUid;
+
@Nonnull @NotEmpty private final String NASHORN_SCRIPT = "scripted.xml";
@Nonnull @NotEmpty private final String RHINO_SCRIPT = "scripted-rhino.xml";
@@ -60,6 +61,12 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
epaUid = getAttributes("epa-uidwithjsmith.xml");
}
+ @Nonnull final private IdPAttribute getUidAttribute() {
+ final IdPAttribute val = epaUid.get("uid");
+ assert val != null;
+ return val;
+ }
+
@Test public void policy() throws ComponentInitializationException {
final ScriptedPolicyRule rule = (ScriptedPolicyRule) getPolicyRule(NASHORN_SCRIPT);
@@ -87,7 +94,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- final Set<IdPAttributeValue> x = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ final Set<IdPAttributeValue> x = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert x != null;
assertEquals(x.size(), 1);
String val = ((StringAttributeValue) x.iterator().next()).getValue();
@@ -99,7 +106,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- final Set<IdPAttributeValue> x = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ final Set<IdPAttributeValue> x = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert x != null;
assertEquals(x.size(), 1);
String val = ((StringAttributeValue) x.iterator().next()).getValue();
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
index fe34a19f8..fe4ad3086 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
@@ -26,6 +26,8 @@ import java.lang.IllegalArgumentException;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Nonnull;
+
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.BeforeClass;
@@ -41,6 +43,7 @@ import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.shared.annotation.constraint.NonnullBeforeTest;
import net.shibboleth.shared.component.ComponentInitializationException;
/*
@@ -64,11 +67,11 @@ import net.shibboleth.shared.component.ComponentInitializationException;
@SuppressWarnings("javadoc")
public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTest {
- private Map<String, IdPAttribute> epaUid;
+ @NonnullBeforeTest private Map<String, IdPAttribute> epaUid;
- private Map<String, IdPAttribute> epaUidJS;
+ @NonnullBeforeTest private Map<String, IdPAttribute> epaUidJS;
- private Map<String, IdPAttribute> uidEpaJS;
+ @NonnullBeforeTest private Map<String, IdPAttribute> uidEpaJS;
@BeforeClass public void setupAttributes() throws ComponentInitializationException, ResolutionException {
@@ -77,7 +80,12 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
uidEpaJS = getAttributes("uid-epawithjsmith.xml");
}
-
+ @Nonnull final private IdPAttribute getUidAttribute(final Map<String, IdPAttribute> from) {
+ final IdPAttribute val = from.get("uid");
+ assert val != null;
+ return val;
+ }
+
@Test public void targetedPolicy() throws ComponentInitializationException {
final PolicyRequirementRule rule = getPolicyRule("attributeValueId.xml");
@@ -116,19 +124,19 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- Set<IdPAttributeValue> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(epaUid), filterContext);
assert result != null;
assertTrue(result.isEmpty());
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
- result = matcher.getMatchingValues(epaUidJS.get("uid"), filterContext);
+ result = matcher.getMatchingValues(getUidAttribute(epaUidJS), filterContext);
assert result != null;
assertEquals(result.size(), 1);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
- result = matcher.getMatchingValues(uidEpaJS.get("uid"), filterContext);
+ result = matcher.getMatchingValues(getUidAttribute(uidEpaJS), filterContext);
assert result != null;
assertTrue(result.isEmpty());
@@ -143,19 +151,19 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- Set<IdPAttributeValue> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(epaUid), filterContext);
assert result != null;
assertTrue(result.isEmpty());
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
- result = matcher.getMatchingValues(epaUidJS.get("uid"), filterContext);
+ result = matcher.getMatchingValues(getUidAttribute(epaUidJS), filterContext);
assert result != null;
assertEquals(result.size(), 2);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
- result = matcher.getMatchingValues(uidEpaJS.get("uid"), filterContext);
+ result = matcher.getMatchingValues(getUidAttribute(uidEpaJS), filterContext);
assert result != null;
assertTrue(result.isEmpty());
}
@@ -171,7 +179,7 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
}
}
- private void propertyCaseSensitive(final String propValue, final boolean result) throws ComponentInitializationException {
+ private void propertyCaseSensitive(@Nonnull final String propValue, final boolean result) throws ComponentInitializationException {
final AttributeValueStringMatcher match = (AttributeValueStringMatcher )
getMatcher("attributeValuePropertyCaseSensitive.xml", contextWithPropertyValue(propValue));
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
index 43ecffaee..6041a3e79 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
@@ -23,6 +23,8 @@ import static org.testng.Assert.assertTrue;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Nonnull;
+
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -36,6 +38,7 @@ import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AttributeRequesterPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.shared.annotation.constraint.NonnullBeforeTest;
import net.shibboleth.shared.component.ComponentInitializationException;
/**
@@ -54,12 +57,18 @@ import net.shibboleth.shared.component.ComponentInitializationException;
@SuppressWarnings("javadoc")
public class AttributeRequesterRuleParserTest extends BaseAttributeFilterParserTest {
- private Map<String, IdPAttribute> epaUid;
+ @NonnullBeforeTest private Map<String, IdPAttribute> epaUid;
@BeforeClass public void setupAttributes() throws ComponentInitializationException, ResolutionException {
epaUid = getAttributes("epa-uid.xml");
}
+
+ @Nonnull final private IdPAttribute getUidAttribute() {
+ final IdPAttribute val = epaUid.get("uid");
+ assert val != null;
+ return val;
+ }
@Test public void policy() throws ComponentInitializationException {
final PolicyRequirementRule rule = getPolicyRule("attributeRequester.xml");
@@ -93,13 +102,13 @@ public class AttributeRequesterRuleParserTest extends BaseAttributeFilterParserT
AttributeFilterContext filterContext = DataSources.populatedFilterContext("principal", "issuer", "http://example.org");
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- Set<IdPAttributeValue> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert result != null;
assertTrue(result.isEmpty());
filterContext = DataSources.populatedFilterContext("principal", "issuer", "https://service.example.edu/shibboleth-sp");
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ result = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert result != null;
assertEquals(result.size(), 1);
assertEquals(((StringAttributeValue) result.iterator().next()).getValue(), "daffyDuck");
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/DataSources.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/DataSources.java
index bfb484adb..044ed8454 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/DataSources.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/DataSources.java
@@ -38,6 +38,7 @@ public abstract class DataSources {
@Nonnull @NotEmpty public final static String TEST_STRING = "nibbleahappywarthog";
+ @SuppressWarnings("null")
@Nonnull @NotEmpty public final static String TEST_STRING_UPPER = TEST_STRING.toUpperCase();
@Nonnull @NotEmpty public final static String NON_MATCH_STRING = "ThisIsADifferentString";
@@ -46,6 +47,7 @@ public abstract class DataSources {
@Nonnull public final static StringAttributeValue STRING_VALUE = new StringAttributeValue(TEST_STRING);
+ @SuppressWarnings("null")
@Nonnull public final static StringAttributeValue STRING_VALUE_UPPER = new StringAttributeValue(TEST_STRING.toUpperCase());
@Nonnull public final static StringAttributeValue NON_MATCH_STRING_VALUE = new StringAttributeValue(NON_MATCH_STRING);
@@ -56,6 +58,7 @@ public abstract class DataSources {
@Nonnull public final static ScopedStringAttributeValue SCOPED_VALUE_SCOPE_MATCH = new ScopedStringAttributeValue(
NON_MATCH_STRING, TEST_STRING);
+ @SuppressWarnings("null")
@Nonnull public final static ByteAttributeValue BYTE_ATTRIBUTE_VALUE = new ByteAttributeValue(TEST_STRING.getBytes());
@Nonnull public final static IdPAttributeValue OTHER_VALUE = new IdPAttributeValue() {
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
index 06f27ae34..571249bb8 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
@@ -24,6 +24,8 @@ import java.util.Arrays;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Nonnull;
+
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProxiedRequesterContext;
import org.testng.annotations.BeforeClass;
@@ -39,17 +41,24 @@ import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.ProxiedRequesterPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.shared.annotation.constraint.NonnullBeforeTest;
import net.shibboleth.shared.component.ComponentInitializationException;
@SuppressWarnings("javadoc")
public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTest {
- private Map<String, IdPAttribute> epaUid;
+ @NonnullBeforeTest private Map<String, IdPAttribute> epaUid;
+
+ @BeforeClass public void setupAttributes() throws ComponentInitializationException, ResolutionException {
- @BeforeClass
- public void setupAttributes() throws ComponentInitializationException, ResolutionException {
epaUid = getAttributes("epa-uid.xml");
}
+
+ @Nonnull final private IdPAttribute getUidAttribute() {
+ final IdPAttribute val = epaUid.get("uid");
+ assert val != null;
+ return val;
+ }
@Test public void policy() throws ComponentInitializationException {
final PolicyRequirementRule rule = getPolicyRule("proxiedRequester.xml");
@@ -83,12 +92,12 @@ public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTes
prc.getRequesters().addAll(Arrays.asList("foo", "bar"));
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- Set<IdPAttributeValue> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert result != null;
assertTrue(result.isEmpty());
prc.getRequesters().add("https://service.example.edu/shibboleth-sp");
- result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
+ result = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert result != null;
assertEquals(result.size(), 1);
assertEquals(((StringAttributeValue)result.iterator().next()).getValue(), "daffyDuck");
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerInEntityGroupRuleParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerInEntityGroupRuleParserTest.java
index c79770b69..e666ab518 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerInEntityGroupRuleParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerInEntityGroupRuleParserTest.java
@@ -19,6 +19,8 @@ package net.shibboleth.idp.attribute.filter.spring.saml;
import static org.testng.Assert.assertEquals;
+import javax.annotation.Nonnull;
+
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.Test;
@@ -33,7 +35,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
@SuppressWarnings("javadoc")
public class IssuerInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
- private void testRule(final String propValue, final boolean result) throws ComponentInitializationException {
+ private void testRule(@Nonnull final String propValue, final boolean result) throws ComponentInitializationException {
final IssuerInEntityGroupPolicyRule rule = (IssuerInEntityGroupPolicyRule) getPolicyRule("issuerEG2.xml", contextWithPropertyValue(propValue));
assertEquals(rule.getEntityGroup(), "urn:example.org");
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterInEntityGroupRuleParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterInEntityGroupRuleParserTest.java
index 10783df84..1ce33ff83 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterInEntityGroupRuleParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterInEntityGroupRuleParserTest.java
@@ -19,6 +19,8 @@ package net.shibboleth.idp.attribute.filter.spring.saml;
import static org.testng.Assert.assertEquals;
+import javax.annotation.Nonnull;
+
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.Test;
@@ -30,7 +32,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
/** Unit test for {@link ProxiedRequesterInEntityGroupRuleParser}. */
public class ProxiedRequesterInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
- private void testRule(final String propValue, final boolean result) throws ComponentInitializationException {
+ private void testRule(@Nonnull final String propValue, final boolean result) throws ComponentInitializationException {
final ProxiedRequesterInEntityGroupPolicyRule rule =
(ProxiedRequesterInEntityGroupPolicyRule) getPolicyRule("proxiedrequesterEG2.xml", contextWithPropertyValue(propValue));
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterInEntityGroupRuleParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterInEntityGroupRuleParserTest.java
index 838cc3f37..b84cf2a66 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterInEntityGroupRuleParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterInEntityGroupRuleParserTest.java
@@ -19,6 +19,8 @@ package net.shibboleth.idp.attribute.filter.spring.saml;
import static org.testng.Assert.assertEquals;
+import javax.annotation.Nonnull;
+
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.Test;
@@ -33,7 +35,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
@SuppressWarnings("javadoc")
public class RequesterInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
- private void testRule(final String propValue, final boolean result) throws ComponentInitializationException {
+ private void testRule(@Nonnull final String propValue, final boolean result) throws ComponentInitializationException {
final RequesterInEntityGroupPolicyRule rule = (RequesterInEntityGroupPolicyRule) getPolicyRule("requesterEG2.xml", contextWithPropertyValue(propValue));
assertEquals(rule.getEntityGroup(), "urn:example.org");
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java
index bd8a4f1f7..1775c0a35 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java
@@ -108,8 +108,9 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
@Nonnull protected <Type> Type getBean(@Nonnull final Class<Type> claz, @Nonnull final GenericApplicationContext context) {
final Collection<Type> beans = context.getBeansOfType(claz).values();
assertEquals(beans.size(), 1);
-
- return beans.iterator().next();
+ final Type bean =beans.iterator().next();
+ assert bean != null;
+ return bean;
}
@Nonnull protected PolicyRequirementRule getPolicyRuleFromAttributeFilterPolicy(@Nonnull final GenericApplicationContext ctx) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list