diff --git a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java b/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java index 8d256de31..ac2194d70 100644 --- a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java +++ b/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java @@ -74,4 +74,23 @@ public class ReadAuditQueryPlan { public void setSql(String sql) { this.sql = sql; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + ReadAuditQueryPlan that = (ReadAuditQueryPlan) o; + if (!beanType.equals(that.beanType)) return false; + if (!queryKey.equals(that.queryKey)) return false; + return sql.equals(that.sql); + } + + @Override + public int hashCode() { + int result = beanType.hashCode(); + result = 31 * result + queryKey.hashCode(); + result = 31 * result + sql.hashCode(); + return result; + } } diff --git a/src/test/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/src/test/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlanTest.java new file mode 100644 index 000000000..c3140fd93 --- /dev/null +++ b/src/test/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlanTest.java @@ -0,0 +1,21 @@ +package com.avaje.ebean.event.readaudit; + + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +public class ReadAuditQueryPlanTest { + + @Test + public void testEquals() { + + ReadAuditQueryPlan plan1 = new ReadAuditQueryPlan("org.Bean", "queryKey", "select id from foo"); + + assertEquals(plan1, new ReadAuditQueryPlan("org.Bean", "queryKey", "select id from foo")); + assertNotEquals(plan1, new ReadAuditQueryPlan("org.Bean", "queryKey", "select id from Notfoo")); + assertNotEquals(plan1, new ReadAuditQueryPlan("org.Bean", "notQueryKey", "select id from foo")); + assertNotEquals(plan1, new ReadAuditQueryPlan("org.NotBean", "queryKey", "select id from foo")); + } +} \ No newline at end of file diff --git a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java index c9d5b5fc8..ec191528c 100644 --- a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java +++ b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java @@ -20,6 +20,7 @@ import org.junit.Before; import org.junit.Test; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -358,7 +359,7 @@ public class TestReadAudit extends BaseTestCase { class TDReadAuditLogger implements ReadAuditLogger { - List plans = new ArrayList(); + Set plans = new HashSet(); List beans = new ArrayList(); List many = new ArrayList();