Commit f3bbbc45 authored by dreis's avatar dreis Committed by Stephane Nicoll

Use JDK hashCode() variants for primitives

See gh-8768
parent aa405172
...@@ -124,7 +124,7 @@ public class ConditionOutcome { ...@@ -124,7 +124,7 @@ public class ConditionOutcome {
@Override @Override
public int hashCode() { public int hashCode() {
return ObjectUtils.hashCode(this.match) * 31 return Boolean.hashCode(this.match) * 31
+ ObjectUtils.nullSafeHashCode(this.message); + ObjectUtils.nullSafeHashCode(this.message);
} }
......
...@@ -70,9 +70,9 @@ class FileSnapshot { ...@@ -70,9 +70,9 @@ class FileSnapshot {
@Override @Override
public int hashCode() { public int hashCode() {
int hashCode = this.file.hashCode(); int hashCode = this.file.hashCode();
hashCode = 31 * hashCode + (this.exists ? 1231 : 1237); hashCode = 31 * hashCode + Boolean.hashCode(this.exists);
hashCode = 31 * hashCode + (int) (this.length ^ (this.length >>> 32)); hashCode = 31 * hashCode + Long.hashCode(this.length);
hashCode = 31 * hashCode + (int) (this.lastModified ^ (this.lastModified >>> 32)); hashCode = 31 * hashCode + Long.hashCode(this.lastModified);
return hashCode; return hashCode;
} }
......
...@@ -121,12 +121,12 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud ...@@ -121,12 +121,12 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
int result = 0; int result = 0;
result = prime * result + ObjectUtils.hashCode(hasAnnotation()); result = prime * result + Boolean.hashCode(hasAnnotation());
for (FilterType filterType : FilterType.values()) { for (FilterType filterType : FilterType.values()) {
result = prime * result result = prime * result
+ ObjectUtils.nullSafeHashCode(getFilters(filterType)); + ObjectUtils.nullSafeHashCode(getFilters(filterType));
} }
result = prime * result + ObjectUtils.hashCode(isUseDefaultFilters()); result = prime * result + Boolean.hashCode(isUseDefaultFilters());
result = prime * result + ObjectUtils.nullSafeHashCode(getDefaultIncludes()); result = prime * result + ObjectUtils.nullSafeHashCode(getDefaultIncludes());
result = prime * result + ObjectUtils.nullSafeHashCode(getComponentIncludes()); result = prime * result + ObjectUtils.nullSafeHashCode(getComponentIncludes());
return result; return result;
......
...@@ -105,7 +105,7 @@ class MockDefinition extends Definition { ...@@ -105,7 +105,7 @@ class MockDefinition extends Definition {
result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.typeToMock); result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.typeToMock);
result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.extraInterfaces); result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.extraInterfaces);
result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.answer); result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.answer);
result = MULTIPLIER * result + (this.serializable ? 1231 : 1237); result = MULTIPLIER * result + Boolean.hashCode(this.serializable);
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment