[java-shib-attribute] branch main updated: IDP-2069 - Null Handling Task
Rod Widdowson
rdw at steadingsoftware.com
Sat Mar 18 10:48:34 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=fe67efe47be20675ad338a1c32aca9effab6f3b9
The following commit(s) were added to refs/heads/main by this push:
new fe67efe47 IDP-2069 - Null Handling Task
fe67efe47 is described below
commit fe67efe47be20675ad338a1c32aca9effab6f3b9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 17 14:53:40 2023 +0000
IDP-2069 - Null Handling Task
https://shibboleth.atlassian.net/browse/IDP-2069
rename BaseContext#getOrCreateSubcontext to ensureSubcontext
---
.../config/AbstractMetadataDrivenConfigurationLookupStrategy.java | 2 +-
.../idp/attribute/filter/context/AttributeFilterContextTest.java | 4 ++--
.../attribute/filter/context/AttributeFilterWorkContextTest.java | 4 ++--
.../shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java | 2 +-
.../filter/complex/impl/BaseComplexAttributeFilterTestCase.java | 2 +-
.../shibboleth/idp/attribute/filter/matcher/impl/DataSources.java | 4 ++--
.../filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java | 4 ++--
.../matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java | 4 ++--
.../policyrule/filtercontext/impl/PredicatePolicyRuleTest.java | 4 ++--
.../filtercontext/impl/ProxiedRequesterPolicyRuleTest.java | 4 ++--
.../filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java | 2 +-
.../attribute/filter/policyrule/saml/impl/BaseMetadataTests.java | 4 ++--
.../idp/attribute/filter/tests/AttributeFilterPolicyTest.java | 4 ++--
.../attribute/filter/tests/AttributeValueFilterPolicyTest.java | 4 ++--
.../idp/attribute/filter/spring/policy/DataSources.java | 4 ++--
.../filter/spring/policy/ProxiedRequesterRuleParserTest.java | 4 ++--
.../filter/spring/testing/BaseAttributeFilterParserTest.java | 2 +-
.../transcoding/impl/AttributeTranscoderRegistryImpl.java | 2 +-
.../idp/attribute/resolver/AbstractAttributeDefinitionTest.java | 2 +-
.../idp/attribute/resolver/AbstractDataConnectorTest.java | 2 +-
.../idp/attribute/resolver/AbstractResolverPluginTest.java | 2 +-
.../idp/attribute/resolver/AttributeResolutionLookupTest.java | 4 ++--
.../idp/attribute/resolver/impl/AttributeResolverImpl.java | 6 +++---
.../resolver/ad/impl/DateTimeAttributeDefinitionTest.java | 4 ++--
.../idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java | 2 +-
.../net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java | 6 +++---
.../resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java | 2 +-
.../idp/attribute/resolver/ad/impl/SimpleAttributeTest.java | 4 ++--
.../attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java | 2 +-
.../idp/attribute/resolver/ad/impl/TemplateAttributeTest.java | 2 +-
.../resolver/dc/impl/SAMLAttributeDataConnectorTest.java | 2 +-
.../idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java | 8 ++++----
.../idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java | 2 +-
.../attribute/resolver/impl/AttributeResolutionContextTest.java | 4 ++--
.../idp/attribute/resolver/spring/AttributeResolverTest.java | 4 ++--
.../resolver/spring/ad/impl/ScriptedAttributeParserTest.java | 2 +-
.../resolver/spring/ad/impl/SimpleAttributeParserTest.java | 6 +++---
.../idp/attribute/resolver/testing/ResolverTestSupport.java | 2 +-
.../shibboleth/idp/attribute/resolver/testing/TestSources.java | 4 ++--
39 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/config/AbstractMetadataDrivenConfigurationLookupStrategy.java b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
index 165e7d68d..286f71b9a 100644
--- a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
+++ b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
@@ -318,7 +318,7 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
CachedConfigurationContext cacheContext = null;
if (enableCaching && input != null) {
- cacheContext = input.getOrCreateSubcontext(CachedConfigurationContext.class);
+ cacheContext = input.ensureSubcontext(CachedConfigurationContext.class);
if (cacheContext.getPropertyMap().containsKey(propertyName)) {
log.debug("Returning cached property '{}'", propertyName);
return (T) cacheContext.getPropertyMap().get(propertyName);
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
index 443d27a1e..150aa168d 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
@@ -34,7 +34,7 @@ public class AttributeFilterContextTest {
/** Test that post-construction state is what is expected. */
@Test public void testPostConstructionState() {
final AttributeFilterContext context = new AttributeFilterContext();
- final AttributeFilterWorkContext child = context.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ final AttributeFilterWorkContext child = context.ensureSubcontext(AttributeFilterWorkContext.class);
assert child != null;
Assert.assertNotNull(context.getFilteredIdPAttributes());
@@ -120,7 +120,7 @@ public class AttributeFilterContextTest {
final AttributeFilterContext context = new AttributeFilterContext();
Assert.assertNull(context.getRequesterMetadataContext());
- final SAMLMetadataContext mas = context.getOrCreateSubcontext(SAMLMetadataContext.class);
+ final SAMLMetadataContext mas = context.ensureSubcontext(SAMLMetadataContext.class);
context.setRequesterMetadataContextLookupStrategy(new ChildContextLookup<AttributeFilterContext, SAMLMetadataContext>(
SAMLMetadataContext.class));
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
index ab0b9b63a..5efdae6bb 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
@@ -48,7 +48,7 @@ public class AttributeFilterWorkContextTest {
*/
@Test public void testPermittedAttributeValues() throws AttributeFilterException {
final AttributeFilterContext parent = new AttributeFilterContext();
- final AttributeFilterWorkContext context = parent.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ final AttributeFilterWorkContext context = parent.ensureSubcontext(AttributeFilterWorkContext.class);
final IdPAttribute attribute1 = new IdPAttribute("one");
attribute1.setValues(Arrays.asList(aStringAttributeValue, bStringAttributeValue));
@@ -95,7 +95,7 @@ public class AttributeFilterWorkContextTest {
*/
@Test public void testDeniedAttributeValues() throws AttributeFilterException {
final AttributeFilterContext parent = new AttributeFilterContext();
- final AttributeFilterWorkContext context = parent.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ final AttributeFilterWorkContext context = parent.ensureSubcontext(AttributeFilterWorkContext.class);
final IdPAttribute attribute1 = new IdPAttribute("one");
attribute1.setValues(Arrays.asList(aStringAttributeValue, bStringAttributeValue));
diff --git a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
index 638139734..1e3790283 100644
--- a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
+++ b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
@@ -108,7 +108,7 @@ public class AttributeFilterImpl extends AbstractIdentifiableInitializableCompon
final Map<String, IdPAttribute> prefilteredAttributes = filterContext.getPrefilteredIdPAttributes();
// Create work context to hold intermediate results.
- filterContext.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ filterContext.ensureSubcontext(AttributeFilterWorkContext.class);
log.debug("{} Beginning process of filtering the following {} attributes: {}", new Object[] {getLogPrefix(),
prefilteredAttributes.size(), prefilteredAttributes.keySet(),});
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
index df0324615..a23f35c7c 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
@@ -68,7 +68,7 @@ public class BaseComplexAttributeFilterTestCase extends XMLObjectBaseTestCase {
connector.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
return Constraint.isNotNull(connector.resolve(context), "Resolved Attributes were null");
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/DataSources.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/DataSources.java
index 43126237c..a606be947 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/DataSources.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/DataSources.java
@@ -72,7 +72,7 @@ public abstract class DataSources {
final ProfileRequestContext parent = new ProfileRequestContext();
parent.addSubcontext(TestSources.createResolutionContext(principal, issuerID, recipientId));
- final AttributeFilterContext retVal = parent.getOrCreateSubcontext(AttributeFilterContext.class);
+ final AttributeFilterContext retVal = parent.ensureSubcontext(AttributeFilterContext.class);
assert retVal != null;
retVal.setPrincipal(principal);
retVal.setAttributeIssuerID(issuerID);
@@ -85,7 +85,7 @@ public abstract class DataSources {
@Nonnull public static AttributeFilterContext unPopulatedFilterContext() {
final ProfileRequestContext parent = new ProfileRequestContext();
- final AttributeFilterContext afc = parent.getOrCreateSubcontext(AttributeFilterContext.class);
+ final AttributeFilterContext afc = parent.ensureSubcontext(AttributeFilterContext.class);
assert afc != null;
afc.setProfileRequestContextLookupStrategy(new ParentContextLookup<>(ProfileRequestContext.class));
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
index 32f6283f4..68361f3d5 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
@@ -95,10 +95,10 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
private void setRequestedAttributesInContext(final AttributeFilterContext context,
final Collection<RequestedAttribute> attributes) {
- final SAMLMetadataContext samlMetadataContext = context.getOrCreateSubcontext(SAMLMetadataContext.class);
+ final SAMLMetadataContext samlMetadataContext = context.ensureSubcontext(SAMLMetadataContext.class);
assert samlMetadataContext != null;
final AttributeConsumingServiceContext acsCtx =
- samlMetadataContext.getOrCreateSubcontext(AttributeConsumingServiceContext.class);
+ samlMetadataContext.ensureSubcontext(AttributeConsumingServiceContext.class);
assert acsCtx != null;
final AttributeConsumingService acs =
acsCtx.setAttributeConsumingService(acsBuilder.buildObject()).getAttributeConsumingService();
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java
index 15c77b144..b8cce49c2 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java
@@ -83,10 +83,10 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
private void setRequestedAttributesInContext(@Nonnull final AttributeFilterContext context,
@Nonnull final Multimap<String, IdPAttribute> multimap) {
final AttributesMapContainer container = new AttributesMapContainer(multimap);
- final SAMLMetadataContext samlMetadataContext = context.getOrCreateSubcontext(SAMLMetadataContext.class);
+ final SAMLMetadataContext samlMetadataContext = context.ensureSubcontext(SAMLMetadataContext.class);
assert samlMetadataContext != null;
final AttributeConsumingServiceContext acsCtx =
- samlMetadataContext.getOrCreateSubcontext(AttributeConsumingServiceContext.class);
+ samlMetadataContext.ensureSubcontext(AttributeConsumingServiceContext.class);
assert acsCtx != null;
final AttributeConsumingService acs = acsCtx.setAttributeConsumingService(acsBuilder.buildObject()).getAttributeConsumingService();
assert acs != null;
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
index 52b736044..e549afb85 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
@@ -58,7 +58,7 @@ public class PredicatePolicyRuleTest {
rule.initialize();
final ProfileRequestContext pc = new ProfileRequestContext();
- final AttributeFilterContext afc = pc.getOrCreateSubcontext(AttributeFilterContext.class);
+ final AttributeFilterContext afc = pc.ensureSubcontext(AttributeFilterContext.class);
afc.setProfileRequestContextLookupStrategy(new ParentContextLookup<>(ProfileRequestContext.class));
assertEquals(rule.matches(afc), Tristate.FALSE);
@@ -71,7 +71,7 @@ public class PredicatePolicyRuleTest {
rule.initialize();
final ProfileRequestContext pc = new ProfileRequestContext();
- final AttributeFilterContext afc = pc.getOrCreateSubcontext(AttributeFilterContext.class);
+ final AttributeFilterContext afc = pc.ensureSubcontext(AttributeFilterContext.class);
assertEquals(rule.matches(afc), Tristate.FAIL);
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
index af0e6760d..2388e24a1 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
@@ -71,7 +71,7 @@ public class ProxiedRequesterPolicyRuleTest {
ctx.setProxiedRequesterContextLookupStrategy(
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
- final ProxiedRequesterContext proxyCtx = ctx.getOrCreateSubcontext(ProxiedRequesterContext.class);
+ final ProxiedRequesterContext proxyCtx = ctx.ensureSubcontext(ProxiedRequesterContext.class);
proxyCtx.getRequesters().addAll(Arrays.asList("foo", "bar"));
@@ -89,7 +89,7 @@ public class ProxiedRequesterPolicyRuleTest {
ctx.setProxiedRequesterContextLookupStrategy(
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
- final ProxiedRequesterContext proxyCtx = ctx.getOrCreateSubcontext(ProxiedRequesterContext.class);
+ final ProxiedRequesterContext proxyCtx = ctx.ensureSubcontext(ProxiedRequesterContext.class);
proxyCtx.getRequesters().addAll(Arrays.asList("foo", "bar"));
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
index e341b424e..764bccf05 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
@@ -63,7 +63,7 @@ public class ProxiedRequesterRegexpPolicyRuleTest {
ctx.setProxiedRequesterContextLookupStrategy(
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
- final ProxiedRequesterContext proxyCtx = ctx.getOrCreateSubcontext(ProxiedRequesterContext.class);
+ final ProxiedRequesterContext proxyCtx = ctx.ensureSubcontext(ProxiedRequesterContext.class);
assert proxyCtx != null;
proxyCtx.getRequesters().addAll(Arrays.asList("foo", "bar"));
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java
index ceb37a112..8afc41d91 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java
@@ -98,7 +98,7 @@ public class BaseMetadataTests extends XMLObjectBaseTestCase {
static protected AttributeFilterContext reqMetadataContext(EntityDescriptor sp, String principal) {
final AttributeFilterContext filterContext = new AttributeFilterContext();
- final SAMLMetadataContext metadataContext = filterContext.getOrCreateSubcontext(SAMLMetadataContext.class);
+ final SAMLMetadataContext metadataContext = filterContext.ensureSubcontext(SAMLMetadataContext.class);
assert metadataContext != null;
metadataContext.setEntityDescriptor(sp);
@@ -115,7 +115,7 @@ public class BaseMetadataTests extends XMLObjectBaseTestCase {
@Nonnull static protected AttributeFilterContext issMetadataContext(EntityDescriptor idp, String principal) {
final AttributeFilterContext filterContext = new AttributeFilterContext();
- final SAMLMetadataContext metadataContext = filterContext.getOrCreateSubcontext(SAMLMetadataContext.class);
+ final SAMLMetadataContext metadataContext = filterContext.ensureSubcontext(SAMLMetadataContext.class);
assert metadataContext != null;
metadataContext.setEntityDescriptor(idp);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
index b06e4b07f..0c96b40ef 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
@@ -165,7 +165,7 @@ public class AttributeFilterPolicyTest {
policy.initialize();
AttributeFilterContext context = new AttributeFilterContext();
- context.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ context.ensureSubcontext(AttributeFilterWorkContext.class);
IdPAttribute attribute = new IdPAttribute(ATTR_NAME);
@@ -216,7 +216,7 @@ public class AttributeFilterPolicyTest {
// Empty attribute
//
final AttributeFilterContext ctx = new AttributeFilterContext();
- final AttributeFilterWorkContext workCtx = ctx.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ final AttributeFilterWorkContext workCtx = ctx.ensureSubcontext(AttributeFilterWorkContext.class);
final IdPAttribute attribute = new IdPAttribute(ATTR_NAME);
attribute.setValues(Collections.emptyList());
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
index 3f381c0b8..fba8966fb 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
@@ -207,7 +207,7 @@ public class AttributeValueFilterPolicyTest {
AttributeFilterContext context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(Arrays.asList(attribute1));
- AttributeFilterWorkContext workCtx = context.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ AttributeFilterWorkContext workCtx = context.ensureSubcontext(AttributeFilterWorkContext.class);
policy.apply(attribute1, context);
Collection<IdPAttributeValue> result = workCtx.getPermittedIdPAttributeValues().get(ATTR_NAME);
@@ -224,7 +224,7 @@ public class AttributeValueFilterPolicyTest {
policy.initialize();
context = new AttributeFilterContext();
- workCtx = context.getOrCreateSubcontext(AttributeFilterWorkContext.class);
+ workCtx = context.ensureSubcontext(AttributeFilterWorkContext.class);
context.setPrefilteredIdPAttributes(Arrays.asList(attribute1));
policy.apply(attribute1, context);
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 0e07b7063..bfb484adb 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
@@ -72,7 +72,7 @@ public abstract class DataSources {
final MessageContext parent = new MessageContext();
parent.addSubcontext(TestSources.createResolutionContext(principal, issuerID, recipientId));
- final AttributeFilterContext retVal = parent.getOrCreateSubcontext(AttributeFilterContext.class);
+ final AttributeFilterContext retVal = parent.ensureSubcontext(AttributeFilterContext.class);
retVal.setPrincipal(principal);
retVal.setAttributeIssuerID(issuerID);
retVal.setAttributeRecipientID(recipientId);
@@ -83,7 +83,7 @@ public abstract class DataSources {
final MessageContext parent = new MessageContext();
parent.addSubcontext(new AttributeResolutionContext());
- final AttributeFilterContext afc = parent.getOrCreateSubcontext(AttributeFilterContext.class);
+ final AttributeFilterContext afc = parent.ensureSubcontext(AttributeFilterContext.class);
assert afc != null;
return afc;
}
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 ff08d237e..06f27ae34 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
@@ -58,7 +58,7 @@ public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTes
filterContext.setProxiedRequesterContextLookupStrategy(
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
- final ProxiedRequesterContext prc = filterContext.getOrCreateSubcontext(ProxiedRequesterContext.class);
+ final ProxiedRequesterContext prc = filterContext.ensureSubcontext(ProxiedRequesterContext.class);
prc.getRequesters().addAll(Arrays.asList("foo", "bar"));
@@ -79,7 +79,7 @@ public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTes
DataSources.populatedFilterContext("principal", "issuer", "http://example.org");
filterContext.setProxiedRequesterContextLookupStrategy(
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
- final ProxiedRequesterContext prc = filterContext.getOrCreateSubcontext(ProxiedRequesterContext.class);
+ final ProxiedRequesterContext prc = filterContext.ensureSubcontext(ProxiedRequesterContext.class);
prc.getRequesters().addAll(Arrays.asList("foo", "bar"));
filterContext.setPrefilteredIdPAttributes(epaUid.values());
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 0b2d67cf2..bd8a4f1f7 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
@@ -101,7 +101,7 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
connector.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
return Constraint.isNotNull(connector.resolve(context), "Attributes were null");
}
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
index 696fb9d0f..1bad2a88c 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
@@ -140,7 +140,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractIdentifiableInitial
checkSetterPreconditions();
Constraint.isNotNull(mappings, "Mappings cannot be null");
- transcodingRegistry.clear();
+ transcodingRegistry.clear();
for (final TranscodingRule mapping : mappings) {
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
index 9cb803a1a..ebb6fd8d5 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
+++ b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
@@ -78,7 +78,7 @@ public class AbstractAttributeDefinitionTest {
@Test
public void resolve() throws Exception {
AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
MockAttributeDefinition definition = new MockAttributeDefinition("foo", (IdPAttribute) null);
definition.initialize();
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
index 5648699ff..276ac6dfc 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
+++ b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
@@ -72,7 +72,7 @@ public class AbstractDataConnectorTest {
*/
@Test public void resolve() throws Exception {
AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
MockBaseDataConnector connector = new MockBaseDataConnector("foo", (Map<String, IdPAttribute>) null);
connector.initialize();
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
index 55c9a79a2..643a9a497 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
+++ b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
@@ -142,7 +142,7 @@ public class AbstractResolverPluginTest {
*/
@Test public void resolver() throws Exception {
AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
MockBaseAttributeResolver plugin = new MockBaseAttributeResolver("foo", "bar");
plugin.initialize();
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java
index 576e09b90..418940c9d 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java
+++ b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java
@@ -36,7 +36,7 @@ public class AttributeResolutionLookupTest {
@Test public void apply() {
final ProfileRequestContext pfc = new ProfileRequestContext();
- final AttributeResolutionContext arc = pfc.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext arc = pfc.ensureSubcontext(AttributeResolutionContext.class);
assert arc != null;
arc.setAttributeIssuerID("child");
@@ -46,7 +46,7 @@ public class AttributeResolutionLookupTest {
@Test public void applyParent() {
final AttributeResolutionContext parent = new AttributeResolutionContext();
- final ProfileRequestContext pfc = parent.getOrCreateSubcontext(ProfileRequestContext.class);
+ final ProfileRequestContext pfc = parent.ensureSubcontext(ProfileRequestContext.class);
parent.setAttributeIssuerID("parent");
final TestClass what = new TestClass();
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index 8e969ed8f..d78f67516 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -191,7 +191,7 @@ public class AttributeResolverImpl extends AbstractIdentifiableInitializableComp
Constraint.isNotNull(resolutionContext, "Attribute resolution context cannot be null");
final AttributeResolverWorkContext workContext =
- resolutionContext.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ resolutionContext.ensureSubcontext(AttributeResolverWorkContext.class);
AttributeContext attributeContext = null;
final boolean timerStarted = startTimer(resolutionContext);
@@ -206,7 +206,7 @@ public class AttributeResolverImpl extends AbstractIdentifiableInitializableComp
}
finalizePreResolvedAttributes(resolutionContext);
}
- attributeContext = resolutionContext.getOrCreateSubcontext(AttributeContext.class);
+ attributeContext = resolutionContext.ensureSubcontext(AttributeContext.class);
boolean hasExportingDataConnector = false;
@@ -608,7 +608,7 @@ public class AttributeResolverImpl extends AbstractIdentifiableInitializableComp
return;
}
- final AttributeContext context = resolutionContext.getOrCreateSubcontext(AttributeContext.class);
+ final AttributeContext context = resolutionContext.ensureSubcontext(AttributeContext.class);
log.debug("Pre-resolved Attributes: {}", resolvedAttributes.keySet());
context.setIdPAttributes(resolvedAttributes.values());
context.setUnfilteredIdPAttributes(resolvedAttributes.values());
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 29e7db4d7..650d4b224 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
@@ -77,7 +77,7 @@ public class DateTimeAttributeDefinitionTest {
simple.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
final IdPAttribute result = simple.resolve(context);
assert result != null;
@@ -118,7 +118,7 @@ public class DateTimeAttributeDefinitionTest {
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
try {
resolver.resolveAttributes(context);
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
index f0cbf79ef..9864246e5 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
@@ -117,7 +117,7 @@ public class DecryptedAttributeTest {
decrypted.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
final IdPAttribute result = decrypted.resolve(context);
assert result != null;
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
index 7f3aa0ce0..cf4064cbb 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
@@ -50,7 +50,7 @@ public class LogicTest {
assertFalse(app.test(pfc));
assertFalse(arip.test(pfc));
- pfc.getOrCreateSubcontext(AttributeResolutionContext.class);
+ pfc.ensureSubcontext(AttributeResolutionContext.class);
assertFalse(aiip.test(pfc));
assertFalse(app.test(pfc));
assertFalse(arip.test(pfc));
@@ -58,7 +58,7 @@ public class LogicTest {
@Test public void wrong() {
final ProfileRequestContext pfc = new ProfileRequestContext();
- final AttributeResolutionContext arc = pfc.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext arc = pfc.ensureSubcontext(AttributeResolutionContext.class);
assert arc != null;
arc.setAttributeIssuerID("badValue");
@@ -72,7 +72,7 @@ public class LogicTest {
@Test public void correct() {
final ProfileRequestContext pfc = new ProfileRequestContext();
- final AttributeResolutionContext arc = pfc.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext arc = pfc.ensureSubcontext(AttributeResolutionContext.class);
assert arc != null;
arc.setAttributeIssuerID("AII");
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java
index 45dfae460..d8dd018e0 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java
@@ -41,7 +41,7 @@ public class PrincipalNameAttributeDefinitionTest {
defn.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
try {
defn.resolve(context);
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 fbee8d4f7..b1d4d35c5 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
@@ -78,7 +78,7 @@ public class SimpleAttributeTest {
simple.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
final IdPAttribute result = simple.resolve(context);
assert result != null;
@@ -113,7 +113,7 @@ public class SimpleAttributeTest {
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
resolver.resolveAttributes(context);
final IdPAttribute result = context.getResolvedIdPAttributes().get(TEST_ATTRIBUTE_NAME);
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java
index 806ee60a4..7c000c059 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java
@@ -75,7 +75,7 @@ public class StaticAttributeDefinitionTest {
assertNotNull(attrDef.getValue());
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
IdPAttribute result = attrDef.resolve(context);
assert result != null;
assertEquals(result.getId(), "attribute");
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
index bf203f95d..1eba6ec85 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
@@ -151,7 +151,7 @@ public class TemplateAttributeTest {
attr.initialize();
assertNotNull(attr.getTemplate());
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
final IdPAttribute val = attr.resolve(context);
assert val != null;
final Collection<?> results = val.getValues();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java
index f4d11209a..3bd191213 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java
@@ -60,7 +60,7 @@ public class SAMLAttributeDataConnectorTest extends XMLObjectBaseTestCase {
connector.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
final Map<String, IdPAttribute> attributes = connector.resolve(context);
assert attributes != null;
assertEquals(attributes.size(), 2);
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
index 9b56dcea9..02f68fe6a 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
@@ -62,8 +62,8 @@ public class ScriptedDataConnectorTest {
connector.initialize();
- final AttributeResolutionContext context = new ProfileRequestContext().getOrCreateSubcontext(AttributeResolutionContext.class);
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ final AttributeResolutionContext context = new ProfileRequestContext().ensureSubcontext(AttributeResolutionContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
connector.resolve(context);
}
@@ -81,8 +81,8 @@ public class ScriptedDataConnectorTest {
connector.initialize();
- final AttributeResolutionContext context = new ProfileRequestContext().getOrCreateSubcontext(AttributeResolutionContext.class);
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ final AttributeResolutionContext context = new ProfileRequestContext().ensureSubcontext(AttributeResolutionContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
final Map<String, IdPAttribute> result = connector.resolve(context);
assert result != null;
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java
index acbd123da..7c86a79a8 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java
@@ -76,7 +76,7 @@ public class StaticDataConnectorTest {
assertEquals(connector.getAttributes().size(), 2);
final AttributeResolutionContext context = new AttributeResolutionContext();
- context.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ context.ensureSubcontext(AttributeResolverWorkContext.class);
final Map<String, IdPAttribute> result = connector.resolve(context);
assert result != null;
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
index 81ac9d201..50d7fbe7b 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
@@ -103,7 +103,7 @@ public class AttributeResolutionContextTest {
@Test public void lookupsParent() {
final ProfileRequestContext profileCtx = new ProfileRequestContext();
- final AttributeResolutionContext context = profileCtx.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext context = profileCtx.ensureSubcontext(AttributeResolutionContext.class);
assert context != null;
context.setPrincipal(THE_PRINCIPAL);
@@ -125,7 +125,7 @@ public class AttributeResolutionContextTest {
@Test public void lookupsChild() {
final AttributeResolutionContext context = new AttributeResolutionContext();
- final ProfileRequestContext profileCtx = context.getOrCreateSubcontext(ProfileRequestContext.class);
+ final ProfileRequestContext profileCtx = context.ensureSubcontext(ProfileRequestContext.class);
context.setPrincipal(THE_PRINCIPAL);
context.setAttributeIssuerID(THE_ISSUER);
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 7f71eb982..3f164a7bd 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
@@ -433,14 +433,14 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
resolutionContext = TestSources.createResolutionContext("PETER", "issuer", "recipient");
resolutionContext.setProfileRequestContextLookupStrategy(new ChildContextLookup<>(ProfileRequestContext.class));
// add a child so we can navigate via that
- resolutionContext.getOrCreateSubcontext(ProfileRequestContext.class);
+ resolutionContext.ensureSubcontext(ProfileRequestContext.class);
resolver.resolveAttributes(resolutionContext);
assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPA1"));
resolutionContext = TestSources.createResolutionContext("PRINCIPAL", "ISSUER", "recipient");
resolutionContext.setProfileRequestContextLookupStrategy(new ChildContextLookup<>(ProfileRequestContext.class));
- resolutionContext.getOrCreateSubcontext(ProfileRequestContext.class);
+ resolutionContext.ensureSubcontext(ProfileRequestContext.class);
resolver.resolveAttributes(resolutionContext);
assertEquals(resolutionContext.getResolvedIdPAttributes().size(), 1);
assertNotNull(resolutionContext.getResolvedIdPAttributes().get("EPE"));
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeParserTest.java
index b8c0ae364..34720c192 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeParserTest.java
@@ -78,7 +78,7 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
try {
final ScriptedAttributeDefinition attrdef = getAttributeDefn("resolver/scriptedAttributeBad.xml", ScriptedAttributeDefinition.class);
AttributeResolutionContext arc = new AttributeResolutionContext();
- arc.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ arc.ensureSubcontext(AttributeResolverWorkContext.class);
attrdef.resolve(arc);
fail("Bad script worked?");
} catch (BeanDefinitionStoreException | BeanCreationException | ResolutionException e) {
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeParserTest.java
index c1d00f1fc..3595a8e45 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeParserTest.java
@@ -128,7 +128,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
final ResolutionLabelPredicate pre = (ResolutionLabelPredicate) attr.getActivationCondition();
assert pre != null;
final ProfileRequestContext prc = new ProfileRequestContext();
- final AttributeResolutionContext resContext = prc.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext resContext = prc.ensureSubcontext(AttributeResolutionContext.class);
resContext.setResolutionLabel("p1");
assertTrue(pre.test(prc));
resContext.setResolutionLabel("p2 p3");
@@ -156,7 +156,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
final Predicate<ProfileRequestContext> pre = attr.getActivationCondition();
assert pre != null;
final ProfileRequestContext prc = new ProfileRequestContext();
- final AttributeResolutionContext resContext = prc.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext resContext = prc.ensureSubcontext(AttributeResolutionContext.class);
resContext.setResolutionLabel("p1");
assertFalse(pre.test(prc));
resContext.setResolutionLabel("p2 p3");
@@ -184,7 +184,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
final Predicate<ProfileRequestContext> pre = attr.getActivationCondition();
assert pre != null;
final ProfileRequestContext prc = new ProfileRequestContext();
- final AttributeResolutionContext resContext = prc.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext resContext = prc.ensureSubcontext(AttributeResolutionContext.class);
resContext.setResolutionLabel("p1");
assertTrue(pre.test(prc));
diff --git a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java
index f573d547e..b844adc96 100644
--- a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java
@@ -71,7 +71,7 @@ public class ResolverTestSupport {
@Nonnull public static AttributeResolutionContext buildResolutionContext(final ResolverPlugin<?>... plugins) {
final AttributeResolutionContext resolutionContext = new AttributeResolutionContext();
final AttributeResolverWorkContext workContext =
- resolutionContext.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ resolutionContext.ensureSubcontext(AttributeResolverWorkContext.class);
assert workContext != null;
diff --git a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
index c46e0792f..575f308bd 100644
--- a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
@@ -226,14 +226,14 @@ public final class TestSources {
@Nonnull public static AttributeResolutionContext createResolutionContext(String principal, String issuerID,
String recipientId) {
final ProfileRequestContext parent = new ProfileRequestContext();
- final AttributeResolutionContext retVal = parent.getOrCreateSubcontext(AttributeResolutionContext.class);
+ final AttributeResolutionContext retVal = parent.ensureSubcontext(AttributeResolutionContext.class);
assert retVal != null;
retVal.setAttributeIssuerID(issuerID);
retVal.setAttributeRecipientID(recipientId);
retVal.setPrincipal(principal);
- retVal.getOrCreateSubcontext(AttributeResolverWorkContext.class);
+ retVal.ensureSubcontext(AttributeResolverWorkContext.class);
return retVal;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list