Consistent instanceof/casting of Class references

jhoeller · jhoeller · commit bf0df5413694 · 2016-10-31T11:50:59.000+01:00
(cherry picked from commit ac80ac6)
diff --git a/spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.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.
@@ -458,7 +458,7 @@ protected GroovyBeanDefinitionReader invokeBeanDefiningClosure(Closure callable)
 	private GroovyBeanDefinitionWrapper invokeBeanDefiningMethod(String beanName, Object[] args) {
 		boolean hasClosureArgument = args[args.length - 1] instanceof Closure;
 		if (args[0] instanceof Class) {
-			Class<?> beanClass = (args[0] instanceof Class ? (Class) args[0] : args[0].getClass());
+			Class<?> beanClass = (args[0] instanceof Class ? (Class<?>) args[0] : args[0].getClass());
 			if (args.length >= 1) {
 				if (hasClosureArgument) {
 					if (args.length-1 != 1) {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -37,24 +37,17 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.Aware;
-import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.parsing.Location;
 import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.parsing.ProblemReporter;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionReader;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.ResourceLoaderAware;
 import org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase;
 import org.springframework.core.NestedIOException;
 import org.springframework.core.annotation.AnnotationAttributes;
@@ -724,7 +717,7 @@ private class SourceClass {
 
 		public SourceClass(Object source) {
 			this.source = source;
-			if (source instanceof Class<?>) {
+			if (source instanceof Class) {
 				this.metadata = new StandardAnnotationMetadata((Class<?>) source, true);
 			}
 			else {
@@ -737,7 +730,7 @@ public final AnnotationMetadata getMetadata() {
 		}
 
 		public Class<?> loadClass() throws ClassNotFoundException {
-			if (this.source instanceof Class<?>) {
+			if (this.source instanceof Class) {
 				return (Class<?>) this.source;
 			}
 			String className = ((MetadataReader) this.source).getClassMetadata().getClassName();
@@ -752,15 +745,15 @@ public boolean isAssignable(Class<?> clazz) throws IOException {
 		}
 
 		public ConfigurationClass asConfigClass(ConfigurationClass importedBy) throws IOException {
-			if (this.source instanceof Class<?>) {
+			if (this.source instanceof Class) {
 				return new ConfigurationClass((Class<?>) this.source, importedBy);
 			}
 			return new ConfigurationClass((MetadataReader) this.source, importedBy);
 		}
 
 		public Collection<SourceClass> getMemberClasses() throws IOException {
 			Object sourceToProcess = this.source;
-			if (sourceToProcess instanceof Class<?>) {
+			if (sourceToProcess instanceof Class) {
 				Class<?> sourceClass = (Class<?>) sourceToProcess;
 				try {
 					Class<?>[] declaredClasses = sourceClass.getDeclaredClasses();
@@ -797,15 +790,15 @@ public Collection<SourceClass> getMemberClasses() throws IOException {
 		}
 
 		public SourceClass getSuperClass() throws IOException {
-			if (this.source instanceof Class<?>) {
+			if (this.source instanceof Class) {
 				return asSourceClass(((Class<?>) this.source).getSuperclass());
 			}
 			return asSourceClass(((MetadataReader) this.source).getClassMetadata().getSuperClassName());
 		}
 
 		public Set<SourceClass> getInterfaces() throws IOException {
 			Set<SourceClass> result = new LinkedHashSet<SourceClass>();
-			if (this.source instanceof Class<?>) {
+			if (this.source instanceof Class) {
 				Class<?> sourceClass = (Class<?>) this.source;
 				for (Class<?> ifcClass : sourceClass.getInterfaces()) {
 					result.add(asSourceClass(ifcClass));
@@ -847,7 +840,7 @@ public Collection<SourceClass> getAnnotationAttributes(String annotationType, St
 		}
 
 		private SourceClass getRelated(String className) throws IOException {
-			if (this.source instanceof Class<?>) {
+			if (this.source instanceof Class) {
 				try {
 					Class<?> clazz = ((Class<?>) this.source).getClassLoader().loadClass(className);
 					return asSourceClass(clazz);
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
@@ -516,7 +516,8 @@ public static <A extends Annotation> A findAnnotation(AnnotatedElement annotated
 	 * @since 4.2
 	 */
 	@SuppressWarnings("unchecked")
-	private static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType, Set<Annotation> visited) {
+	private static <A extends Annotation> A findAnnotation(
+			AnnotatedElement annotatedElement, Class<A> annotationType, Set<Annotation> visited) {
 		try {
 			Annotation[] anns = annotatedElement.getDeclaredAnnotations();
 			for (Annotation ann : anns) {
@@ -1108,10 +1109,10 @@ static Object adaptValue(Object annotatedElement, Object value, boolean classVal
 			boolean nestedAnnotationsAsMap) {
 
 		if (classValuesAsString) {
-			if (value instanceof Class<?>) {
+			if (value instanceof Class) {
 				return ((Class<?>) value).getName();
 			}
-			else if (value instanceof Class<?>[]) {
+			else if (value instanceof Class[]) {
 				Class<?>[] clazzArray = (Class<?>[]) value;
 				String[] classNames = new String[clazzArray.length];
 				for (int i = 0; i < clazzArray.length; i++) {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
@@ -80,10 +80,10 @@ else if (value instanceof Type[]) {
 					value = convArray;
 				}
 				else if (classValuesAsString) {
-					if (value instanceof Class<?>) {
+					if (value instanceof Class) {
 						value = ((Class<?>) value).getName();
 					}
-					else if (value instanceof Class<?>[]) {
+					else if (value instanceof Class[]) {
 						Class<?>[] clazzArray = (Class<?>[]) value;
 						String[] newValue = new String[clazzArray.length];
 						for (int i = 0; i < clazzArray.length; i++) {
diff --git a/spring-core/src/main/java/org/springframework/util/TypeUtils.java b/spring-core/src/main/java/org/springframework/util/TypeUtils.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.
@@ -48,19 +48,19 @@ public static boolean isAssignable(Type lhsType, Type rhsType) {
 			return true;
 		}
 
-		if (lhsType instanceof Class<?>) {
+		if (lhsType instanceof Class) {
 			Class<?> lhsClass = (Class<?>) lhsType;
 
 			// just comparing two classes
-			if (rhsType instanceof Class<?>) {
+			if (rhsType instanceof Class) {
 				return ClassUtils.isAssignable(lhsClass, (Class<?>) rhsType);
 			}
 
 			if (rhsType instanceof ParameterizedType) {
 				Type rhsRaw = ((ParameterizedType) rhsType).getRawType();
 
 				// a parameterized type is always assignable to its raw class type
-				if (rhsRaw instanceof Class<?>) {
+				if (rhsRaw instanceof Class) {
 					return ClassUtils.isAssignable(lhsClass, (Class<?>) rhsRaw);
 				}
 			}
@@ -73,10 +73,10 @@ else if (lhsClass.isArray() && rhsType instanceof GenericArrayType) {
 
 		// parameterized types are only assignable to other parameterized types and class types
 		if (lhsType instanceof ParameterizedType) {
-			if (rhsType instanceof Class<?>) {
+			if (rhsType instanceof Class) {
 				Type lhsRaw = ((ParameterizedType) lhsType).getRawType();
 
-				if (lhsRaw instanceof Class<?>) {
+				if (lhsRaw instanceof Class) {
 					return ClassUtils.isAssignable((Class<?>) lhsRaw, (Class<?>) rhsType);
 				}
 			}
@@ -88,7 +88,7 @@ else if (rhsType instanceof ParameterizedType) {
 		if (lhsType instanceof GenericArrayType) {
 			Type lhsComponent = ((GenericArrayType) lhsType).getGenericComponentType();
 
-			if (rhsType instanceof Class<?>) {
+			if (rhsType instanceof Class) {
 				Class<?> rhsClass = (Class<?>) rhsType;
 
 				if (rhsClass.isArray()) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
@@ -59,7 +59,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 		Object leftValue = left.getValue();
 		Object rightValue = right.getValue();
 		BooleanTypedValue result = null;
-		if (rightValue == null || !(rightValue instanceof Class<?>)) {
+		if (rightValue == null || !(rightValue instanceof Class)) {
 			throw new SpelEvaluationException(getRightOperand().getStartPosition(),
 					SpelMessage.INSTANCEOF_OPERATOR_NEEDS_CLASS_OPERAND,
 					(rightValue == null ? "null" : rightValue.getClass().getName()));
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
@@ -1464,12 +1464,12 @@ else if (method.getName().equals("hashCode")) {
 				return System.identityHashCode(proxy);
 			}
 			else if (method.getName().equals("unwrap")) {
-				if (((Class) args[0]).isInstance(proxy)) {
+				if (((Class<?>) args[0]).isInstance(proxy)) {
 					return proxy;
 				}
 			}
 			else if (method.getName().equals("isWrapperFor")) {
-				if (((Class) args[0]).isInstance(proxy)) {
+				if (((Class<?>) args[0]).isInstance(proxy)) {
 					return true;
 				}
 			}
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -530,7 +530,7 @@ else if (conversionHint instanceof JsonView) {
 			return extractViewClass((JsonView) conversionHint, conversionHint);
 		}
 		else if (conversionHint instanceof Class) {
-			return (Class) conversionHint;
+			return (Class<?>) conversionHint;
 		}
 		else {
 			return null;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.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.
@@ -171,7 +171,7 @@ protected <T> Object readWithMessageConverters(HttpInputMessage inputMessage, Me
 		}
 
 		Class<?> contextClass = (param != null ? param.getContainingClass() : null);
-		Class<T> targetClass = (targetType instanceof Class<?> ? (Class<T>) targetType : null);
+		Class<T> targetClass = (targetType instanceof Class ? (Class<T>) targetType : null);
 		if (targetClass == null) {
 			ResolvableType resolvableType = (param != null ?
 					ResolvableType.forMethodParameter(param) : ResolvableType.forType(targetType));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -203,7 +203,7 @@ protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handler
 	 */
 	private RequestMappingInfo createRequestMappingInfo(AnnotatedElement element) {
 		RequestMapping requestMapping = AnnotatedElementUtils.findMergedAnnotation(element, RequestMapping.class);
-		RequestCondition<?> condition = (element instanceof Class<?> ?
+		RequestCondition<?> condition = (element instanceof Class ?
 				getCustomTypeCondition((Class<?>) element) : getCustomMethodCondition((Method) element));
 		return (requestMapping != null ? createRequestMappingInfo(requestMapping, condition) : null);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -51,6 +51,7 @@
  * a method argument that provides access to the response stream.
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 3.1
  */
 public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
@@ -81,6 +82,7 @@ public ServletInvocableHandlerMethod(HandlerMethod handlerMethod) {
 		initResponseStatus();
 	}
 
+
 	private void initResponseStatus() {
 		ResponseStatus annotation = getMethodAnnotation(ResponseStatus.class);
 		if (annotation == null) {
@@ -92,7 +94,6 @@ private void initResponseStatus() {
 		}
 	}
 
-
 	/**
 	 * Register {@link HandlerMethodReturnValueHandler} instances to use to
 	 * handle return values.
@@ -101,8 +102,9 @@ public void setHandlerMethodReturnValueHandlers(HandlerMethodReturnValueHandlerC
 		this.returnValueHandlers = returnValueHandlers;
 	}
 
+
 	/**
-	 * Invokes the method and handles the return value through one of the
+	 * Invoke the method and handle the return value through one of the
 	 * configured {@link HandlerMethodReturnValueHandler}s.
 	 * @param webRequest the current request
 	 * @param mavContainer the ModelAndViewContainer for this request
@@ -151,7 +153,7 @@ private void setResponseStatus(ServletWebRequest webRequest) throws IOException
 		else {
 			webRequest.getResponse().setStatus(this.responseStatus.value());
 		}
-		// to be picked up by the RedirectView
+		// To be picked up by RedirectView
 		webRequest.getRequest().setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, this.responseStatus);
 	}
 
@@ -214,6 +216,7 @@ else if (result instanceof Throwable) {
 					return result;
 				}
 			}, CALLABLE_METHOD);
+
 			setHandlerMethodReturnValueHandlers(ServletInvocableHandlerMethod.this.returnValueHandlers);
 			this.returnType = returnType;
 		}

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,10 @@ else if (value instanceof Type[]) {`
`80`	`80`	`value = convArray;`
`81`	`81`	`}`
`82`	`82`	`else if (classValuesAsString) {`
`83`		`- if (value instanceof Class<?>) {`
	`83`	`+ if (value instanceof Class) {`
`84`	`84`	`value = ((Class<?>) value).getName();`
`85`	`85`	`}`
`86`		`- else if (value instanceof Class<?>[]) {`
	`86`	`+ else if (value instanceof Class[]) {`
`87`	`87`	`Class<?>[] clazzArray = (Class<?>[]) value;`
`88`	`88`	`String[] newValue = new String[clazzArray.length];`
`89`	`89`	`for (int i = 0; i < clazzArray.length; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -1464,12 +1464,12 @@ else if (method.getName().equals("hashCode")) {`
`1464`	`1464`	`return System.identityHashCode(proxy);`
`1465`	`1465`	`}`
`1466`	`1466`	`else if (method.getName().equals("unwrap")) {`
`1467`		`- if (((Class) args[0]).isInstance(proxy)) {`
	`1467`	`+ if (((Class<?>) args[0]).isInstance(proxy)) {`
`1468`	`1468`	`return proxy;`
`1469`	`1469`	`}`
`1470`	`1470`	`}`
`1471`	`1471`	`else if (method.getName().equals("isWrapperFor")) {`
`1472`		`- if (((Class) args[0]).isInstance(proxy)) {`
	`1472`	`+ if (((Class<?>) args[0]).isInstance(proxy)) {`
`1473`	`1473`	`return true;`
`1474`	`1474`	`}`
`1475`	`1475`	`}`
Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ else if (conversionHint instanceof JsonView) {`
`530`	`530`	`return extractViewClass((JsonView) conversionHint, conversionHint);`
`531`	`531`	`}`
`532`	`532`	`else if (conversionHint instanceof Class) {`
`533`		`- return (Class) conversionHint;`
	`533`	`+ return (Class<?>) conversionHint;`
`534`	`534`	`}`
`535`	`535`	`else {`
`536`	`536`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2015 the original author or authors.`
	`2`	`+ * Copyright 2002-2016 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.`
`@@ -171,7 +171,7 @@ protected <T> Object readWithMessageConverters(HttpInputMessage inputMessage, Me`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`Class<?> contextClass = (param != null ? param.getContainingClass() : null);`
`174`		`- Class<T> targetClass = (targetType instanceof Class<?> ? (Class<T>) targetType : null);`
	`174`	`+ Class<T> targetClass = (targetType instanceof Class ? (Class<T>) targetType : null);`
`175`	`175`	`if (targetClass == null) {`
`176`	`176`	`ResolvableType resolvableType = (param != null ?`
`177`	`177`	`ResolvableType.forMethodParameter(param) : ResolvableType.forType(targetType));`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handler`
`203`	`203`	`*/`
`204`	`204`	`private RequestMappingInfo createRequestMappingInfo(AnnotatedElement element) {`
`205`	`205`	`RequestMapping requestMapping = AnnotatedElementUtils.findMergedAnnotation(element, RequestMapping.class);`
`206`		`- RequestCondition<?> condition = (element instanceof Class<?> ?`
	`206`	`+ RequestCondition<?> condition = (element instanceof Class ?`
`207`	`207`	`getCustomTypeCondition((Class<?>) element) : getCustomMethodCondition((Method) element));`
`208`	`208`	`return (requestMapping != null ? createRequestMappingInfo(requestMapping, condition) : null);`
`209`	`209`	`}`