Merge branch '1.5.x'

563c9dc5 · Andy Wilkinson · 61a17982 · 84721666 · 563c9dc5
Commit 563c9dc5 authored Jun 06, 2017 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

DuplicateJsonObjectContextCustomizerFactory.java ...est/json/DuplicateJsonObjectContextCustomizerFactory.java +13 -0

No files found.
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java
@@ -85,6 +85,19 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
 			this.logger.warn(message);
 		}

+		@Override
+		public int hashCode() {
+			return getClass().hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj == null || obj.getClass() != getClass()) {
+				return false;
+			}
+			return true;
+		}
+
 	}

 }