[java-identity-provider] branch master updated: OSJ-278: Misspelled method on AttributeConsumingService

[Brent Putman]

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

putmanb pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=25d3e67bda0ec73fd380bd78f73b3828d35003dd

The following commit(s) were added to refs/heads/master by this push:
       new  25d3e67   OSJ-278: Misspelled method on AttributeConsumingService
25d3e67 is described below

commit 25d3e67bda0ec73fd380bd78f73b3828d35003dd
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed May 15 20:41:22 2019 -0400

    OSJ-278: Misspelled method on AttributeConsumingService
---
 .../attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java  | 2 +-
 .../filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java        | 2 +-
 .../idp/saml/metadata/impl/AttributeMappingNodeProcessor.java           | 2 +-
 .../saml/saml2/profile/delegation/impl/PopulateDelegationContext.java   | 2 +-
 .../profile/impl/MapRequestedAttributesInAttributeConsumingService.java | 2 +-
 .../saml2/profile/delegation/impl/PopulateDelegationContextTest.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
index ac8fc13..2b09b19 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
@@ -297,7 +297,7 @@ public class AttributeInMetadataMatcher extends AbstractIdentifiableInitializabl
     @Nullable private RequestedAttribute findInMetadata(@Nonnull final AttributeConsumingService service,
             @Nonnull final String name, @Nullable final String nameFormat) {
         
-        final List<RequestedAttribute> requested = service.getRequestAttributes();
+        final List<RequestedAttribute> requested = service.getRequestedAttributes();
         for (final RequestedAttribute attr : requested) {
             if (attr.getName().equals(name)) {
                 final String format = attr.getNameFormat();
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
index 50c5e90..260a2b7 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
@@ -90,7 +90,7 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
         final AttributeConsumingServiceContext acsCtx =
                 samlMetadataContext.getSubcontext(AttributeConsumingServiceContext.class, true);
         acsCtx.setAttributeConsumingService(acsBuilder.buildObject());
-        acsCtx.getAttributeConsumingService().getRequestAttributes().addAll(attributes);
+        acsCtx.getAttributeConsumingService().getRequestedAttributes().addAll(attributes);
         context.setRequesterMetadataContextLookupStrategy(
                 new ChildContextLookup<AttributeFilterContext,SAMLMetadataContext>(SAMLMetadataContext.class));
     }
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/AttributeMappingNodeProcessor.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/AttributeMappingNodeProcessor.java
index 3fe8d17..81332ea 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/AttributeMappingNodeProcessor.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/AttributeMappingNodeProcessor.java
@@ -111,7 +111,7 @@ public class AttributeMappingNodeProcessor implements MetadataNodeProcessor {
     private void handleAttributeConsumingService(@Nonnull final AttributeTranscoderRegistry registry,
             @Nonnull final AttributeConsumingService acs) {
         
-        final List<RequestedAttribute> requestedAttributes = acs.getRequestAttributes();
+        final List<RequestedAttribute> requestedAttributes = acs.getRequestedAttributes();
         if (null == requestedAttributes || requestedAttributes.isEmpty()) {
             return;
         }
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
index 36e640d..65dd2e8 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
@@ -516,7 +516,7 @@ public class PopulateDelegationContext extends AbstractProfileAction {
             return DelegationRequest.NOT_REQUESTED;
         }
         
-        for (final RequestedAttribute requestedAttribute : attributeConsumingService.getRequestAttributes()) {
+        for (final RequestedAttribute requestedAttribute : attributeConsumingService.getRequestedAttributes()) {
             if (Objects.equals(LibertyConstants.SERVICE_TYPE_SSOS, 
                     StringSupport.trimOrNull(requestedAttribute.getName()))) {
                 log.debug("Saw requested attribute '{}' in metadata AttributeConsumingService for SP: {}",
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java
index 47dcd07..f35e222 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/MapRequestedAttributesInAttributeConsumingService.java
@@ -115,7 +115,7 @@ public class MapRequestedAttributesInAttributeConsumingService extends AbstractP
             return;
         }
         
-        if (acs.getRequestAttributes().isEmpty() || acs.getObjectMetadata().containsKey(AttributesMapContainer.class) ||
+        if (acs.getRequestedAttributes().isEmpty() || acs.getObjectMetadata().containsKey(AttributesMapContainer.class) ||
                 acs.getParent() != null) {
             log.trace("{} Skipping decode of AttributeConsumingService", getLogPrefix());
             // Nothing to map, already mapped, or attached to metadata (and hence already scanned)
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
index 4b15b19..77fda3c 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
@@ -429,7 +429,7 @@ public class PopulateDelegationContextTest extends OpenSAMLInitBaseTestCase {
         ra.setName(LibertyConstants.SERVICE_TYPE_SSOS);
         ra.setIsRequired(required);
         AttributeConsumingService acs = (AttributeConsumingService) XMLObjectSupport.buildXMLObject(AttributeConsumingService.DEFAULT_ELEMENT_NAME);
-        acs.getRequestAttributes().add(ra);
+        acs.getRequestedAttributes().add(ra);
         return acs;
     }
     

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