[java-opensaml COMMIT] in /trunk: opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCrit...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 20 20:12:56 2013
New Revision: 3451

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3451&view=rev
Log:
Harmonize all existing Criterion impls with implementations of equals(), hashcode() and toString().

Modified:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PublicKeyCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/UsageCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509IssuerSerialCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectKeyIdentifierCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectNameCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java?rev=3451&r1=3450&r2=3451&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java Fri Sep 20 20:12:56 2013
@@ -61,5 +61,36 @@
 
         keyAlgorithm = trimmed;
     }
+    
+    /** {@inheritDoc} */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("KeyAlgorithmCriterion [keyAlgorithm=");
+        builder.append(keyAlgorithm);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    /** {@inheritDoc} */
+    public int hashCode() {
+        return keyAlgorithm.hashCode();
+    }
+
+    /** {@inheritDoc} */
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj == null) {
+            return false;
+        }
+
+        if (obj instanceof KeyAlgorithmCriterion) {
+            return keyAlgorithm.equals(((KeyAlgorithmCriterion) obj).keyAlgorithm);
+        }
+
+        return false;
+    }
 
 }

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java?rev=3451&r1=3450&r2=3451&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java Fri Sep 20 20:12:56 2013
@@ -58,5 +58,36 @@
 
         keyLength = length;
     }
+    
+    /** {@inheritDoc} */
+    public String toString() {

[... 988 lines stripped ...]