Class identity comparisons wherever possible (and further polishing)

jhoeller · jhoeller · commit 11806b921541 · 2015-12-09T12:28:09.000+01:00
Issue: SPR-12926
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
@@ -922,7 +922,7 @@ private boolean equalsAdviceClasses(Advisor a, Advisor b) {
 			if (aa == null || ba == null) {
 				return (aa == ba);
 			}
-			return aa.getClass().equals(ba.getClass());
+			return (aa.getClass() == ba.getClass());
 		}
 
 		private boolean equalsPointcuts(Advisor a, Advisor b) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
@@ -165,7 +165,7 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (other == null || !getClass().equals(other.getClass())) {
+		if (other == null || getClass() != other.getClass()) {
 			return false;
 		}
 		AbstractBeanFactoryBasedTargetSource otherTargetSource = (AbstractBeanFactoryBasedTargetSource) other;
diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java
@@ -203,7 +203,7 @@ public void setWrappedInstance(Object object) {
 	 */
 	public void setWrappedInstance(Object object, String nestedPath, Object rootObject) {
 		Assert.notNull(object, "Target object must not be null");
-		if (object.getClass().equals(javaUtilOptionalClass)) {
+		if (object.getClass() == javaUtilOptionalClass) {
 			this.object = OptionalUnwrapper.unwrap(object);
 		}
 		else {
@@ -834,7 +834,7 @@ private AbstractNestablePropertyAccessor getNestedPropertyAccessor(String nested
 		PropertyTokenHolder tokens = getPropertyNameTokens(nestedProperty);
 		String canonicalName = tokens.canonicalName;
 		Object value = getPropertyValue(tokens);
-		if (value == null || (value.getClass().equals(javaUtilOptionalClass) && OptionalUnwrapper.isEmpty(value))) {
+		if (value == null || (value.getClass() == javaUtilOptionalClass && OptionalUnwrapper.isEmpty(value))) {
 			if (isAutoGrowNestedPaths()) {
 				value = setDefaultValue(tokens);
 			}
@@ -846,7 +846,7 @@ private AbstractNestablePropertyAccessor getNestedPropertyAccessor(String nested
 		// Lookup cached sub-PropertyAccessor, create new one if not found.
 		AbstractNestablePropertyAccessor nestedPa = this.nestedPropertyAccessors.get(canonicalName);
 		if (nestedPa == null || nestedPa.getWrappedInstance() !=
-				(value.getClass().equals(javaUtilOptionalClass) ? OptionalUnwrapper.unwrap(value) : value)) {
+				(value.getClass() == javaUtilOptionalClass ? OptionalUnwrapper.unwrap(value) : value)) {
 			if (logger.isTraceEnabled()) {
 				logger.trace("Creating new nested " + getClass().getSimpleName() + " for property '" + canonicalName + "'");
 			}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -105,7 +105,7 @@ public void clear(PropertyValues pvs) {
 
 
 	public static boolean needsRefresh(InjectionMetadata metadata, Class<?> clazz) {
-		return (metadata == null || !metadata.targetClass.equals(clazz));
+		return (metadata == null || metadata.targetClass != clazz);
 	}
 
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java
@@ -174,7 +174,7 @@ public RootBeanDefinition getBeanDefinition() {
 
 		@Override
 		public boolean equals(Object other) {
-			return (getClass().equals(other.getClass()) &&
+			return (getClass() == other.getClass() &&
 					this.beanDefinition.equals(((CglibIdentitySupport) other).beanDefinition));
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
@@ -184,7 +184,7 @@ public DataBinder(Object target) {
 	 * @param objectName the name of the target object
 	 */
 	public DataBinder(Object target, String objectName) {
-		if (target != null && target.getClass().equals(javaUtilOptionalClass)) {
+		if (target != null && target.getClass() == javaUtilOptionalClass) {
 			this.target = OptionalUnwrapper.unwrap(target);
 		}
 		else {
diff --git a/spring-context/src/main/java/org/springframework/validation/ObjectError.java b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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 boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(getClass().equals(other.getClass())) || !super.equals(other)) {
+		if (getClass() != other.getClass() || !super.equals(other)) {
 			return false;
 		}
 		ObjectError otherError = (ObjectError) other;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
@@ -376,7 +376,7 @@ public CachedMethodExecutor(MethodExecutor methodExecutor, Class<?> staticClass,
 		}
 
 		public boolean isSuitable(Object value, TypeDescriptor target, List<TypeDescriptor> argumentTypes) {
-			return ((this.staticClass == null || this.staticClass.equals(value)) &&
+			return ((this.staticClass == null || this.staticClass == value) &&
 					this.target.equals(target) && this.argumentTypes.equals(argumentTypes));
 		}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
@@ -131,7 +131,7 @@ public void setMappedClass(Class<T> mappedClass) {
 			initialize(mappedClass);
 		}
 		else {
-			if (!this.mappedClass.equals(mappedClass)) {
+			if (this.mappedClass != mappedClass) {
 				throw new InvalidDataAccessApiUsageException("The mapped class can not be reassigned to map to " +
 						mappedClass + " since it is already providing mapping for " + this.mappedClass);
 			}
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
@@ -276,7 +276,7 @@ private class Jms2MessageProducerInvocationHandler implements InvocationHandler
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			try {
 				if (method.getName().equals("send") && args != null &&
-						completionListenerClass.equals(method.getParameterTypes()[args.length - 1])) {
+						completionListenerClass == method.getParameterTypes()[args.length - 1]) {
 					switch (args.length) {
 						case 2: // send(message, completionListener)
 							return sendWithCompletionListenerMethod.invoke(
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
@@ -528,7 +528,7 @@ private String getDestinationString() {
 		}
 
 		protected boolean destinationEquals(DestinationCacheKey otherKey) {
-			return (this.destination.getClass().equals(otherKey.destination.getClass()) &&
+			return (this.destination.getClass() == otherKey.destination.getClass() &&
 					(this.destination.equals(otherKey.destination) ||
 							getDestinationString().equals(otherKey.getDestinationString())));
 		}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -28,19 +28,12 @@
  */
 public abstract class AbstractMessageCondition<T extends AbstractMessageCondition<T>> implements MessageCondition<T> {
 
-	/**
-	 * @return the collection of objects the message condition is composed of
-	 * .g. destination patterns), never {@code null}
-	 */
-	protected abstract Collection<?> getContent();
-
-
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
 		}
-		if (obj != null && getClass().equals(obj.getClass())) {
+		if (obj != null && getClass() == obj.getClass()) {
 			AbstractMessageCondition<?> other = (AbstractMessageCondition<?>) obj;
 			return getContent().equals(other.getContent());
 		}
@@ -66,6 +59,13 @@ public String toString() {
 		return builder.toString();
 	}
 
+
+	/**
+	 * Return the collection of objects the message condition is composed of
+	 * (e.g. destination patterns), never {@code null}.
+	 */
+	protected abstract Collection<?> getContent();
+
 	/**
 	 * The notation to use when printing discrete items of content.
 	 * For example " || " for URL patterns or " && " for param expressions.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -236,9 +236,9 @@ else if (this.targetPackage != null) {
 
 	@Override
 	public boolean supports(Class<?> clazz) {
-		Assert.notNull(clazz, "'clazz' must not be null");
+		Assert.notNull(clazz, "Class must not be null");
 		if (this.targetClass != null) {
-			return this.targetClass.equals(clazz);
+			return (this.targetClass == clazz);
 		}
 		String[] mappedClasses = this.bindingFactory.getMappedClasses();
 		String className = clazz.getName();
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java b/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client;
 
 import java.io.IOException;
@@ -52,7 +53,6 @@ public MockMvcClientHttpRequestFactory(MockMvc mockMvc) {
 	@Override
 	public ClientHttpRequest createRequest(final URI uri, final HttpMethod httpMethod) throws IOException {
 		return new MockClientHttpRequest(httpMethod, uri) {
-
 			@Override
 			public ClientHttpResponse executeInternal() throws IOException {
 				try {
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/RequestMatcher.java b/spring-test/src/main/java/org/springframework/test/web/client/RequestMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client;
 
 import java.io.IOException;
@@ -29,7 +30,6 @@ public interface RequestMatcher {
 
 	/**
 	 * Match the given request against some expectations.
-	 *
 	 * @param request the request to make assertions on
 	 * @throws IOException in case of I/O errors
 	 * @throws AssertionError if expectations are not met
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java b/spring-test/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -46,6 +46,7 @@ public RequestMatcherClientHttpRequest(RequestMatcher requestMatcher) {
 		this.requestMatchers.add(requestMatcher);
 	}
 
+
 	@Override
 	public ResponseActions andExpect(RequestMatcher requestMatcher) {
 		Assert.notNull(requestMatcher, "RequestMatcher is required");
@@ -61,22 +62,19 @@ public void andRespond(ResponseCreator responseCreator) {
 
 	@Override
 	public ClientHttpResponse executeInternal() throws IOException {
-
 		if (this.requestMatchers.isEmpty()) {
 			throw new AssertionError("No request expectations to execute");
 		}
 
 		if (this.responseCreator == null) {
-			throw new AssertionError("No ResponseCreator was set up. Add it after request expectations, "
-					+ "e.g. MockRestServiceServer.expect(requestTo(\"/foo\")).andRespond(withSuccess())");
+			throw new AssertionError("No ResponseCreator was set up. Add it after request expectations, " +
+					"e.g. MockRestServiceServer.expect(requestTo(\"/foo\")).andRespond(withSuccess())");
 		}
 
 		for (RequestMatcher requestMatcher : this.requestMatchers) {
 			requestMatcher.match(this);
 		}
-
 		setResponse(this.responseCreator.createResponse(this));
-
 		return super.executeInternal();
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/ResponseActions.java b/spring-test/src/main/java/org/springframework/test/web/client/ResponseActions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client;
 
 /**
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/ResponseCreator.java b/spring-test/src/main/java/org/springframework/test/web/client/ResponseCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client;
 
 import java.io.IOException;
diff --git a/spring-web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
@@ -131,7 +131,7 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (other == null || !other.getClass().equals(getClass())) {
+		if (other == null || other.getClass() != getClass()) {
 			return false;
 		}
 		HttpEntity<?> otherEntity = (HttpEntity<?>) other;
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -23,7 +23,8 @@
 import org.springframework.util.Assert;
 
 /**
- * Abstract base class for {@link ClientHttpRequestFactory} implementations that decorate another request factory.
+ * Abstract base class for {@link ClientHttpRequestFactory} implementations
+ * that decorate another request factory.
  *
  * @author Arjen Poutsma
  * @since 3.1
@@ -34,11 +35,11 @@ public abstract class AbstractClientHttpRequestFactoryWrapper implements ClientH
 
 
 	/**
-	 * Creates a {@code AbstractClientHttpRequestFactoryWrapper} wrapping the given request factory.
+	 * Create a {@code AbstractClientHttpRequestFactoryWrapper} wrapping the given request factory.
 	 * @param requestFactory the request factory to be wrapped
 	 */
 	protected AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory requestFactory) {
-		Assert.notNull(requestFactory, "'requestFactory' must not be null");
+		Assert.notNull(requestFactory, "ClientHttpRequestFactory must not be null");
 		this.requestFactory = requestFactory;
 	}
 
@@ -50,12 +51,12 @@ protected AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory reque
 	 */
 	@Override
 	public final ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
-		return createRequest(uri, httpMethod, requestFactory);
+		return createRequest(uri, httpMethod, this.requestFactory);
 	}
 
 	/**
-	 * Create a new {@link ClientHttpRequest} for the specified URI and HTTP method by using the
-	 * passed-on request factory.
+	 * Create a new {@link ClientHttpRequest} for the specified URI and HTTP method
+	 * by using the passed-on request factory.
 	 * <p>Called from {@link #createRequest(URI, HttpMethod)}.
 	 * @param uri the URI to create a request for
 	 * @param httpMethod the HTTP method to execute
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.java
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java

Original file line number	Diff line number	Diff line change
`@@ -922,7 +922,7 @@ private boolean equalsAdviceClasses(Advisor a, Advisor b) {`
`922`	`922`	`if (aa == null \|\| ba == null) {`
`923`	`923`	`return (aa == ba);`
`924`	`924`	`}`
`925`		`- return aa.getClass().equals(ba.getClass());`
	`925`	`+ return (aa.getClass() == ba.getClass());`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`private boolean equalsPointcuts(Advisor a, Advisor b) {`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public boolean equals(Object other) {`
`165`	`165`	`if (this == other) {`
`166`	`166`	`return true;`
`167`	`167`	`}`
`168`		`- if (other == null \|\| !getClass().equals(other.getClass())) {`
	`168`	`+ if (other == null \|\| getClass() != other.getClass()) {`
`169`	`169`	`return false;`
`170`	`170`	`}`
`171`	`171`	`AbstractBeanFactoryBasedTargetSource otherTargetSource = (AbstractBeanFactoryBasedTargetSource) other;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2014 the original author or authors.`
	`2`	`+ * Copyright 2002-2015 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -105,7 +105,7 @@ public void clear(PropertyValues pvs) {`
`105`	`105`
`106`	`106`
`107`	`107`	`public static boolean needsRefresh(InjectionMetadata metadata, Class<?> clazz) {`
`108`		`- return (metadata == null \|\| !metadata.targetClass.equals(clazz));`
	`108`	`+ return (metadata == null \|\| metadata.targetClass != clazz);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public RootBeanDefinition getBeanDefinition() {`
`174`	`174`
`175`	`175`	`@Override`
`176`	`176`	`public boolean equals(Object other) {`
`177`		`- return (getClass().equals(other.getClass()) &&`
	`177`	`+ return (getClass() == other.getClass() &&`
`178`	`178`	`this.beanDefinition.equals(((CglibIdentitySupport) other).beanDefinition));`
`179`	`179`	`}`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public DataBinder(Object target) {`
`184`	`184`	`* @param objectName the name of the target object`
`185`	`185`	`*/`
`186`	`186`	`public DataBinder(Object target, String objectName) {`
`187`		`- if (target != null && target.getClass().equals(javaUtilOptionalClass)) {`
	`187`	`+ if (target != null && target.getClass() == javaUtilOptionalClass) {`
`188`	`188`	`this.target = OptionalUnwrapper.unwrap(target);`
`189`	`189`	`}`
`190`	`190`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2012 the original author or authors.`
	`2`	`+ * Copyright 2002-2015 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -78,7 +78,7 @@ public boolean equals(Object other) {`
`78`	`78`	`if (this == other) {`
`79`	`79`	`return true;`
`80`	`80`	`}`
`81`		`- if (!(getClass().equals(other.getClass())) \|\| !super.equals(other)) {`
	`81`	`+ if (getClass() != other.getClass() \|\| !super.equals(other)) {`
`82`	`82`	`return false;`
`83`	`83`	`}`
`84`	`84`	`ObjectError otherError = (ObjectError) other;`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ public CachedMethodExecutor(MethodExecutor methodExecutor, Class<?> staticClass,`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`public boolean isSuitable(Object value, TypeDescriptor target, List<TypeDescriptor> argumentTypes) {`
`379`		`- return ((this.staticClass == null \|\| this.staticClass.equals(value)) &&`
	`379`	`+ return ((this.staticClass == null \|\| this.staticClass == value) &&`
`380`	`380`	`this.target.equals(target) && this.argumentTypes.equals(argumentTypes));`
`381`	`381`	`}`
`382`	`382`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public void setMappedClass(Class<T> mappedClass) {`
`131`	`131`	`initialize(mappedClass);`
`132`	`132`	`}`
`133`	`133`	`else {`
`134`		`- if (!this.mappedClass.equals(mappedClass)) {`
	`134`	`+ if (this.mappedClass != mappedClass) {`
`135`	`135`	`throw new InvalidDataAccessApiUsageException("The mapped class can not be reassigned to map to " +`
`136`	`136`	`mappedClass + " since it is already providing mapping for " + this.mappedClass);`
`137`	`137`	`}`