[java-idp-testbed] branch main updated: Rename getBuilderOrThrow to ensureBuilder.
Scott Cantor
cantor.2 at osu.edu
Tue Mar 14 21:53:15 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-testbed.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=508d394aff28bbed05160487ac8001d0a1695cf5
The following commit(s) were added to refs/heads/main by this push:
new 508d394 Rename getBuilderOrThrow to ensureBuilder.
508d394 is described below
commit 508d394aff28bbed05160487ac8001d0a1695cf5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 14 17:53:12 2023 -0400
Rename getBuilderOrThrow to ensureBuilder.
---
src/main/java/sp/SAML1Controller.java | 12 ++++++------
src/main/java/sp/SAML2Controller.java | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/sp/SAML1Controller.java b/src/main/java/sp/SAML1Controller.java
index f78e24e..49971ae 100644
--- a/src/main/java/sp/SAML1Controller.java
+++ b/src/main/java/sp/SAML1Controller.java
@@ -251,13 +251,13 @@ public class SAML1Controller extends BaseSAMLController {
*/
@Nonnull public static Subject buildSubject(final @Nullable String principalName) {
final SAMLObjectBuilder<Subject> subjectBuilder = (SAMLObjectBuilder<Subject>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Subject>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Subject>ensureBuilder(
Subject.DEFAULT_ELEMENT_NAME);
final Subject subject = subjectBuilder.buildObject();
if (principalName != null) {
final SAMLObjectBuilder<NameIdentifier> nameIdBuilder = (SAMLObjectBuilder<NameIdentifier>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>ensureBuilder(
NameIdentifier.DEFAULT_ELEMENT_NAME);
final NameIdentifier nameId = nameIdBuilder.buildObject();
nameId.setValue(principalName);
@@ -277,7 +277,7 @@ public class SAML1Controller extends BaseSAMLController {
*/
@Nonnull public static Request buildAttributeQueryRequest(final @Nullable Subject subject) {
final SAMLObjectBuilder<AttributeQuery> queryBuilder = (SAMLObjectBuilder<AttributeQuery>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeQuery>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeQuery>ensureBuilder(
AttributeQuery.DEFAULT_ELEMENT_NAME);
final AttributeQuery query = queryBuilder.buildObject();
@@ -286,7 +286,7 @@ public class SAML1Controller extends BaseSAMLController {
}
final SAMLObjectBuilder<Request> requestBuilder = (SAMLObjectBuilder<Request>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Request>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Request>ensureBuilder(
Request.DEFAULT_ELEMENT_NAME);
final Request request = requestBuilder.buildObject();
request.setID(IdentifierGenerationStrategy.getInstance(ProviderType.SECURE).generateIdentifier());
@@ -305,9 +305,9 @@ public class SAML1Controller extends BaseSAMLController {
*/
@Nonnull public Envelope buildSOAP11Envelope(@Nonnull final XMLObject payload) {
final Envelope envelope = XMLObjectProviderRegistrySupport.getBuilderFactory()
- .<Envelope> getBuilderOrThrow(Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
+ .<Envelope> ensureBuilder(Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
final Body body = XMLObjectProviderRegistrySupport.getBuilderFactory()
- .<Body> getBuilderOrThrow(Body.DEFAULT_ELEMENT_NAME).buildObject(Body.DEFAULT_ELEMENT_NAME);
+ .<Body> ensureBuilder(Body.DEFAULT_ELEMENT_NAME).buildObject(Body.DEFAULT_ELEMENT_NAME);
body.getUnknownXMLObjects().add(payload);
envelope.setBody(body);
return envelope;
diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index 4463200..97a5479 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -976,7 +976,7 @@ public class SAML2Controller extends BaseSAMLController {
*/
@Nonnull public static Issuer buildIssuer(final @Nonnull @NotEmpty String entityID) {
final SAMLObjectBuilder<Issuer> issuerBuilder = (SAMLObjectBuilder<Issuer>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Issuer>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Issuer>ensureBuilder(
Issuer.DEFAULT_ELEMENT_NAME);
final Issuer issuer = issuerBuilder.buildObject();
issuer.setValue(entityID);
@@ -993,7 +993,7 @@ public class SAML2Controller extends BaseSAMLController {
*/
@Nonnull public static Subject buildSubject(final @Nullable String principalName) {
final SAMLObjectBuilder<Subject> subjectBuilder = (SAMLObjectBuilder<Subject>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<Subject>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<Subject>ensureBuilder(
Subject.DEFAULT_ELEMENT_NAME);
final Subject subject = subjectBuilder.buildObject();
@@ -1013,7 +1013,7 @@ public class SAML2Controller extends BaseSAMLController {
*/
@Nonnull public static NameID buildNameID(final @Nonnull @NotEmpty String principalName) {
final SAMLObjectBuilder<NameID> nameIdBuilder = (SAMLObjectBuilder<NameID>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
final NameID nameId = nameIdBuilder.buildObject();
nameId.setValue(principalName);
@@ -1030,7 +1030,7 @@ public class SAML2Controller extends BaseSAMLController {
*/
@Nonnull public static AttributeQuery buildAttributeQueryRequest(final @Nullable Subject subject) {
final SAMLObjectBuilder<AttributeQuery> queryBuilder = (SAMLObjectBuilder<AttributeQuery>)
- XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeQuery>getBuilderOrThrow(
+ XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeQuery>ensureBuilder(
AttributeQuery.DEFAULT_ELEMENT_NAME);
final AttributeQuery query = queryBuilder.buildObject();
@@ -1052,9 +1052,9 @@ public class SAML2Controller extends BaseSAMLController {
*/
@Nonnull public Envelope buildSOAP11Envelope(@Nonnull final XMLObject payload) {
final Envelope envelope = XMLObjectProviderRegistrySupport.getBuilderFactory()
- .<Envelope> getBuilderOrThrow(Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
+ .<Envelope> ensureBuilder(Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
final Body body = XMLObjectProviderRegistrySupport.getBuilderFactory()
- .<Body> getBuilderOrThrow(Body.DEFAULT_ELEMENT_NAME).buildObject(Body.DEFAULT_ELEMENT_NAME);
+ .<Body> ensureBuilder(Body.DEFAULT_ELEMENT_NAME).buildObject(Body.DEFAULT_ELEMENT_NAME);
body.getUnknownXMLObjects().add(payload);
envelope.setBody(body);
return envelope;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list