Class identity comparisons wherever possible

Issue: SPR-12926

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.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.
@@ -381,7 +381,7 @@ else if (maybeBindJoinPointStaticPart(parameterTypes[0])) {
 	}
 
 	private boolean maybeBindJoinPoint(Class<?> candidateParameterType) {
-		if (candidateParameterType.equals(JoinPoint.class)) {
+		if (JoinPoint.class == candidateParameterType) {
 			this.joinPointArgumentIndex = 0;
 			return true;
 		}
@@ -391,7 +391,7 @@ private boolean maybeBindJoinPoint(Class<?> candidateParameterType) {
 	}
 
 	private boolean maybeBindProceedingJoinPoint(Class<?> candidateParameterType) {
-		if (candidateParameterType.equals(ProceedingJoinPoint.class)) {
+		if (ProceedingJoinPoint.class == candidateParameterType) {
 			if (!supportsProceedingJoinPoint()) {
 				throw new IllegalArgumentException("ProceedingJoinPoint is only supported for around advice");
 			}
@@ -408,7 +408,7 @@ protected boolean supportsProceedingJoinPoint() {
 	}
 
 	private boolean maybeBindJoinPointStaticPart(Class<?> candidateParameterType) {
-		if (candidateParameterType.equals(JoinPoint.StaticPart.class)) {
+		if (JoinPoint.StaticPart.class == candidateParameterType) {
 			this.joinPointStaticPartArgumentIndex = 0;
 			return true;
 		}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.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.
@@ -93,7 +93,7 @@ private boolean matchesReturnValue(Class<?> type, Method method, Object returnVa
 		if (returnValue != null) {
 			return ClassUtils.isAssignableValue(type, returnValue);
 		}
-		else if (type.equals(Object.class) && method.getReturnType().equals(void.class)) {
+		else if (Object.class == type && void.class == method.getReturnType()) {
 			return true;
 		}
 		else{

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.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.
@@ -72,7 +72,7 @@ public AspectMetadata(Class<?> aspectClass, String aspectName) {
 
 		Class<?> currClass = aspectClass;
 		AjType<?> ajType = null;
-		while (!currClass.equals(Object.class)) {
+		while (currClass != Object.class) {
 			AjType<?> ajTypeToCheck = AjTypeSystem.getAjType(currClass);
 			if (ajTypeToCheck.isAspect()) {
 				ajType = ajTypeToCheck;

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java

@@ -157,7 +157,7 @@ private Advisor getDeclareParentsAdvisor(Field introductionField) {
 			return null;
 		}
 
-		if (DeclareParents.class.equals(declareParents.defaultImpl())) {
+		if (DeclareParents.class == declareParents.defaultImpl()) {
 			// This is what comes back if it wasn't set. This seems bizarre...
 			// TODO this restriction possibly should be relaxed
 			throw new IllegalStateException("defaultImpl must be set on DeclareParents");

spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java

@@ -255,7 +255,7 @@ private void validateClassIfNecessary(Class<?> proxySuperClass, ClassLoader prox
 	 * methods across ClassLoaders, and writes warnings to the log for each one found.
 	 */
 	private void doValidateClass(Class<?> proxySuperClass, ClassLoader proxyClassLoader) {
-		if (!Object.class.equals(proxySuperClass)) {
+		if (Object.class != proxySuperClass) {
 			Method[] methods = proxySuperClass.getDeclaredMethods();
 			for (Method method : methods) {
 				int mod = method.getModifiers();

spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java

@@ -71,7 +71,7 @@ public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException
 	 */
 	private boolean hasNoUserSuppliedProxyInterfaces(AdvisedSupport config) {
 		Class<?>[] interfaces = config.getProxiedInterfaces();
-		return (interfaces.length == 0 || (interfaces.length == 1 && SpringProxy.class.equals(interfaces[0])));
+		return (interfaces.length == 0 || (interfaces.length == 1 && SpringProxy.class == interfaces[0]));
 	}
 
 }

spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java

@@ -126,7 +126,7 @@ protected void evaluateProxyInterfaces(Class<?> beanClass, ProxyFactory proxyFac
 	 * @return whether the given interface is just a container callback
 	 */
 	protected boolean isConfigurationCallbackInterface(Class<?> ifc) {
-		return (ifc.equals(InitializingBean.class) || ifc.equals(DisposableBean.class) ||
+		return (InitializingBean.class == ifc || DisposableBean.class == ifc ||
 				ObjectUtils.containsElement(ifc.getInterfaces(), Aware.class));
 	}
 

spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.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.
@@ -109,7 +109,7 @@ private Method getExceptionHandler(Throwable exception) {
 			logger.trace("Trying to find handler for exception of type [" + exceptionClass.getName() + "]");
 		}
 		Method handler = this.exceptionHandlerMap.get(exceptionClass);
-		while (handler == null && !exceptionClass.equals(Throwable.class)) {
+		while (handler == null && exceptionClass != Throwable.class) {
 			exceptionClass = exceptionClass.getSuperclass();
 			handler = this.exceptionHandlerMap.get(exceptionClass);
 		}

spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java

@@ -619,7 +619,7 @@ else if (value instanceof Closure) {
 			try {
 				Closure callable = (Closure) value;
 				Class<?> parameterType = callable.getParameterTypes()[0];
-				if (parameterType.equals(Object.class)) {
+				if (Object.class == parameterType) {
 					this.currentBeanDefinition = new GroovyBeanDefinitionWrapper("");
 					callable.call(this.currentBeanDefinition);
 				}

spring-beans/src/main/java/org/springframework/beans/BeanUtils.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.
@@ -517,12 +517,12 @@ public static boolean isSimpleProperty(Class<?> clazz) {
 	 * @return whether the given type represents a "simple" value type
 	 */
 	public static boolean isSimpleValueType(Class<?> clazz) {
-		return ClassUtils.isPrimitiveOrWrapper(clazz) || clazz.isEnum() ||
+		return (ClassUtils.isPrimitiveOrWrapper(clazz) || clazz.isEnum() ||
 				CharSequence.class.isAssignableFrom(clazz) ||
 				Number.class.isAssignableFrom(clazz) ||
 				Date.class.isAssignableFrom(clazz) ||
-				clazz.equals(URI.class) || clazz.equals(URL.class) ||
-				clazz.equals(Locale.class) || clazz.equals(Class.class);
+				URI.class == clazz || URL.class == clazz ||
+				Locale.class == clazz || Class.class == clazz);
 	}