Consistent equals implementations across class hierarchies

Issue: SPR-13951

spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java

@@ -106,7 +106,7 @@ public class DefaultMessageSourceResolvable implements MessageSourceResolvable,
 	 * the last one in the codes array.
 	 */
 	public String getCode() {
-		return (this.codes != null && this.codes.length > 0) ? this.codes[this.codes.length - 1] : null;
+		return (this.codes != null && this.codes.length > 0 ? this.codes[this.codes.length - 1] : null);
 	}
 
 	@Override
@@ -153,9 +153,9 @@ public class DefaultMessageSourceResolvable implements MessageSourceResolvable,
 			return false;
 		}
 		MessageSourceResolvable otherResolvable = (MessageSourceResolvable) other;
-		return ObjectUtils.nullSafeEquals(getCodes(), otherResolvable.getCodes()) &&
+		return (ObjectUtils.nullSafeEquals(getCodes(), otherResolvable.getCodes()) &&
 				ObjectUtils.nullSafeEquals(getArguments(), otherResolvable.getArguments()) &&
-				ObjectUtils.nullSafeEquals(getDefaultMessage(), otherResolvable.getDefaultMessage());
+				ObjectUtils.nullSafeEquals(getDefaultMessage(), otherResolvable.getDefaultMessage()));
 	}
 
 	@Override

spring-context/src/main/java/org/springframework/validation/FieldError.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -112,9 +112,9 @@ public class FieldError extends ObjectError {
 			return false;
 		}
 		FieldError otherError = (FieldError) other;
-		return getField().equals(otherError.getField()) &&
+		return (getField().equals(otherError.getField()) &&
 				ObjectUtils.nullSafeEquals(getRejectedValue(), otherError.getRejectedValue()) &&
-				isBindingFailure() == otherError.isBindingFailure();
+				isBindingFailure() == otherError.isBindingFailure());
 	}
 
 	@Override

spring-context/src/main/java/org/springframework/validation/ObjectError.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -78,7 +78,7 @@ public class ObjectError extends DefaultMessageSourceResolvable {
 		if (this == other) {
 			return true;
 		}
-		if (getClass() != other.getClass() || !super.equals(other)) {
+		if (other == null || other.getClass() != getClass() || !super.equals(other)) {
 			return false;
 		}
 		ObjectError otherError = (ObjectError) other;

spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -401,7 +401,7 @@ public class MergedContextConfiguration implements Serializable {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MergedContextConfiguration)) {
+		if (other == null || other.getClass() != getClass()) {
 			return false;
 		}
 

spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -161,14 +161,8 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
 	 */
 	@Override
 	public boolean equals(Object other) {
-		if (this == other) {
+		return (this == other || (super.equals(other) &&
-			return true;
+				this.resourceBasePath.equals(((WebMergedContextConfiguration) other).resourceBasePath)));
-		}
-		if (!(other instanceof WebMergedContextConfiguration)) {
-			return false;
-		}
-		WebMergedContextConfiguration otherConfig = (WebMergedContextConfiguration) other;
-		return super.equals(otherConfig) && this.getResourceBasePath().equals(otherConfig.getResourceBasePath());
 	}
 
 	/**
@@ -178,7 +172,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
 	 */
 	@Override
 	public int hashCode() {
-		return 31 * super.hashCode() + this.resourceBasePath.hashCode();
+		return super.hashCode() * 31 + this.resourceBasePath.hashCode();
 	}
 
 	/**