Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Class identity comparisons wherever possible

Browse Source 
Issue: SPR-12926
This commit is contained in:
Juergen Hoeller
2015-05-20 14:34:09 +02:00
parent 57e0c789a8
commit b4095c3e1d
108 changed files with 317 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
View File

@@ -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.
@@ -267,7 +267,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
return depth;
}
// If we've gone as far as we can go and haven't found it...
if (exceptionClass.equals(Throwable.class)) {
if (exceptionClass == Throwable.class) {
return -1;
}
return getDepth(exceptionMapping, exceptionClass.getSuperclass(), depth + 1);

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
View File

@@ -891,7 +891,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
else if (Principal.class.isAssignableFrom(parameterType)) {
return request.getUserPrincipal();
}
else if (Locale.class.equals(parameterType)) {
else if (Locale.class == parameterType) {
return RequestContextUtils.getLocale(request);
}
else if (InputStream.class.isAssignableFrom(parameterType)) {

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
View File

@@ -341,7 +341,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
else if (Principal.class.isAssignableFrom(parameterType)) {
return request.getUserPrincipal();
}
else if (Locale.class.equals(parameterType)) {
else if (Locale.class == parameterType) {
return RequestContextUtils.getLocale(request);
}
else if (InputStream.class.isAssignableFrom(parameterType)) {

6
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
View File

@@ -102,8 +102,8 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro
@Override
public boolean supportsParameter(MethodParameter parameter) {
return (HttpEntity.class.equals(parameter.getParameterType()) ||
RequestEntity.class.equals(parameter.getParameterType()));
return (HttpEntity.class == parameter.getParameterType() ||
RequestEntity.class == parameter.getParameterType());
}
@Override
@@ -121,7 +121,7 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro
Type paramType = getHttpEntityType(parameter);
Object body = readWithMessageConverters(webRequest, parameter, paramType);
if (RequestEntity.class.equals(parameter.getParameterType())) {
if (RequestEntity.class == parameter.getParameterType()) {
URI url = inputMessage.getURI();
HttpMethod httpMethod = inputMessage.getMethod();
return new RequestEntity<Object>(body, inputMessage.getHeaders(), httpMethod, url);

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
View File

@@ -701,7 +701,7 @@ public class MvcUriComponentsBuilder {
this.controllerMethod = method;
this.argumentValues = args;
Class<?> returnType = method.getReturnType();
return (void.class.equals(returnType) ? null : returnType.cast(initProxy(returnType, this)));
return (void.class == returnType ? null : returnType.cast(initProxy(returnType, this)));
}
}

10
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
View File

@@ -111,7 +111,7 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM
if (parameter.hasParameterAnnotation(RequestParam.class)){
return false;
}
else if (MultipartFile.class.equals(parameter.getParameterType())) {
else if (MultipartFile.class == parameter.getParameterType()) {
return true;
}
else if ("javax.servlet.http.Part".equals(parameter.getParameterType().getName())) {
@@ -144,7 +144,7 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM
String partName = getPartName(parameter);
Object arg;
if (MultipartFile.class.equals(paramType)) {
if (MultipartFile.class == paramType) {
Assert.notNull(multipartRequest, "Expected MultipartHttpServletRequest: is a MultipartResolver configured?");
arg = multipartRequest.getFile(partName);
}
@@ -224,12 +224,12 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM
private boolean isMultipartFileCollection(MethodParameter methodParam) {
Class<?> collectionType = getCollectionParameterType(methodParam);
return MultipartFile.class.equals(collectionType);
return MultipartFile.class == collectionType;
}
private boolean isMultipartFileArray(MethodParameter methodParam) {
Class<?> paramType = methodParam.getNestedParameterType().getComponentType();
return MultipartFile.class.equals(paramType);
return MultipartFile.class == paramType;
}
private boolean isPartCollection(MethodParameter methodParam) {
@@ -244,7 +244,7 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM
private Class<?> getCollectionParameterType(MethodParameter methodParam) {
Class<?> paramType = methodParam.getNestedParameterType();
if (Collection.class.equals(paramType) || List.class.isAssignableFrom(paramType)){
if (Collection.class == paramType || List.class.isAssignableFrom(paramType)){
Class<?> valueType = GenericCollectionTypeResolver.getCollectionParameterType(methodParam);
if (valueType != null) {
return valueType;

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChain.java
View File

@@ -72,10 +72,10 @@ class RequestResponseBodyAdviceChain implements RequestBodyAdvice, ResponseBodyA
}
private List<Object> getAdvice(Class<?> adviceType) {
if (RequestBodyAdvice.class.equals(adviceType)) {
if (RequestBodyAdvice.class == adviceType) {
return this.requestBodyAdvice;
}
else if (ResponseBodyAdvice.class.equals(adviceType)) {
else if (ResponseBodyAdvice.class == adviceType) {
return this.responseBodyAdvice;
}
else {

12
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
View File

@@ -69,12 +69,12 @@ public class ServletRequestMethodArgumentResolver implements HandlerMethodArgume
MultipartRequest.class.isAssignableFrom(paramType) ||
HttpSession.class.isAssignableFrom(paramType) ||
Principal.class.isAssignableFrom(paramType) ||
Locale.class.equals(paramType) ||
TimeZone.class.equals(paramType) ||
Locale.class == paramType ||
TimeZone.class == paramType ||
"java.time.ZoneId".equals(paramType.getName()) ||
InputStream.class.isAssignableFrom(paramType) ||
Reader.class.isAssignableFrom(paramType) ||
HttpMethod.class.equals(paramType));
HttpMethod.class == paramType);
}
@Override
@@ -98,16 +98,16 @@ public class ServletRequestMethodArgumentResolver implements HandlerMethodArgume
else if (HttpSession.class.isAssignableFrom(paramType)) {
return request.getSession();
}
else if (HttpMethod.class.equals(paramType)) {
else if (HttpMethod.class == paramType) {
return ((ServletWebRequest) webRequest).getHttpMethod();
}
else if (Principal.class.isAssignableFrom(paramType)) {
return request.getUserPrincipal();
}
else if (Locale.class.equals(paramType)) {
else if (Locale.class == paramType) {
return RequestContextUtils.getLocale(request);
}
else if (TimeZone.class.equals(paramType)) {
else if (TimeZone.class == paramType) {
TimeZone timeZone = RequestContextUtils.getTimeZone(request);
return (timeZone != null ? timeZone : TimeZone.getDefault());
}

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
View File

@@ -42,7 +42,7 @@ public class UriComponentsBuilderMethodArgumentResolver implements HandlerMethod
@Override
public boolean supportsParameter(MethodParameter parameter) {
Class<?> type = parameter.getParameterType();
return (UriComponentsBuilder.class.equals(type) || ServletUriComponentsBuilder.class.equals(type));
return (UriComponentsBuilder.class == type || ServletUriComponentsBuilder.class == type);
}
@Override

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java
View File

@@ -68,7 +68,7 @@ public class ViewNameMethodReturnValueHandler implements HandlerMethodReturnValu
@Override
public boolean supportsReturnType(MethodParameter returnType) {
Class<?> paramType = returnType.getParameterType();
return (void.class.equals(paramType) || String.class.equals(paramType));
return (void.class == paramType || String.class == paramType);
}
@Override

21
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
View File

@@ -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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.web.servlet.mvc.multiaction;
package org.springframework.web.servlet. mvc.multiaction;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -288,12 +288,12 @@ public class MultiActionController extends AbstractController implements LastMod
*/
private boolean isHandlerMethod(Method method) {
Class<?> returnType = method.getReturnType();
if (ModelAndView.class.equals(returnType) || Map.class.equals(returnType) || String.class.equals(returnType) ||
void.class.equals(returnType)) {
if (ModelAndView.class == returnType || Map.class == returnType || String.class == returnType ||
void.class == returnType) {
Class<?>[] parameterTypes = method.getParameterTypes();
return (parameterTypes.length >= 2 &&
HttpServletRequest.class.equals(parameterTypes[0]) &&
HttpServletResponse.class.equals(parameterTypes[1]) &&
HttpServletRequest.class == parameterTypes[0] &&
HttpServletResponse.class == parameterTypes[1] &&
!("handleRequest".equals(method.getName()) && parameterTypes.length == 2));
}
return false;
@@ -329,7 +329,7 @@ public class MultiActionController extends AbstractController implements LastMod
method.getName() + LAST_MODIFIED_METHOD_SUFFIX,
new Class<?>[] {HttpServletRequest.class});
Class<?> returnType = lastModifiedMethod.getReturnType();
if (!(long.class.equals(returnType) || Long.class.equals(returnType))) {
if (!(long.class == returnType || Long.class == returnType)) {
throw new IllegalStateException("last-modified method [" + lastModifiedMethod +
"] declares an invalid return type - needs to be 'long' or 'Long'");
}
@@ -452,7 +452,7 @@ public class MultiActionController extends AbstractController implements LastMod
params.add(request);
params.add(response);
if (paramTypes.length >= 3 && paramTypes[2].equals(HttpSession.class)) {
if (paramTypes.length >= 3 && HttpSession.class == paramTypes[2]) {
HttpSession session = request.getSession(false);
if (session == null) {
throw new HttpSessionRequiredException(
@@ -462,8 +462,7 @@ public class MultiActionController extends AbstractController implements LastMod
}
// If last parameter isn't of HttpSession type, it's a command.
if (paramTypes.length >= 3 &&
!paramTypes[paramTypes.length - 1].equals(HttpSession.class)) {
if (paramTypes.length >= 3 && HttpSession.class != paramTypes[paramTypes.length - 1]) {
Object command = newCommandObject(paramTypes[paramTypes.length - 1]);
params.add(command);
bind(request, command);
@@ -608,7 +607,7 @@ public class MultiActionController extends AbstractController implements LastMod
logger.debug("Trying to find handler for exception class [" + exceptionClass.getName() + "]");
}
Method handler = this.exceptionHandlerMap.get(exceptionClass);
while (handler == null && !exceptionClass.equals(Throwable.class)) {
while (handler == null && exceptionClass != Throwable.class) {
if (logger.isDebugEnabled()) {
logger.debug("Trying to find handler for exception superclass [" + exceptionClass.getName() + "]");
}

2
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
View File

@@ -71,7 +71,7 @@ public class CheckboxTag extends AbstractSingleCheckedElementTag {
Object boundValue = getBoundValue();
Class<?> valueType = getBindStatus().getValueType();
if (Boolean.class.equals(valueType) || boolean.class.equals(valueType)) {
if (Boolean.class == valueType || boolean.class == valueType) {
// the concrete type may not be a Boolean - can be String
if (boundValue instanceof String) {
boundValue = Boolean.valueOf((String) boundValue);

4
spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
View File

@@ -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.
@@ -60,7 +60,7 @@ public class InternalResourceViewResolver extends UrlBasedViewResolver {
*/
public InternalResourceViewResolver() {
Class<?> viewClass = requiredViewClass();
if (viewClass.equals(InternalResourceView.class) && jstlPresent) {
if (InternalResourceView.class == viewClass && jstlPresent) {
viewClass = JstlView.class;
}
setViewClass(viewClass);

2
spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java
View File

@@ -106,7 +106,7 @@ public class VelocityViewResolver extends AbstractTemplateViewResolver {
super.initApplicationContext();
if (this.toolboxConfigLocation != null) {
if (VelocityView.class.equals(getViewClass())) {
if (VelocityView.class == getViewClass()) {
logger.info("Using VelocityToolboxView instead of default VelocityView " +
"due to specified toolboxConfigLocation");
setViewClass(VelocityToolboxView.class);