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

Brent Putman putmanb at georgetown.edu
Thu May 16 01:40:31 EDT 2019


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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=76f593b1715376467bcc2926872c4171ec3bb163

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

commit 76f593b1715376467bcc2926872c4171ec3bb163
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed May 15 20:38:56 2019 -0400

    OSJ-278: Misspelled method on AttributeConsumingService
---
 .../saml/saml2/metadata/AttributeConsumingService.java         |  2 +-
 .../binding/impl/SAMLAddAttributeConsumingServiceHandler.java  |  2 +-
 .../saml2/metadata/impl/AttributeConsumingServiceImpl.java     | 10 +++++-----
 .../metadata/impl/AttributeConsumingServiceUnmarshaller.java   |  2 +-
 .../saml2/metadata/impl/AttributeConsumingServiceTest.java     |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeConsumingService.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeConsumingService.java
index 47adef1..d500011 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeConsumingService.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeConsumingService.java
@@ -112,5 +112,5 @@ public interface AttributeConsumingService extends SAMLObject {
      * 
      * @return attributes this service requests
      */
-    public List<RequestedAttribute> getRequestAttributes();
+    public List<RequestedAttribute> getRequestedAttributes();
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java
index 19d96da..4b8133f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java
@@ -174,7 +174,7 @@ public class SAMLAddAttributeConsumingServiceHandler extends AbstractMessageHand
                 XMLObjectSupport.buildXMLObject(AttributeConsumingService.DEFAULT_ELEMENT_NAME);
         for (final RequestedAttribute attribute: requestedAttributes) {
             try {
-                newAcs.getRequestAttributes().add(
+                newAcs.getRequestedAttributes().add(
                         XMLObjectSupport.cloneXMLObject(attribute, CloneOutputOption.DropDOM));
             } catch (final MarshallingException | UnmarshallingException e) {
                 log.warn("{} Error cloning requested Attributes", getLogPrefix(), e);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
index ce76171..3bb6e1d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
@@ -52,7 +52,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
     private final XMLObjectChildrenList<ServiceDescription> serviceDescriptions;
 
     /** RequestedAttribute children. */
-    private final XMLObjectChildrenList<RequestedAttribute> requestAttributes;
+    private final XMLObjectChildrenList<RequestedAttribute> requestedAttributes;
     
     /**
      * Constructor.
@@ -66,7 +66,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
         super(namespaceURI, elementLocalName, namespacePrefix);
         serviceNames = new XMLObjectChildrenList<>(this);
         serviceDescriptions = new XMLObjectChildrenList<>(this);
-        requestAttributes = new XMLObjectChildrenList<>(this);
+        requestedAttributes = new XMLObjectChildrenList<>(this);
     }
 
     /** {@inheritDoc} */
@@ -121,8 +121,8 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public List<RequestedAttribute> getRequestAttributes() {
-        return requestAttributes;
+    public List<RequestedAttribute> getRequestedAttributes() {
+        return requestedAttributes;
     }
 
     /** {@inheritDoc} */
@@ -131,7 +131,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
 
         children.addAll(serviceNames);
         children.addAll(serviceDescriptions);
-        children.addAll(requestAttributes);
+        children.addAll(requestedAttributes);
 
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java
index c0e1217..d084a05 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java
@@ -46,7 +46,7 @@ public class AttributeConsumingServiceUnmarshaller extends AbstractSAMLObjectUnm
         } else if (childSAMLObject instanceof ServiceDescription) {
             service.getDescriptions().add((ServiceDescription) childSAMLObject);
         } else if (childSAMLObject instanceof RequestedAttribute) {
-            service.getRequestAttributes().add((RequestedAttribute) childSAMLObject);
+            service.getRequestedAttributes().add((RequestedAttribute) childSAMLObject);
         } else {
             super.processChildElement(parentSAMLObject, childSAMLObject);
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
index 779b2cd..ab58fbe 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
@@ -83,7 +83,7 @@ public class AttributeConsumingServiceTest extends XMLObjectProviderBaseTestCase
         
         Assert.assertEquals(service.getNames().size(), expectedServiceNameCount, "<ServiceName> count");
         Assert.assertEquals(service.getDescriptions().size(), expectedServiceDecsriptionCount, "<ServiceDescription> count");
-        Assert.assertEquals(service.getRequestAttributes().size(), expectedRequestedAttributeCount, "<ReqestAttribute> count");
+        Assert.assertEquals(service.getRequestedAttributes().size(), expectedRequestedAttributeCount, "<ReqestAttribute> count");
        
     }
 
@@ -124,7 +124,7 @@ public class AttributeConsumingServiceTest extends XMLObjectProviderBaseTestCase
             service.getDescriptions().add((ServiceDescription) buildXMLObject(ServiceDescription.DEFAULT_ELEMENT_NAME));
         }
 
-        service.getRequestAttributes().add((RequestedAttribute) buildXMLObject(RequestedAttribute.DEFAULT_ELEMENT_NAME));
+        service.getRequestedAttributes().add((RequestedAttribute) buildXMLObject(RequestedAttribute.DEFAULT_ELEMENT_NAME));
 
         assertXMLEquals(expectedChildElementsDOM, service);
     

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


More information about the commits mailing list