[java-identity-provider] branch main updated: Rename getBuilderOrThrow to ensureBuilder.
Scott Cantor
cantor.2 at osu.edu
Tue Mar 14 21:52:58 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor 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=afb11f1606afdd98be1f6c2296dae881ef3ad11d
The following commit(s) were added to refs/heads/main by this push:
new afb11f160 Rename getBuilderOrThrow to ensureBuilder.
afb11f160 is described below
commit afb11f1606afdd98be1f6c2296dae881ef3ad11d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 14 17:52:54 2023 -0400
Rename getBuilderOrThrow to ensureBuilder.
---
.../idp/admin/BasicAdministrativeFlowDescriptor.java | 12 ++++++------
.../flow/impl/AbstractOutgoingSamlMessageAction.java | 2 +-
.../BuildSamlValidationSuccessMessageAction.java | 2 +-
.../test/flows/c14n/actions/SetupForSAML1C14N.java | 2 +-
.../test/flows/c14n/actions/SetupForSAML2C14N.java | 2 +-
.../flows/saml1/SAML1AttributeQueryFlowTest.java | 4 ++--
.../test/flows/saml1/SAML1TestResponseValidator.java | 2 +-
.../flows/saml2/SAML2AttributeQueryFlowTest.java | 6 +++---
.../test/flows/saml2/SAML2TestResponseValidator.java | 6 +++---
.../logic/impl/AttributeValuesHashFunctionTest.java | 2 +-
.../principal/impl/NameIDPrincipalSerializer.java | 2 +-
.../impl/AddAttributeStatementToAssertion.java | 2 +-
.../impl/AddAuthenticationStatementToAssertion.java | 4 ++--
.../impl/AddAttributeStatementToAssertion.java | 2 +-
.../idp/saml/saml2/profile/impl/AddAuthnRequest.java | 20 ++++++++++----------
.../profile/impl/AddAuthnStatementToAssertion.java | 8 ++++----
.../impl/IdPInitiatedSSORequestMessageDecoder.java | 6 +++---
.../idp/saml/session/impl/AddLogoutRequest.java | 6 +++---
...ibuteSourcedSAML1NameIdentifierGeneratorTest.java | 4 ++--
.../AttributeSourcedSAML2NameIDGeneratorTest.java | 4 ++--
.../saml/nameid/impl/NameIDCanonicalizationTest.java | 2 +-
.../impl/NameIdentifierCanonicalizationTest.java | 2 +-
.../DefaultNameIdentifierFormatStrategyTest.java | 12 ++++++------
.../saml/saml2/profile/impl/AddAuthnRequestTest.java | 2 +-
.../impl/EnforceDisallowedSSOFeaturesTest.java | 2 +-
.../profile/impl/PreProcessLogoutMessageTest.java | 4 ++--
.../saml2/profile/impl/ProcessLogoutRequestTest.java | 2 +-
.../impl/ProcessRequestedAuthnContextTest.java | 6 +++---
28 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java b/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
index 30eba65bf..5f173c2e7 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
@@ -132,7 +132,7 @@ public class BasicAdministrativeFlowDescriptor extends AbstractInterceptorAwareP
forceAuthnPredicate = PredicateSupport.alwaysFalse();
builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
- uiInfo = ((SAMLObjectBuilder<UIInfo>) builderFactory.<UIInfo>getBuilderOrThrow(
+ uiInfo = ((SAMLObjectBuilder<UIInfo>) builderFactory.<UIInfo>ensureBuilder(
UIInfo.DEFAULT_ELEMENT_NAME)).buildObject();
defaultAuthenticationMethodsLookupStrategy = FunctionSupport.constant(null);
@@ -227,7 +227,7 @@ public class BasicAdministrativeFlowDescriptor extends AbstractInterceptorAwareP
uiInfo.getDisplayNames().clear();
for (final LangBearingString s : displayNames) {
final DisplayName displayName =
- ((SAMLObjectBuilder<DisplayName>) builderFactory.<DisplayName>getBuilderOrThrow(
+ ((SAMLObjectBuilder<DisplayName>) builderFactory.<DisplayName>ensureBuilder(
DisplayName.DEFAULT_ELEMENT_NAME)).buildObject();
displayName.setValue(s.getValue());
displayName.setXMLLang(s.getLang());
@@ -244,7 +244,7 @@ public class BasicAdministrativeFlowDescriptor extends AbstractInterceptorAwareP
uiInfo.getDescriptions().clear();
for (final LangBearingString s : descriptions) {
final Description desc =
- ((SAMLObjectBuilder<Description>) builderFactory.<Description>getBuilderOrThrow(
+ ((SAMLObjectBuilder<Description>) builderFactory.<Description>ensureBuilder(
Description.DEFAULT_ELEMENT_NAME)).buildObject();
desc.setValue(s.getValue());
desc.setXMLLang(s.getLang());
@@ -263,7 +263,7 @@ public class BasicAdministrativeFlowDescriptor extends AbstractInterceptorAwareP
for (final Logo src : logos) {
final org.opensaml.saml.ext.saml2mdui.Logo logo =
((SAMLObjectBuilder<org.opensaml.saml.ext.saml2mdui.Logo>)
- builderFactory.<org.opensaml.saml.ext.saml2mdui.Logo>getBuilderOrThrow(
+ builderFactory.<org.opensaml.saml.ext.saml2mdui.Logo>ensureBuilder(
org.opensaml.saml.ext.saml2mdui.Logo.DEFAULT_ELEMENT_NAME)).buildObject();
logo.setURI(src.getValue());
logo.setXMLLang(src.getLang());
@@ -282,7 +282,7 @@ public class BasicAdministrativeFlowDescriptor extends AbstractInterceptorAwareP
uiInfo.getInformationURLs().clear();
for (final LangBearingString s : urls) {
final InformationURL url =
- ((SAMLObjectBuilder<InformationURL>) builderFactory.<InformationURL>getBuilderOrThrow(
+ ((SAMLObjectBuilder<InformationURL>) builderFactory.<InformationURL>ensureBuilder(
InformationURL.DEFAULT_ELEMENT_NAME)).buildObject();
url.setURI(s.getValue());
url.setXMLLang(s.getLang());
@@ -299,7 +299,7 @@ public class BasicAdministrativeFlowDescriptor extends AbstractInterceptorAwareP
uiInfo.getPrivacyStatementURLs().clear();
for (final LangBearingString s : urls) {
final PrivacyStatementURL url =
- ((SAMLObjectBuilder<PrivacyStatementURL>) builderFactory.<PrivacyStatementURL>getBuilderOrThrow(
+ ((SAMLObjectBuilder<PrivacyStatementURL>) builderFactory.<PrivacyStatementURL>ensureBuilder(
PrivacyStatementURL.DEFAULT_ELEMENT_NAME)).buildObject();
url.setURI(s.getValue());
url.setXMLLang(s.getLang());
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractOutgoingSamlMessageAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractOutgoingSamlMessageAction.java
index c1320047b..00260884b 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractOutgoingSamlMessageAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractOutgoingSamlMessageAction.java
@@ -98,7 +98,7 @@ public abstract class AbstractOutgoingSamlMessageAction extends
*/
@Nonnull protected static <T extends SAMLObject> T newSAMLObject(final Class<T> type, @Nonnull final QName elementName) {
final SAMLObjectBuilder<T> builder = (SAMLObjectBuilder<T>) XMLObjectProviderRegistrySupport.getBuilderFactory()
- .<T> getBuilderOrThrow(elementName);
+ .<T> ensureBuilder(elementName);
return builder.buildObject();
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java
index 51488fe0b..0f3f05b82 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java
@@ -91,7 +91,7 @@ public class BuildSamlValidationSuccessMessageAction extends AbstractOutgoingSam
identifierGenerationStrategy = strategy;
entityID = Constraint.isNotNull(StringSupport.trimOrNull(id), "EntityID cannot be null");
- attrValueBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(
+ attrValueBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(
XSString.TYPE_NAME);
}
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
index d5eef18f5..cd57607f7 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
@@ -68,7 +68,7 @@ public class SetupForSAML1C14N extends AbstractProfileAction {
}
final SAMLObjectBuilder<NameIdentifier> identifierBuilder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
final NameIdentifier nameId = identifierBuilder.buildObject();
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
index 08d52f61b..a5fb0764f 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
@@ -68,7 +68,7 @@ public class SetupForSAML2C14N extends AbstractProfileAction {
return null;
}
final SAMLObjectBuilder<NameID> identifierBuilder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
final NameID nameId = identifierBuilder.buildObject();
nameId.setFormat(NameIDType.UNSPECIFIED);
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
index b88163213..1e58e46de 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
@@ -60,7 +60,7 @@ public class SAML1AttributeQueryFlowTest extends AbstractSAML1FlowTest {
@BeforeClass void setupValidator() {
final SAMLObjectBuilder<NameIdentifier> builder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
final NameIdentifier nameIdentifier = builder.buildObject();
nameIdentifier.setValue("jdoe");
@@ -158,7 +158,7 @@ public class SAML1AttributeQueryFlowTest extends AbstractSAML1FlowTest {
if (includeDesignators) {
final SAMLObjectBuilder<AttributeDesignator> designatorBuilder = (SAMLObjectBuilder<AttributeDesignator>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>ensureBuilder(
AttributeDesignator.DEFAULT_ELEMENT_NAME);
AttributeDesignator designator = designatorBuilder.buildObject();
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
index 36c7a94fa..789d0bc7f 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
@@ -82,7 +82,7 @@ public class SAML1TestResponseValidator {
/** Constructor. */
public SAML1TestResponseValidator() {
final SAMLObjectBuilder<NameIdentifier> builder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
nameIdentifier = builder.buildObject();
nameIdentifier.setFormat(SAMLConstants.SAML1_NAMEID_TRANSIENT);
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
index cd0dbfbfd..bec8cff99 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
@@ -62,7 +62,7 @@ public class SAML2AttributeQueryFlowTest extends AbstractSAML2FlowTest {
@BeforeClass void setupValidator() {
final SAMLObjectBuilder<NameID> builder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
final NameID nameID = builder.buildObject();
nameID.setValue("jdoe");
@@ -167,10 +167,10 @@ public class SAML2AttributeQueryFlowTest extends AbstractSAML2FlowTest {
if (includeDesignators) {
final SAMLObjectBuilder<Attribute> designatorBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.DEFAULT_ELEMENT_NAME);
final XMLObjectBuilder<XSAny> valueBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>ensureBuilder(
XSAny.TYPE_NAME);
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
index 64554e677..c30517db7 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
@@ -123,7 +123,7 @@ public class SAML2TestResponseValidator extends SAML2TestStatusResponseTypeValid
/** Constructor. */
public SAML2TestResponseValidator() {
final SAMLObjectBuilder<NameID> builder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
nameID = builder.buildObject();
nameID.setFormat(NameID.TRANSIENT);
@@ -145,11 +145,11 @@ public class SAML2TestResponseValidator extends SAML2TestStatusResponseTypeValid
protected void buildExpectedAttributes() {
final SAMLObjectBuilder<Attribute> builder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.DEFAULT_ELEMENT_NAME);
final XMLObjectBuilder<XSAny> anyBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>ensureBuilder(
XSAny.TYPE_NAME);
// the expected schacHomeOrganization attribute
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeValuesHashFunctionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeValuesHashFunctionTest.java
index f868ac3da..42ad93de6 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeValuesHashFunctionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeValuesHashFunctionTest.java
@@ -95,7 +95,7 @@ public class AttributeValuesHashFunctionTest extends XMLObjectBaseTestCase {
@Test public void testXML() {
// NOTE Any change is an ODS drift
final XMLObjectBuilder<XSString> builder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(
XSString.TYPE_NAME);
final XSString xmlString = builder.buildObject(XSString.TYPE_NAME);
xmlString.setValue("value");
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java
index 96457ff87..7d23733e2 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java
@@ -84,7 +84,7 @@ public class NameIDPrincipalSerializer extends AbstractPrincipalSerializer<Strin
public NameIDPrincipalSerializer() {
objectBuilderFactory = Json.createBuilderFactory(null);
nameIDBuilder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
index b19f9c340..321a71082 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
@@ -153,7 +153,7 @@ public class AddAttributeStatementToAssertion extends BaseAddAttributeStatementT
}
final SAMLObjectBuilder<AttributeStatement> statementBuilder = (SAMLObjectBuilder<AttributeStatement>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeStatement>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeStatement>ensureBuilder(
AttributeStatement.DEFAULT_ELEMENT_NAME);
final AttributeStatement statement = statementBuilder.buildObject();
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
index 19cac8d48..02c7b2cd8 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
@@ -153,9 +153,9 @@ public class AddAuthenticationStatementToAssertion extends BaseAddAuthentication
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<AuthenticationStatement> statementBuilder = (SAMLObjectBuilder<AuthenticationStatement>)
- bf.<AuthenticationStatement>getBuilderOrThrow(AuthenticationStatement.TYPE_NAME);
+ bf.<AuthenticationStatement>ensureBuilder(AuthenticationStatement.TYPE_NAME);
final SAMLObjectBuilder<SubjectLocality> localityBuilder = (SAMLObjectBuilder<SubjectLocality>)
- bf.<SubjectLocality>getBuilderOrThrow(SubjectLocality.TYPE_NAME);
+ bf.<SubjectLocality>ensureBuilder(SubjectLocality.TYPE_NAME);
final AuthenticationStatement statement = statementBuilder.buildObject();
statement.setAuthenticationInstant(getAuthenticationResult().getAuthenticationInstant());
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
index 4e9e09b86..3b5d352fe 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
@@ -156,7 +156,7 @@ public class AddAttributeStatementToAssertion extends BaseAddAttributeStatementT
}
final SAMLObjectBuilder<AttributeStatement> statementBuilder = (SAMLObjectBuilder<AttributeStatement>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeStatement>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeStatement>ensureBuilder(
AttributeStatement.DEFAULT_ELEMENT_NAME);
final AttributeStatement statement = statementBuilder.buildObject();
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java
index b29da89ab..211c385c4 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java
@@ -255,10 +255,10 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<AuthnRequest> requestBuilder =
- (SAMLObjectBuilder<AuthnRequest>) bf.<AuthnRequest>getBuilderOrThrow(
+ (SAMLObjectBuilder<AuthnRequest>) bf.<AuthnRequest>ensureBuilder(
AuthnRequest.DEFAULT_ELEMENT_NAME);
final SAMLObjectBuilder<NameIDPolicy> nipBuilder =
- (SAMLObjectBuilder<NameIDPolicy>) bf.<NameIDPolicy>getBuilderOrThrow(
+ (SAMLObjectBuilder<NameIDPolicy>) bf.<NameIDPolicy>ensureBuilder(
NameIDPolicy.DEFAULT_ELEMENT_NAME);
final AuthnRequest object = requestBuilder.buildObject();
@@ -278,7 +278,7 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
if (issuerId != null) {
log.debug("{} Setting Issuer to {}", getLogPrefix(), issuerId);
final SAMLObjectBuilder<Issuer> issuerBuilder =
- (SAMLObjectBuilder<Issuer>) bf.<Issuer>getBuilderOrThrow(Issuer.DEFAULT_ELEMENT_NAME);
+ (SAMLObjectBuilder<Issuer>) bf.<Issuer>ensureBuilder(Issuer.DEFAULT_ELEMENT_NAME);
final Issuer issuer = issuerBuilder.buildObject();
issuer.setValue(issuerId);
object.setIssuer(issuer);
@@ -357,7 +357,7 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<RequestedAuthnContext> builder =
- (SAMLObjectBuilder<RequestedAuthnContext>) bf.<RequestedAuthnContext>getBuilderOrThrow(
+ (SAMLObjectBuilder<RequestedAuthnContext>) bf.<RequestedAuthnContext>ensureBuilder(
RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
// Check for class refs.
@@ -432,7 +432,7 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<Scoping> scopingBuilder =
- (SAMLObjectBuilder<Scoping>) bf.<Scoping>getBuilderOrThrow(Scoping.DEFAULT_ELEMENT_NAME);
+ (SAMLObjectBuilder<Scoping>) bf.<Scoping>ensureBuilder(Scoping.DEFAULT_ELEMENT_NAME);
final Scoping scoping = scopingBuilder.buildObject();
if (count != null) {
@@ -442,9 +442,9 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
if (!idplist.isEmpty()) {
final SAMLObjectBuilder<IDPList> idpListBuilder =
- (SAMLObjectBuilder<IDPList>) bf.<IDPList>getBuilderOrThrow(IDPList.DEFAULT_ELEMENT_NAME);
+ (SAMLObjectBuilder<IDPList>) bf.<IDPList>ensureBuilder(IDPList.DEFAULT_ELEMENT_NAME);
final SAMLObjectBuilder<IDPEntry> idpBuilder =
- (SAMLObjectBuilder<IDPEntry>) bf.<IDPEntry>getBuilderOrThrow(IDPEntry.DEFAULT_ELEMENT_NAME);
+ (SAMLObjectBuilder<IDPEntry>) bf.<IDPEntry>ensureBuilder(IDPEntry.DEFAULT_ELEMENT_NAME);
final IDPList idps = idpListBuilder.buildObject();
for (final String idp : idplist) {
@@ -457,7 +457,7 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
}
final SAMLObjectBuilder<RequesterID> requesterIdBuilder =
- (SAMLObjectBuilder<RequesterID>) bf.<RequesterID>getBuilderOrThrow(RequesterID.DEFAULT_ELEMENT_NAME);
+ (SAMLObjectBuilder<RequesterID>) bf.<RequesterID>ensureBuilder(RequesterID.DEFAULT_ELEMENT_NAME);
final ProxiedRequesterContext proxiedReqCtx =
proxiedRequesterContextLookupStrategy.apply(profileRequestContext);
@@ -496,10 +496,10 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
if (!attrs.isEmpty()) {
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<Extensions> extBuilder =
- (SAMLObjectBuilder<Extensions>) bf.<Extensions>getBuilderOrThrow(
+ (SAMLObjectBuilder<Extensions>) bf.<Extensions>ensureBuilder(
Extensions.DEFAULT_ELEMENT_NAME);
final SAMLObjectBuilder<RequestedAttributes> reqExtBuilder =
- (SAMLObjectBuilder<RequestedAttributes>) bf.<RequestedAttributes>getBuilderOrThrow(
+ (SAMLObjectBuilder<RequestedAttributes>) bf.<RequestedAttributes>ensureBuilder(
RequestedAttributes.DEFAULT_ELEMENT_NAME);
final RequestedAttributes reqExt = reqExtBuilder.buildObject();
attrs.forEach(attr -> {
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
index 462641109..761eb82c1 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
@@ -194,11 +194,11 @@ public class AddAuthnStatementToAssertion extends BaseAddAuthenticationStatement
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<AuthnStatement> statementBuilder = (SAMLObjectBuilder<AuthnStatement>)
- bf.<AuthnStatement>getBuilderOrThrow(AuthnStatement.TYPE_NAME);
+ bf.<AuthnStatement>ensureBuilder(AuthnStatement.TYPE_NAME);
final SAMLObjectBuilder<AuthnContext> authnContextBuilder = (SAMLObjectBuilder<AuthnContext>)
- bf.<AuthnContext>getBuilderOrThrow(AuthnContext.TYPE_NAME);
+ bf.<AuthnContext>ensureBuilder(AuthnContext.TYPE_NAME);
final SAMLObjectBuilder<SubjectLocality> localityBuilder = (SAMLObjectBuilder<SubjectLocality>)
- bf.<SubjectLocality>getBuilderOrThrow(SubjectLocality.TYPE_NAME);
+ bf.<SubjectLocality>ensureBuilder(SubjectLocality.TYPE_NAME);
final AuthnStatement statement = statementBuilder.buildObject();
statement.setAuthnInstant(getAuthenticationResult().getAuthenticationInstant());
@@ -262,7 +262,7 @@ public class AddAuthnStatementToAssertion extends BaseAddAuthenticationStatement
if (!suppress) {
final SAMLObjectBuilder<AuthenticatingAuthority> authorityBuilder =
(SAMLObjectBuilder<AuthenticatingAuthority>) XMLObjectProviderRegistrySupport
- .getBuilderFactory().<AuthenticatingAuthority>getBuilderOrThrow(
+ .getBuilderFactory().<AuthenticatingAuthority>ensureBuilder(
AuthenticatingAuthority.DEFAULT_ELEMENT_NAME);
for (final String authority : proxyPrincipal.getAuthorities()) {
final AuthenticatingAuthority aa = authorityBuilder.buildObject();
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoder.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoder.java
index 94930bd92..3aee3c6db 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoder.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoder.java
@@ -70,11 +70,11 @@ public class IdPInitiatedSSORequestMessageDecoder extends BaseIdPInitiatedSSOReq
final XMLObjectBuilderFactory factory = XMLObjectProviderRegistrySupport.getBuilderFactory();
requestBuilder = (SAMLObjectBuilder<AuthnRequest>)
- factory.<AuthnRequest>getBuilderOrThrow(AuthnRequest.DEFAULT_ELEMENT_NAME);
+ factory.<AuthnRequest>ensureBuilder(AuthnRequest.DEFAULT_ELEMENT_NAME);
issuerBuilder = (SAMLObjectBuilder<Issuer>)
- factory.<Issuer>getBuilderOrThrow(Issuer.DEFAULT_ELEMENT_NAME);
+ factory.<Issuer>ensureBuilder(Issuer.DEFAULT_ELEMENT_NAME);
nipBuilder = (SAMLObjectBuilder<NameIDPolicy>)
- factory.<NameIDPolicy>getBuilderOrThrow(NameIDPolicy.DEFAULT_ELEMENT_NAME);
+ factory.<NameIDPolicy>ensureBuilder(NameIDPolicy.DEFAULT_ELEMENT_NAME);
}
/** {@inheritDoc} */
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java
index f153ce493..4cd165c1e 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java
@@ -215,7 +215,7 @@ public class AddLogoutRequest extends AbstractProfileAction {
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<LogoutRequest> requestBuilder =
- (SAMLObjectBuilder<LogoutRequest>) bf.<LogoutRequest>getBuilderOrThrow(
+ (SAMLObjectBuilder<LogoutRequest>) bf.<LogoutRequest>ensureBuilder(
LogoutRequest.DEFAULT_ELEMENT_NAME);
final LogoutRequest object = requestBuilder.buildObject();
@@ -239,7 +239,7 @@ public class AddLogoutRequest extends AbstractProfileAction {
if (issuerId != null) {
log.debug("{} Setting Issuer to {}", getLogPrefix(), issuerId);
final SAMLObjectBuilder<Issuer> issuerBuilder =
- (SAMLObjectBuilder<Issuer>) bf.<Issuer>getBuilderOrThrow(Issuer.DEFAULT_ELEMENT_NAME);
+ (SAMLObjectBuilder<Issuer>) bf.<Issuer>ensureBuilder(Issuer.DEFAULT_ELEMENT_NAME);
final Issuer issuer = issuerBuilder.buildObject();
issuer.setValue(issuerId);
object.setIssuer(issuer);
@@ -249,7 +249,7 @@ public class AddLogoutRequest extends AbstractProfileAction {
if (includeSessionIndex) {
final SAMLObjectBuilder<SessionIndex> indexBuilder =
- (SAMLObjectBuilder<SessionIndex>) bf.<SessionIndex>getBuilderOrThrow(
+ (SAMLObjectBuilder<SessionIndex>) bf.<SessionIndex>ensureBuilder(
SessionIndex.DEFAULT_ELEMENT_NAME);
final SessionIndex index = indexBuilder.buildObject();
index.setValue(s2Session.getSessionIndex());
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
index e6fe32a56..b80256d0d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
@@ -90,11 +90,11 @@ public class AttributeSourcedSAML1NameIdentifierGeneratorTest extends OpenSAMLIn
generator.setId("test");
generator.setFormat(NameIdentifier.X509_SUBJECT);
saml1Builder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
saml2Builder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
prc = new RequestContextBuilder().buildProfileRequestContext();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
index 90f01a69a..cbacbf80e 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGeneratorTest.java
@@ -90,11 +90,11 @@ public class AttributeSourcedSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTe
generator.setId("test");
generator.setFormat(NameID.X509_SUBJECT);
saml1Builder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
saml2Builder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
prc = new RequestContextBuilder().buildProfileRequestContext();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIDCanonicalizationTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIDCanonicalizationTest.java
index b9188125f..ab7948f70 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIDCanonicalizationTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIDCanonicalizationTest.java
@@ -64,7 +64,7 @@ public class NameIDCanonicalizationTest extends OpenSAMLInitBaseTestCase {
@BeforeClass public void initialize() {
builder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierCanonicalizationTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierCanonicalizationTest.java
index 58189bcc2..db29470c2 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierCanonicalizationTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierCanonicalizationTest.java
@@ -66,7 +66,7 @@ public class NameIdentifierCanonicalizationTest extends OpenSAMLInitBaseTestCase
@BeforeClass public void initialize() {
builder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/context/navigate/tests/DefaultNameIdentifierFormatStrategyTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/context/navigate/tests/DefaultNameIdentifierFormatStrategyTest.java
index 3355b16f2..0e2c74899 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/context/navigate/tests/DefaultNameIdentifierFormatStrategyTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/context/navigate/tests/DefaultNameIdentifierFormatStrategyTest.java
@@ -56,10 +56,10 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
@BeforeMethod
public void setUp() throws ComponentInitializationException {
SAMLObjectBuilder<EntityDescriptor> edBuilder = (SAMLObjectBuilder<EntityDescriptor>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<EntityDescriptor>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<EntityDescriptor>ensureBuilder(
EntityDescriptor.DEFAULT_ELEMENT_NAME);
SAMLObjectBuilder<SPSSODescriptor> roleBuilder = (SAMLObjectBuilder<SPSSODescriptor>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<SPSSODescriptor>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<SPSSODescriptor>ensureBuilder(
SPSSODescriptor.DEFAULT_ELEMENT_NAME);
profileConfig = new BrowserSSOProfileConfiguration();
@@ -105,7 +105,7 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
@Test
public void testNoProfileConfig() {
SAMLObjectBuilder<NameIDFormat> formatBuilder = (SAMLObjectBuilder<NameIDFormat>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>ensureBuilder(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
format.setURI(NameID.EMAIL);
@@ -123,7 +123,7 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
profileConfig.setNameIDFormatPrecedence(Arrays.asList(NameID.EMAIL, NameID.TRANSIENT));
SAMLObjectBuilder<NameIDFormat> formatBuilder = (SAMLObjectBuilder<NameIDFormat>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>ensureBuilder(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
format.setURI(NameID.PERSISTENT);
@@ -141,7 +141,7 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
profileConfig.setNameIDFormatPrecedence(Arrays.asList(NameID.EMAIL, NameID.TRANSIENT));
SAMLObjectBuilder<NameIDFormat> formatBuilder = (SAMLObjectBuilder<NameIDFormat>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>ensureBuilder(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
format.setURI(NameID.TRANSIENT);
@@ -159,7 +159,7 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
profileConfig.setNameIDFormatPrecedence(Arrays.asList(NameID.EMAIL, NameID.TRANSIENT));
SAMLObjectBuilder<NameIDFormat> formatBuilder = (SAMLObjectBuilder<NameIDFormat>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>ensureBuilder(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
format.setURI(NameID.TRANSIENT);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
index 8df4f3f5c..2fb01418a 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
@@ -267,7 +267,7 @@ public class AddAuthnRequestTest extends OpenSAMLInitBaseTestCase {
@Test public void testRequestedAttributes() {
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
final SAMLObjectBuilder<RequestedAttribute> reqAttrBuilder =
- (SAMLObjectBuilder<RequestedAttribute>) bf.<RequestedAttribute>getBuilderOrThrow(
+ (SAMLObjectBuilder<RequestedAttribute>) bf.<RequestedAttribute>ensureBuilder(
RequestedAttribute.DEFAULT_ELEMENT_NAME);
final RequestedAttribute attr1 = reqAttrBuilder.buildObject();
attr1.setNameFormat(Attribute.URI_REFERENCE);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/EnforceDisallowedSSOFeaturesTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/EnforceDisallowedSSOFeaturesTest.java
index 4197cc08f..d3f9da174 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/EnforceDisallowedSSOFeaturesTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/EnforceDisallowedSSOFeaturesTest.java
@@ -54,7 +54,7 @@ public class EnforceDisallowedSSOFeaturesTest extends OpenSAMLInitBaseTestCase {
@BeforeMethod public void setUp() throws ComponentInitializationException {
nidBuilder = (SAMLObjectBuilder<NameIDPolicy>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDPolicy>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDPolicy>ensureBuilder(
NameIDPolicy.DEFAULT_ELEMENT_NAME);
src = (MockRequestContext) new RequestContextBuilder().buildRequestContext();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/PreProcessLogoutMessageTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/PreProcessLogoutMessageTest.java
index a0819b652..ab978e200 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/PreProcessLogoutMessageTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/PreProcessLogoutMessageTest.java
@@ -96,10 +96,10 @@ public class PreProcessLogoutMessageTest extends OpenSAMLInitBaseTestCase {
imc.setMessage(SAML2ActionTestingSupport.buildLogoutRequest(null));
final SAMLObjectBuilder<Extensions> extsBuilder = (SAMLObjectBuilder<Extensions>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Extensions>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Extensions>ensureBuilder(
Extensions.DEFAULT_ELEMENT_NAME);
final SAMLObjectBuilder<Asynchronous> asyncBuilder = (SAMLObjectBuilder<Asynchronous>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Asynchronous>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Asynchronous>ensureBuilder(
Asynchronous.DEFAULT_ELEMENT_NAME);
final LogoutRequest lr = (LogoutRequest)imc.getMessage();
assert lr!=null;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
index 04b92904a..b50fd5a1c 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
@@ -89,7 +89,7 @@ public class ProcessLogoutRequestTest extends SessionManagerBaseTestCase {
@BeforeMethod public void setUpAction() throws ComponentInitializationException {
sessionIndexBuilder = (SAMLObjectBuilder<SessionIndex>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<SessionIndex>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<SessionIndex>ensureBuilder(
SessionIndex.DEFAULT_ELEMENT_NAME);
final SingleLogoutProfileConfiguration logoutConfig = new SingleLogoutProfileConfiguration();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessRequestedAuthnContextTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessRequestedAuthnContextTest.java
index acccca2b6..5bf8810d8 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessRequestedAuthnContextTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessRequestedAuthnContextTest.java
@@ -66,13 +66,13 @@ public class ProcessRequestedAuthnContextTest extends OpenSAMLInitBaseTestCase {
@BeforeMethod public void setUp() throws ComponentInitializationException {
racBuilder = (SAMLObjectBuilder<RequestedAuthnContext>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAuthnContext>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAuthnContext>ensureBuilder(
RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
classBuilder = (SAMLObjectBuilder<AuthnContextClassRef>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AuthnContextClassRef>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AuthnContextClassRef>ensureBuilder(
AuthnContextClassRef.DEFAULT_ELEMENT_NAME);
declBuilder = (SAMLObjectBuilder<AuthnContextDeclRef>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AuthnContextDeclRef>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AuthnContextDeclRef>ensureBuilder(
AuthnContextDeclRef.DEFAULT_ELEMENT_NAME);
src = (MockRequestContext) new RequestContextBuilder().buildRequestContext();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list