DATAMONGO-1387 - Polishing.

Added a few more tests and fixed equals/hashcode.
Removed equalsverifyer.

Author: christophstrobl

spring-data-mongodb/pom.xml

@@ -18,7 +18,6 @@
 	<properties>
 		<validation>1.0.0.GA</validation>
 		<objenesis>1.3</objenesis>
-		<equalsverifier>1.5</equalsverifier>
 	</properties>
 
 	<dependencies>
@@ -159,13 +158,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>nl.jqno.equalsverifier</groupId>
-			<artifactId>equalsverifier</artifactId>
-			<version>${equalsverifier}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,11 +71,20 @@ public DBObject getQueryObject() {
 
 	@Override
 	public DBObject getFieldsObject() {
-		if(fieldsObject != null) {
-			return fieldsObject;
-		} else {
+
+		if (fieldsObject == null) {
 			return super.getFieldsObject();
 		}
+
+		if (super.getFieldsObject() != null) {
+
+			DBObject combinedFieldsObject = new BasicDBObject();
+			combinedFieldsObject.putAll(fieldsObject);
+			combinedFieldsObject.putAll(super.getFieldsObject());
+			return combinedFieldsObject;
+		}
+
+		return fieldsObject;
 	}
 
 	@Override
@@ -124,9 +133,9 @@ public boolean equals(Object o) {
 		BasicQuery that = (BasicQuery) o;
 
 		return querySettingsEquals(that) && //
-				nullSafeEquals(fieldsObject, that.fieldsObject) && //
-				nullSafeEquals(queryObject, that.queryObject) && //
-				nullSafeEquals(sortObject, that.sortObject);
+				nullSafeEquals(getFieldsObject(), that.getFieldsObject()) && //
+				nullSafeEquals(getQueryObject(), that.getQueryObject()) && //
+				nullSafeEquals(getSortObject(), that.getSortObject());
 	}
 
 	/*
@@ -137,9 +146,9 @@ public boolean equals(Object o) {
 	public int hashCode() {
 
 		int result = super.hashCode();
-		result = 31 * result + nullSafeHashCode(queryObject);
-		result = 31 * result + nullSafeHashCode(fieldsObject);
-		result = 31 * result + nullSafeHashCode(sortObject);
+		result = 31 * result + nullSafeHashCode(getQueryObject());
+		result = 31 * result + nullSafeHashCode(getFieldsObject());
+		result = 31 * result + nullSafeHashCode(getSortObject());
 
 		return result;
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicQueryUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,7 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
+import static org.springframework.data.mongodb.test.util.IsBsonObject.*;
 
 import org.junit.Test;
 import org.springframework.data.domain.Sort.Direction;
@@ -63,24 +62,6 @@ public void overridesSortCorrectly() {
 		assertThat(query.getSortObject(), is(sortReference));
 	}
 
-	/**
-	 * @see DATAMONGO-1093
-	 */
-	@Test
-	public void equalsContract() {
-
-		BasicQuery query1 = new BasicQuery("{ \"name\" : \"Thomas\"}", "{\"name\":1, \"age\":1}");
-		query1.setSortObject(new BasicDBObject("name", -1));
-
-		BasicQuery query2 = new BasicQuery("{ \"name\" : \"Oliver\"}", "{\"name\":1, \"address\":1}");
-		query2.setSortObject(new BasicDBObject("name", 1));
-
-		EqualsVerifier.forExamples(query1, query2) //
-				.withRedefinedSuperclass() //
-				.suppress(Warning.NONFINAL_FIELDS, Warning.NULL_FIELDS, Warning.STRICT_INHERITANCE) //
-				.verify();
-	}
-
 	/**
 	 * @see DATAMONGO-1093
 	 */
@@ -138,21 +119,48 @@ public void handlesEqualsAndHashCodeCorrectlyWhenQuerySettingsDiffer() {
 		assertThat(query1, is(not(equalTo(query2))));
 		assertThat(query1.hashCode(), is(not(query2.hashCode())));
 	}
-	
+
+	/**
+	 * @see DATAMONGO-1387
+	 */
+	@Test
+	public void returnsFieldsCorrectly() {
+
+		String qry = "{ \"name\" : \"Thomas\"}";
+		String fields = "{\"name\":1, \"age\":1}";
+
+		BasicQuery query1 = new BasicQuery(qry, fields);
+
+		assertThat(query1.getFieldsObject(), isBsonObject().containing("name").containing("age"));
+	}
+
 	/**
 	 * @see DATAMONGO-1387
 	 */
 	@Test
 	public void handlesFieldsIncludeCorrectly() {
-		
+
 		String qry = "{ \"name\" : \"Thomas\"}";
-		
+
 		BasicQuery query1 = new BasicQuery(qry);
 		query1.fields().include("name");
-		
-		DBObject fieldsObject = query1.getFieldsObject();
-		fieldsObject.containsField("name");
-		assertThat(query1.getFieldsObject(), notNullValue());
-		assertThat(query1.getFieldsObject().containsField("name"), is(true));
+
+		assertThat(query1.getFieldsObject(), isBsonObject().containing("name"));
+	}
+
+	/**
+	 * @see DATAMONGO-1387
+	 */
+	@Test
+	public void combinesFieldsIncludeCorrectly() {
+
+		String qry = "{ \"name\" : \"Thomas\"}";
+		String fields = "{\"name\":1, \"age\":1}";
+
+		BasicQuery query1 = new BasicQuery(qry, fields);
+		query1.fields().include("gender");
+
+		assertThat(query1.getFieldsObject(), isBsonObject().containing("name").containing("age").containing("gender"));
 	}
+
 }