#167 added equals and hashCode implementations

querydsl · Jun 7, 2012 · e4065d2 · e4065d2
1 parent ffa6bc0
commit e4065d2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java b/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java
@@ -52,10 +52,6 @@ public Q where(Predicate... o) {
         return queryMixin.where(o);
     }
 
-    public String toString() {
-        return queryMixin.toString();
-    }
-
     public Q limit(long limit) {
         return queryMixin.limit(limit);
     }
@@ -71,5 +67,27 @@ public Q restrict(QueryModifiers modifiers) {
     public <P> Q set(ParamExpression<P> param, P value) {
         return queryMixin.set(param, value);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof QueryBase) {
+            QueryBase q = (QueryBase)o;
+            return q.queryMixin.equals(queryMixin);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return queryMixin.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return queryMixin.toString();
+    }
 
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java b/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java
@@ -390,11 +390,6 @@ public void setUnique(boolean unique) {
         metadata.setUnique(unique);
     }
 
-    @Override
-    public String toString() {
-        return metadata.toString();
-    }
-
     public T where(Predicate... o) {
         metadata.addWhere(normalize(o, true));
         return self;
@@ -403,5 +398,28 @@ public T where(Predicate... o) {
     protected Predicate[] normalize(Predicate[] conditions, boolean where) {
         return conditions;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof QueryMixin) {
+            QueryMixin q = (QueryMixin)o;
+            return q.metadata.equals(metadata);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return metadata.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return metadata.toString();
+    }
+
 
 }