Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAMONGO-2170 - Polishing.

Browse Source 
Use ObjectUtils to compote hash code as hash code implementation contained artifacts that do not belong there. Extract test method.

Original pull request: #629.
This commit is contained in:
Mark Paluch
2019-01-07 13:09:37 +01:00
parent cf5b7c9763
commit bb4c16f4cd
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexInfo.java
View File

@@ -193,15 +193,14 @@ public class IndexInfo {
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; int result = 17;
int result = 1; result += 31 * ObjectUtils.nullSafeHashCode(indexFields);
result = prime * result + ObjectUtils.nullSafeHashCode(indexFields); result += 31 * ObjectUtils.nullSafeHashCode(name);
result = prime * result + ((name == null) ? 0 : name.hashCode()); result += 31 * ObjectUtils.nullSafeHashCode(unique);
result = prime * result + (sparse ? 1231-2018 : 1237); result += 31 * ObjectUtils.nullSafeHashCode(sparse);
result = prime * result + (unique ? 1231-2018 : 1237); result += 31 * ObjectUtils.nullSafeHashCode(language);
result = prime * result + ObjectUtils.nullSafeHashCode(language); result += 31 * ObjectUtils.nullSafeHashCode(partialFilterExpression);
result = prime * result + ObjectUtils.nullSafeHashCode(partialFilterExpression); result += 31 * ObjectUtils.nullSafeHashCode(collation);
result = prime * result + ObjectUtils.nullSafeHashCode(collation);
return result; return result;
} }

8
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexInfoUnitTests.java
View File

@@ -46,13 +46,17 @@ public class IndexInfoUnitTests {
@Test // DATAMONGO-2170 @Test // DATAMONGO-2170
public void partialFilterExpressionShouldBeNullIfNotSetInSource() { public void partialFilterExpressionShouldBeNullIfNotSetInSource() {
assertThat(IndexInfo.indexInfoOf(Document.parse(ID_INDEX)).getPartialFilterExpression()).isNull(); assertThat(getIndexInfo(ID_INDEX).getPartialFilterExpression()).isNull();
} }
@Test // DATAMONGO-2170 @Test // DATAMONGO-2170
public void partialFilterExpressionShouldMatchSource() { public void partialFilterExpressionShouldMatchSource() {
assertThat(IndexInfo.indexInfoOf(Document.parse(INDEX_WITH_PARTIAL_FILTER)).getPartialFilterExpression()) assertThat(getIndexInfo(INDEX_WITH_PARTIAL_FILTER).getPartialFilterExpression())
.isEqualTo("{ \"quantity\" : { \"$gte\" : 10 } }"); .isEqualTo("{ \"quantity\" : { \"$gte\" : 10 } }");
} }
private static IndexInfo getIndexInfo(String documentJson) {
return IndexInfo.indexInfoOf(Document.parse(documentJson));
}
} }