Fix equals method and add tests for it.

Author: WesleyRosenblum

src/main/java/com/amazonaws/encryptionsdk/keyrings/KeyringTraceEntry.java

@@ -13,7 +13,6 @@
 
 package com.amazonaws.encryptionsdk.keyrings;
 
-import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -80,29 +79,18 @@ public Set<KeyringTraceFlag> getFlags() {
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(keyNamespace, keyName, flags);
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        KeyringTraceEntry that = (KeyringTraceEntry) o;
+        return Objects.equals(keyNamespace, that.keyNamespace) &&
+                Objects.equals(keyName, that.keyName) &&
+                Objects.equals(flags, that.flags);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (obj == this) {
-            return true;
-        }
-        if (obj.getClass() != getClass()) {
-            return false;
-        }
-
-        KeyringTraceEntry rhs = (KeyringTraceEntry) obj;
-
-        return new EqualsBuilder()
-                .append(keyNamespace, rhs.keyNamespace)
-                .append(keyName, this.keyName)
-                .append(flags, this.flags)
-                .isEquals();
+    public int hashCode() {
+        return Objects.hash(keyNamespace, keyName, flags);
     }
 
     @Override

src/test/java/com/amazonaws/encryptionsdk/keyrings/KeyringTraceTest.java

@@ -17,6 +17,7 @@
 
 import static java.util.Collections.singleton;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 public class KeyringTraceTest {
 
@@ -47,4 +48,18 @@ public void testImmutable() {
         trace.getEntries().add(new KeyringTraceEntry("ns1", "name1",
                 singleton(KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY)));
     }
+
+    @Test
+    public void testKeyringTraceEntryEquals() {
+        KeyringTraceEntry entry1 = new KeyringTraceEntry("namespace", "name",
+                singleton(KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY));
+        KeyringTraceEntry entry2 = new KeyringTraceEntry(entry1.getKeyNamespace(), entry1.getKeyName(),
+                entry1.getFlags());
+        KeyringTraceEntry entry3 = new KeyringTraceEntry("othernamespace", "name",
+                singleton(KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY));
+
+        assertEquals(entry1, entry1);
+        assertEquals(entry1, entry2);
+        assertNotEquals(entry2, entry3);
+    }
 }