[java-identity-provider COMMIT] in /trunk/idp-saml-api/src: main/java/net/shibboleth/idp/saml/attribute/encoding/Abst...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Apr 19 14:27:51 2012
New Revision: 4178

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4178&view=rev
Log:
All encoders gain #equals() and #hashCode() (implemented in the base class)

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoderTest.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java?rev=4178&r1=4177&r2=4178&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java Thu Apr 19 14:27:51 2012
@@ -39,6 +39,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Objects;
+
 /**
  * Base class for encoders that produce SAML attributes.
  * 
@@ -160,6 +162,32 @@
         log.debug("Completed encoding {} values for attribute {}", samlAttributeValues.size(), attributeId);
         return buildAttribute(attribute, samlAttributeValues);
     }
+    
+    /** {@inheritDoc} */
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+
+        if (obj == this) {
+            return true;
+        }
+
+        if (!(obj instanceof AbstractSamlAttributeEncoder)) {
+            return false;
+        }
+        
+        AbstractSamlAttributeEncoder other = (AbstractSamlAttributeEncoder) obj;
+        
+        return Objects.equal(getName(), other.getName()) &&
+               Objects.equal(getNamespace(), other.getNamespace()) &&
+               Objects.equal(getProtocol(), other.getProtocol());
+    }
+    
+    /** {@inheritDoc} */
+    public int hashCode() {
+        return Objects.hashCode(getName(), getNamespace(), getProtocol());
+    }
 
     /**
      * Checks if the given value can be handled by the encoder. In many cases this is simply a check to see if the given

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java?rev=4178&r1=4177&r2=4178&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java Thu Apr 19 14:27:51 2012
@@ -20,6 +20,8 @@
 import javax.annotation.Nullable;
 
 import org.opensaml.saml.common.SAMLObject;
+
+import com.google.common.base.Objects;
 
 import net.shibboleth.idp.attribute.AttributeEncoder;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -73,4 +75,31 @@
     @Nullable public final void setNameQualifier(final String nameQualifier) {
         qualifier = StringSupport.trimOrNull(nameQualifier);
     }
+    
+    /** {@inheritDoc} */
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+
+        if (obj == this) {
+            return true;
+        }
+
+        if (!(obj instanceof AbstractSamlNameIdentifierEncoder)) {
+            return false;
+        }
+        
+        AbstractSamlNameIdentifierEncoder other = (AbstractSamlNameIdentifierEncoder) obj;
+        
+        return Objects.equal(getNameFormat(), other.getNameFormat()) &&
+               Objects.equal(getNameQualifier(), other.getNameQualifier()) &&
+               Objects.equal(getProtocol(), other.getProtocol());
+    }
+    
+    /** {@inheritDoc} */
+    public int hashCode() {
+        return Objects.hashCode(getNameFormat(), getNameQualifier(), getProtocol());
+    }
+
 }

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java

[... 247 lines stripped ...]