Merge pull request #8768 from dreis2211:hashcode-cleanup-new

* pr/8768:
  Polish "Use JDK hashCode() variants for primitives"
  Use JDK hashCode() variants for primitives

Author: snicoll

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionOutcome.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -124,7 +124,7 @@ public ConditionMessage getConditionMessage() {
 
 	@Override
 	public int hashCode() {
-		return ObjectUtils.hashCode(this.match) * 31
+		return Boolean.hashCode(this.match) * 31
 				+ ObjectUtils.nullSafeHashCode(this.message);
 	}
 

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java

@@ -70,9 +70,9 @@ public boolean equals(Object obj) {
 	@Override
 	public int hashCode() {
 		int hashCode = this.file.hashCode();
-		hashCode = 31 * hashCode + (this.exists ? 1231 : 1237);
-		hashCode = 31 * hashCode + (int) (this.length ^ (this.length >>> 32));
-		hashCode = 31 * hashCode + (int) (this.lastModified ^ (this.lastModified >>> 32));
+		hashCode = 31 * hashCode + Boolean.hashCode(this.exists);
+		hashCode = 31 * hashCode + Long.hashCode(this.length);
+		hashCode = 31 * hashCode + Long.hashCode(this.lastModified);
 		return hashCode;
 	}
 

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java

@@ -121,12 +121,12 @@ protected enum FilterType {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 0;
-		result = prime * result + ObjectUtils.hashCode(hasAnnotation());
+		result = prime * result + Boolean.hashCode(hasAnnotation());
 		for (FilterType filterType : FilterType.values()) {
 			result = prime * result
 					+ 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(getComponentIncludes());
 		return result;

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java

@@ -105,7 +105,7 @@ public int hashCode() {
 		result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.typeToMock);
 		result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.extraInterfaces);
 		result = MULTIPLIER * result + ObjectUtils.nullSafeHashCode(this.answer);
-		result = MULTIPLIER * result + (this.serializable ? 1231 : 1237);
+		result = MULTIPLIER * result + Boolean.hashCode(this.serializable);
 		return result;
 	}