[java-metadata-aggregator] branch master updated: MDA-169 - rename SAMLMetadataSupport.getDescriptorExtensions

Ian Young ian at iay.org.uk
Wed Apr 26 11:56:00 EDT 2017


This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=0a5d7faf3385ece06da1021f71aa843c6e007564

The following commit(s) were added to refs/heads/master by this push:
       new  0a5d7fa   MDA-169 - rename SAMLMetadataSupport.getDescriptorExtensions
0a5d7fa is described below

commit 0a5d7faf3385ece06da1021f71aa843c6e007564
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Apr 26 16:55:52 2017 +0100

    MDA-169 - rename SAMLMetadataSupport.getDescriptorExtensions
---
 .../main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java | 2 +-
 .../metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java | 2 +-
 .../metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
index 69cbe6f..1522834 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
@@ -129,7 +129,7 @@ public final class SAMLMetadataSupport {
      * @return the first instance of the extension element or <code>null</code> if
      *          no such element exists as an extension of the descriptor
      */
-    public static Element getDescriptorExtensions(@Nonnull final Element descriptor,
+    public static Element getDescriptorExtension(@Nonnull final Element descriptor,
             @Nonnull final QName extensionName) {
         final List<Element> results = getDescriptorExtensionList(descriptor, extensionName);
         if (results.isEmpty()) {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
index 1dcdfec..ad77876 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
@@ -238,7 +238,7 @@ public class EntityRegistrationAuthorityFilterStage extends BaseIteratingStage<E
      */
     protected boolean filterOutDescriptor(@Nonnull final Element descriptor) {
         final Element registrationInfoElement =
-                SAMLMetadataSupport.getDescriptorExtensions(descriptor, MDRPIMetadataSupport.MDRPI_REGISTRATION_INFO);
+                SAMLMetadataSupport.getDescriptorExtension(descriptor, MDRPIMetadataSupport.MDRPI_REGISTRATION_INFO);
         if (registrationInfoElement == null) {
             if (requiringRegistrationInformation) {
                 log.debug(
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
index 5ef740f..d3f2519 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
@@ -56,7 +56,7 @@ public class RegistrationAuthorityPopulationStage extends BaseStage<Element> {
                metadata.put(new ErrorStatus(getId(), "item was not an EntityDescriptor"));
            } else {
                // Extract mdrpi:RegistrationInfo if present.
-               final Element regInfo = SAMLMetadataSupport.getDescriptorExtensions(entity,
+               final Element regInfo = SAMLMetadataSupport.getDescriptorExtension(entity,
                        MDRPIMetadataSupport.MDRPI_REGISTRATION_INFO);
                if (regInfo != null) {
                    // Extract registrationAuthority

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list