Commit f5f6bfd

committed

Fix same hashCodes an different queries with include and exclude

1 parent 5b1b0a4 commit f5f6bfdCopy full SHA for f5f6bfd

File tree

+21

-1

lines changed

spring-data-mongodb/src
- main/java/org/springframework/data/mongodb/core/query
  - Field.java
- test/java/org/springframework/data/mongodb/core/query
  - FieldUnitTests.java

+21

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`* @author Mark Paluch`
`38`	`38`	`* @author Owen Q`
`39`	`39`	`* @author Kirill Egorov`
	`40`	`+ * @author GaEun Kim`
`40`	`41`	`*/`
`41`	`42`	`public class Field {`
`42`	`43`
`@@ -286,7 +287,7 @@ public boolean equals(@Nullable Object o) {`
`286`	`287`	`@Override`
`287`	`288`	`public int hashCode() {`
`288`	`289`
`289`		`- int result = ObjectUtils.nullSafeHashCode(criteria);`
	`290`	`+ int result = ObjectUtils.nullSafeHashCode(criteria.toString());`
`290`	`291`	`result = 31 * result + ObjectUtils.nullSafeHashCode(slices);`
`291`	`292`	`result = 31 * result + ObjectUtils.nullSafeHashCode(elemMatches);`
`292`	`293`	`result = 31 * result + ObjectUtils.nullSafeHashCode(positionKey);`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`* @author Owen Q`
`29`	`29`	`* @author Mark Paluch`
`30`	`30`	`* @author Kirill Egorov`
	`31`	`+ * @author GaEun Kim`
`31`	`32`	`*/`
`32`	`33`	`class FieldUnitTests {`
`33`	`34`
`@@ -85,4 +86,22 @@ void overriddenExclusionMethodsCreateEqualFields() {`
`85`	`86`
`86`	`87`	`assertThat(left).isEqualTo(right);`
`87`	`88`	`}`
	`89`	`+`
	`90`	`+ @Test`
	`91`	`+ void assertDifferentHashCodesForExcludeAndIncludeQueries() {`
	`92`	`+`
	`93`	`+ Query queryWithExclude = new Query();`
	`94`	`+ queryWithExclude.fields().exclude("key1");`
	`95`	`+ queryWithExclude.fields().exclude("key2");`
	`96`	`+ queryWithExclude.fields().exclude("field1");`
	`97`	`+ queryWithExclude.fields().exclude("field2");`
	`98`	`+`
	`99`	`+ Query queryWithInclude = new Query();`
	`100`	`+ queryWithInclude.fields().include("key1");`
	`101`	`+ queryWithInclude.fields().include("key2");`
	`102`	`+ queryWithInclude.fields().include("field1");`
	`103`	`+ queryWithInclude.fields().include("field2");`
	`104`	`+`
	`105`	`+ assertThat(queryWithExclude.hashCode()).isNotEqualTo(queryWithInclude.hashCode());`
	`106`	`+ }`
`88`	`107`	`}`

Comments

(0)