[java-shib-attribute] branch main updated: Rename getBuilderOrThrow to ensureBuilder.
Scott Cantor
cantor.2 at osu.edu
Tue Mar 14 21:52:40 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor 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=9c7f250ea749d7fd82a12947c07bd19db41711fa
The following commit(s) were added to refs/heads/main by this push:
new 9c7f250ea Rename getBuilderOrThrow to ensureBuilder.
9c7f250ea is described below
commit 9c7f250ea749d7fd82a12947c07bd19db41711fa
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 14 17:52:37 2023 -0400
Rename getBuilderOrThrow to ensureBuilder.
---
.../idp/attribute/XMLObjectAttributeValueTest.java | 2 +-
.../saml/impl/AttributeInMetadataMatcherTest.java | 6 +++---
.../saml/impl/MappedAttributeInMetadataMatcherTest.java | 2 +-
.../transcoding/AbstractSAML1AttributeTranscoder.java | 4 ++--
.../transcoding/AbstractSAML2AttributeTranscoder.java | 4 ++--
.../saml/attribute/transcoding/SAMLEncoderSupport.java | 16 ++++++++--------
.../attribute/transcoding/SAMLEncoderSupportTest.java | 2 +-
.../impl/SAML1NameIdentifierAttributeDefinition.java | 2 +-
.../resolver/impl/SAML2NameIDAttributeDefinition.java | 2 +-
.../impl/SAML1ByteAttributeTranscoderTest.java | 6 +++---
.../impl/SAML1ScopedStringAttributeTranscoderTest.java | 8 ++++----
.../impl/SAML1StringAttributeTranscoderTest.java | 6 +++---
.../impl/SAML2ByteAttributeTranscoderTest.java | 6 +++---
.../impl/SAML2DateTimeAttributeTranscoderTest.java | 8 ++++----
.../impl/SAML2ScopedStringAttributeTranscoderTest.java | 6 +++---
.../impl/SAML2StringAttributeTranscoderTest.java | 6 +++---
.../impl/SAML2XMLObjectAttributeTranscoderTest.java | 8 ++++----
17 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java
index fb14b30a3..ba4b0eb51 100644
--- a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java
+++ b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java
@@ -38,7 +38,7 @@ public class XMLObjectAttributeValueTest extends XMLObjectBaseTestCase {
@BeforeClass
public void setUp() {
final XMLObjectBuilder<XSString> builder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(
XSString.TYPE_NAME);
QName foo = new QName("foo");
xsId1 = builder.buildObject(foo);
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 68a59b1f1..32f6283f4 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
@@ -66,12 +66,12 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
@BeforeMethod public void setUp() {
acsBuilder = (SAMLObjectBuilder<AttributeConsumingService>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeConsumingService>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeConsumingService>ensureBuilder(
AttributeConsumingService.DEFAULT_ELEMENT_NAME);
reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>ensureBuilder(
RequestedAttribute.DEFAULT_ELEMENT_NAME);
- valueBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
+ valueBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(XSString.TYPE_NAME);
}
@Nonnull private IdPAttribute makeAttribute(@Nonnull String id, @Nullable List<IdPAttributeValue> values) {
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 e10090f5b..15c77b144 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
@@ -60,7 +60,7 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
@BeforeMethod public void setUp() {
acsBuilder = (SAMLObjectBuilder<AttributeConsumingService>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeConsumingService>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeConsumingService>ensureBuilder(
AttributeConsumingService.DEFAULT_ELEMENT_NAME);
}
diff --git a/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML1AttributeTranscoder.java b/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML1AttributeTranscoder.java
index 827d09c7b..2d23e7c7d 100644
--- a/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML1AttributeTranscoder.java
+++ b/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML1AttributeTranscoder.java
@@ -66,10 +66,10 @@ public abstract class AbstractSAML1AttributeTranscoder<EncodedType extends IdPAt
/** Constructor. */
public AbstractSAML1AttributeTranscoder() {
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
designatorBuilder = (SAMLObjectBuilder<AttributeDesignator>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>ensureBuilder(
AttributeDesignator.TYPE_NAME);
}
diff --git a/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java b/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java
index 5bd885757..43e65e1bd 100644
--- a/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java
+++ b/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java
@@ -59,10 +59,10 @@ public abstract class AbstractSAML2AttributeTranscoder<EncodedType extends IdPAt
/** Constructor. */
public AbstractSAML2AttributeTranscoder() {
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>ensureBuilder(
RequestedAttribute.TYPE_NAME);
}
diff --git a/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupport.java b/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupport.java
index 78b4325a9..283db129c 100644
--- a/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupport.java
+++ b/shib-saml-attribute-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupport.java
@@ -79,7 +79,7 @@ public final class SAMLEncoderSupport {
if (withType) {
final XMLObjectBuilder<XSString> stringBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(
XSString.TYPE_NAME);
final XSString samlAttributeValue =
stringBuilder.buildObject(attributeValueElementName, XSString.TYPE_NAME);
@@ -88,7 +88,7 @@ public final class SAMLEncoderSupport {
}
final XMLObjectBuilder<XSAny> anyBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>getBuilderOrThrow(XSAny.TYPE_NAME);
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>ensureBuilder(XSAny.TYPE_NAME);
final XSAny samlAttributeValue = anyBuilder.buildObject(attributeValueElementName);
samlAttributeValue.setTextContent(value);
return samlAttributeValue;
@@ -118,7 +118,7 @@ public final class SAMLEncoderSupport {
if (withType) {
final XMLObjectBuilder<XSBase64Binary> binaryBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSBase64Binary>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSBase64Binary>ensureBuilder(
XSBase64Binary.TYPE_NAME);
final XSBase64Binary samlAttributeValue =
binaryBuilder.buildObject(attributeValueElementName, XSBase64Binary.TYPE_NAME);
@@ -126,7 +126,7 @@ public final class SAMLEncoderSupport {
return samlAttributeValue;
}
final XMLObjectBuilder<XSAny> anyBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>getBuilderOrThrow(XSAny.TYPE_NAME);
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>ensureBuilder(XSAny.TYPE_NAME);
final XSAny samlAttributeValue = anyBuilder.buildObject(attributeValueElementName);
samlAttributeValue.setTextContent(Base64Support.encode(value, Base64Support.UNCHUNKED));
return samlAttributeValue;
@@ -151,7 +151,7 @@ public final class SAMLEncoderSupport {
Constraint.isNotNull(attributeValueElementName, "Attribute Element Name cannot be null");
final XMLObjectBuilder<XSAny> attributeValueBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>getBuilderOrThrow(XSAny.TYPE_NAME);
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>ensureBuilder(XSAny.TYPE_NAME);
final XSAny samlAttributeValue = attributeValueBuilder.buildObject(attributeValueElementName);
samlAttributeValue.getUnknownXMLObjects().add(value);
@@ -183,7 +183,7 @@ public final class SAMLEncoderSupport {
}
final XMLObjectBuilder<ScopedValue> scopedValueBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<ScopedValue>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<ScopedValue>ensureBuilder(
ScopedValue.TYPE_NAME);
final ScopedValue scopedValue =
withType ? scopedValueBuilder.buildObject(attributeValueElementName, ScopedValue.TYPE_NAME)
@@ -253,7 +253,7 @@ public final class SAMLEncoderSupport {
if (withType) {
final XMLObjectBuilder<XSDateTime> dateTimeBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSDateTime>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSDateTime>ensureBuilder(
XSDateTime.TYPE_NAME);
final XSDateTime samlAttributeValue =
dateTimeBuilder.buildObject(attributeValueElementName, XSDateTime.TYPE_NAME);
@@ -262,7 +262,7 @@ public final class SAMLEncoderSupport {
}
final XMLObjectBuilder<XSAny> anyBuilder =
- XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>getBuilderOrThrow(XSAny.TYPE_NAME);
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<XSAny>ensureBuilder(XSAny.TYPE_NAME);
final XSAny samlAttributeValue = anyBuilder.buildObject(attributeValueElementName);
samlAttributeValue.setTextContent(DOMTypeSupport.instantToString(value));
return samlAttributeValue;
diff --git a/shib-saml-attribute-api/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupportTest.java b/shib-saml-attribute-api/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupportTest.java
index b1f96df05..502c807e3 100644
--- a/shib-saml-attribute-api/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupportTest.java
+++ b/shib-saml-attribute-api/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupportTest.java
@@ -90,7 +90,7 @@ public class SAMLEncoderSupportTest extends OpenSAMLInitBaseTestCase {
@Test public void encodeXmlObjectValue() {
final SAMLObjectBuilder<NameID> builder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
final NameID objToEncode= builder.buildObject();
objToEncode.setValue(STRING_VALUE);
diff --git a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
index aa386ea0a..3cc4ec1a0 100644
--- a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
+++ b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
@@ -71,7 +71,7 @@ public class SAML1NameIdentifierAttributeDefinition extends AbstractAttributeDef
*/
public SAML1NameIdentifierAttributeDefinition() {
nameIdentifierBuilder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
nameIdFormat = NameIdentifier.UNSPECIFIED;
}
diff --git a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java
index b8519567f..23a1557c1 100644
--- a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java
+++ b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java
@@ -76,7 +76,7 @@ public class SAML2NameIDAttributeDefinition extends AbstractAttributeDefinition
*/
public SAML2NameIDAttributeDefinition() {
nameIDBuilder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
nameIdFormat = NameIDType.UNSPECIFIED;
}
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
index ae8de6b35..369ffbd57 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
@@ -84,13 +84,13 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
@BeforeClass public void setUp() throws ComponentInitializationException {
- stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
+ stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(XSString.TYPE_NAME);
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
designatorBuilder = (SAMLObjectBuilder<AttributeDesignator>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>ensureBuilder(
AttributeDesignator.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
index f90db91ca..14954fc79 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
@@ -84,17 +84,17 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
@BeforeClass public void setUp() throws ComponentInitializationException {
- stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(
+ stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(
XSString.TYPE_NAME);
- scopedBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<ScopedValue>getBuilderOrThrow(
+ scopedBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<ScopedValue>ensureBuilder(
ScopedValue.TYPE_NAME);
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
designatorBuilder = (SAMLObjectBuilder<AttributeDesignator>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>ensureBuilder(
AttributeDesignator.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
index 9f89b330f..8f7ab1d07 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
@@ -78,13 +78,13 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
@BeforeClass public void setUp() throws ComponentInitializationException {
- stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
+ stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(XSString.TYPE_NAME);
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
designatorBuilder = (SAMLObjectBuilder<AttributeDesignator>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeDesignator>ensureBuilder(
AttributeDesignator.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
index 768c0e190..6f041571b 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
@@ -85,13 +85,13 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
@BeforeClass public void setUp() throws ComponentInitializationException {
- stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
+ stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(XSString.TYPE_NAME);
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>ensureBuilder(
RequestedAttribute.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java
index 6b91c8e0e..fc92c8b9a 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java
@@ -83,14 +83,14 @@ public class SAML2DateTimeAttributeTranscoderTest extends OpenSAMLInitBaseTestCa
@BeforeClass public void setUp() throws ComponentInitializationException {
- stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
- dateTimeBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSDateTime>getBuilderOrThrow(XSDateTime.TYPE_NAME);
+ stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(XSString.TYPE_NAME);
+ dateTimeBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSDateTime>ensureBuilder(XSDateTime.TYPE_NAME);
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>ensureBuilder(
RequestedAttribute.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
index e02711f24..96e529517 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
@@ -82,13 +82,13 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
@BeforeClass public void setUp() throws ComponentInitializationException {
- stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
+ stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(XSString.TYPE_NAME);
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>ensureBuilder(
RequestedAttribute.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
index c5f1f9306..863c20734 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
@@ -78,13 +78,13 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
@BeforeClass public void setUp() throws ComponentInitializationException {
- stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
+ stringBuilder = XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>ensureBuilder(XSString.TYPE_NAME);
attributeBuilder = (SAMLObjectBuilder<Attribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Attribute>ensureBuilder(
Attribute.TYPE_NAME);
reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<RequestedAttribute>ensureBuilder(
RequestedAttribute.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
index 44e60c608..3b3c2180f 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
@@ -87,11 +87,11 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
final XMLObjectBuilderFactory bf = XMLObjectProviderRegistrySupport.getBuilderFactory();
- anyBuilder = (SAMLObjectBuilder<AttributeValue>) bf.<AttributeValue>getBuilderOrThrow(AttributeValue.DEFAULT_ELEMENT_NAME);
- stringBuilder = bf.<XSString>getBuilderOrThrow(XSString.TYPE_NAME);
+ anyBuilder = (SAMLObjectBuilder<AttributeValue>) bf.<AttributeValue>ensureBuilder(AttributeValue.DEFAULT_ELEMENT_NAME);
+ stringBuilder = bf.<XSString>ensureBuilder(XSString.TYPE_NAME);
- attributeBuilder = (SAMLObjectBuilder<Attribute>) bf.<Attribute>getBuilderOrThrow(Attribute.TYPE_NAME);
- reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>) bf.<RequestedAttribute>getBuilderOrThrow(RequestedAttribute.TYPE_NAME);
+ attributeBuilder = (SAMLObjectBuilder<Attribute>) bf.<Attribute>ensureBuilder(Attribute.TYPE_NAME);
+ reqAttributeBuilder = (SAMLObjectBuilder<RequestedAttribute>) bf.<RequestedAttribute>ensureBuilder(RequestedAttribute.TYPE_NAME);
registry = new AttributeTranscoderRegistryImpl();
registry.setId("test");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list