[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml: saml1/profile/SAML1ObjectSupport....

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 28 22:13:40 2014
New Revision: 4014

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4014&view=rev
Log:
IDP-224 - checkpoint work on SAML 2 ProcessLogout action

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ObjectSupport.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ObjectSupport.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ObjectSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ObjectSupport.java?rev=4014&r1=4013&r2=4014&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ObjectSupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ObjectSupport.java Thu Aug 28 22:13:40 2014
@@ -53,6 +53,20 @@
     }
     
     /**
+     * Return true iff the two input {@link NameIdentifier} objects are equivalent for SAML 1.x purposes.
+     * 
+     * @param name1   first NameIdentifier to check
+     * @param name2   second NameIdentifier to check
+     * @return  true iff the two values should be viewed as equivalent
+     */
+    public static boolean areNameIdentifiersEquivalent(@Nonnull final NameIdentifier name1,
+            @Nonnull final NameIdentifier name2) {
+        return areNameIdentifierFormatsEquivalent(name1.getFormat(), name2.getFormat())
+                && Objects.equal(name1.getValue(), name2.getValue())
+                && Objects.equal(name1.getNameQualifier(), name2.getNameQualifier());
+    }
+    
+    /**
      * Get an SLF4J Logger.
      * 
      * @return a Logger instance

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ObjectSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ObjectSupport.java?rev=4014&r1=4013&r2=4014&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ObjectSupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ObjectSupport.java Thu Aug 28 22:13:40 2014
@@ -44,13 +44,28 @@
      * @param format2   second format to check
      * @return  true iff the two format values should be viewed as equivalent
      */
-    public static boolean areNameIdentifierFormatsEquivalent(@Nullable final String format1,
+    public static boolean areNameIDFormatsEquivalent(@Nullable final String format1,
             @Nullable final String format2) {
         
         return Objects.equal(
                 format1 != null ? format1 : NameID.UNSPECIFIED,
                 format2 != null ? format2 : NameID.UNSPECIFIED);
     }
+
+    /**
+     * Return true iff the two input {@link NameID} objects are equivalent for SAML 2.0 purposes.
+     * 
+     * @param name1   first NameID to check
+     * @param name2   second NameID to check
+     * @return  true iff the two values should be viewed as equivalent
+     */
+    public static boolean areNameIDsEquivalent(@Nonnull final NameID name1, @Nonnull final NameID name2) {
+        return areNameIDFormatsEquivalent(name1.getFormat(), name2.getFormat())
+                && Objects.equal(name1.getValue(), name2.getValue())
+                && Objects.equal(name1.getNameQualifier(), name2.getNameQualifier())
+                && Objects.equal(name1.getSPNameQualifier(), name2.getSPNameQualifier());
+    }
+
     
     /**
      * Get an SLF4J Logger.