[java-opensaml] 07/11: Add missing method on SAML 2 Conditions. Fix SAML 1 Conditions impl.

[Brent Putman]

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=c6f0deb08561046f455067e02a70be018d339b0c

commit c6f0deb08561046f455067e02a70be018d339b0c
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Jan 29 21:51:11 2020 -0500

    Add missing method on SAML 2 Conditions.  Fix SAML 1 Conditions impl.
---
 .../src/main/java/org/opensaml/saml/saml2/core/Conditions.java    | 8 ++++++++
 .../java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java    | 5 +++--
 .../java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java    | 6 ++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Conditions.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Conditions.java
index a1a32bf..8e942e6 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Conditions.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Conditions.java
@@ -20,6 +20,7 @@ package org.opensaml.saml.saml2.core;
 import java.time.Instant;
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 
@@ -94,6 +95,13 @@ public interface Conditions extends SAMLObject {
     List<Condition> getConditions();
 
     /**
+     * Gets the list of conditions that match a particular QName.
+     * 
+     * @param typeOrName the QName of the conditions to return
+     */
+    List<Condition> getConditions(@Nonnull final QName typeOrName);
+
+    /**
      * Gets the audience restriction conditions for the assertion.
      * 
      * @return the audience restriction conditions for the assertion
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
index 281a6d5..d82759f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AbstractXMLObject;
@@ -85,8 +86,8 @@ public class ConditionsImpl extends AbstractXMLObject implements Conditions {
     }
 
     /** {@inheritDoc} */
-    public List<Condition> getConditions(final QName typeOrName) {
-        return conditions;
+    public List<Condition> getConditions(@Nonnull final QName typeOrName) {
+        return (List<Condition>) conditions.subList(typeOrName);
     }
 
     /** {@inheritDoc} */
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
index fe3bc96..fedc0af 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
@@ -70,6 +70,11 @@ public class ConditionsImpl extends AbstractXMLObject implements Conditions {
     }
 
     /** {@inheritDoc} */
+    public List<Condition> getConditions(QName typeOrName) {
+        return (List<Condition>) conditions.subList(typeOrName);
+    }
+    
+    /** {@inheritDoc} */
     public List<AudienceRestriction> getAudienceRestrictions() {
         final QName conditionQName = new QName(SAMLConstants.SAML20_NS, AudienceRestriction.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
@@ -128,4 +133,5 @@ public class ConditionsImpl extends AbstractXMLObject implements Conditions {
 
         return Collections.unmodifiableList(children);
     }
+
 }
\ No newline at end of file

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