Polishing

jhoeller · jhoeller · commit a9a1f783c5f9 · 2017-04-13T15:59:15.000+02:00
diff --git a/gradle/publish-maven.gradle b/gradle/publish-maven.gradle
@@ -29,8 +29,8 @@ def customizePom(pom, gradleProject) {
 			}
 			licenses {
 				license {
-					name "The Apache Software License, Version 2.0"
-					url "http://www.apache.org/licenses/LICENSE-2.0.txt"
+					name "Apache License, Version 2.0"
+					url "http://www.apache.org/licenses/LICENSE-2.0"
 					distribution "repo"
 				}
 			}
diff --git a/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java b/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -39,10 +39,11 @@ public class CacheNamespaceHandler extends NamespaceHandlerSupport {
 
 	static final String DEFAULT_CACHE_MANAGER_BEAN_NAME = "cacheManager";
 
+
 	static String extractCacheManager(Element element) {
-		return (element.hasAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE) ? element
-				.getAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE)
-				: CacheNamespaceHandler.DEFAULT_CACHE_MANAGER_BEAN_NAME);
+		return (element.hasAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE) ?
+				element.getAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE) :
+				CacheNamespaceHandler.DEFAULT_CACHE_MANAGER_BEAN_NAME);
 	}
 
 	static BeanDefinition parseKeyGenerator(Element element, BeanDefinition def) {
@@ -53,9 +54,11 @@ static BeanDefinition parseKeyGenerator(Element element, BeanDefinition def) {
 		return def;
 	}
 
+
 	@Override
 	public void init() {
 		registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenCacheBeanDefinitionParser());
 		registerBeanDefinitionParser("advice", new CacheAdviceParser());
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
@@ -390,7 +390,7 @@
 
 	/**
 	 * Explicitly specify the name of the Spring bean definition associated
-	 * with this Configuration class.  If left unspecified (the common case),
+	 * with this Configuration class. If left unspecified (the common case),
 	 * a bean name will be automatically generated.
 	 * <p>The custom name applies only if the Configuration class is picked up via
 	 * component scanning or supplied directly to a {@link AnnotationConfigApplicationContext}.
diff --git a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -256,8 +256,8 @@ private Collection<ApplicationListener<?>> retrieveApplicationListeners(
 	 * for the given event type
 	 */
 	protected boolean supportsEvent(Class<?> listenerType, ResolvableType eventType) {
-		if (GenericApplicationListener.class.isAssignableFrom(listenerType)
-				|| SmartApplicationListener.class.isAssignableFrom(listenerType)) {
+		if (GenericApplicationListener.class.isAssignableFrom(listenerType) ||
+				SmartApplicationListener.class.isAssignableFrom(listenerType)) {
 			return true;
 		}
 		ResolvableType declaredEventType = GenericApplicationListenerAdapter.resolveDeclaredEventType(listenerType);
diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -79,6 +79,7 @@ public interface ApplicationEventMulticaster {
 	 * based on the {@code event} instance.
 	 * @param event the event to multicast
 	 * @param eventType the type of event (can be null)
+	 * @since 4.2
 	 */
 	void multicastEvent(ApplicationEvent event, ResolvableType eventType);
 
diff --git a/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java b/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -145,7 +145,7 @@ public EventListener inspect(Method method) {
 			if (CollectionUtils.isEmpty(annotatedMethods)) {
 				this.nonAnnotatedClasses.add(targetType);
 				if (logger.isTraceEnabled()) {
-					logger.trace("No @EventListener annotations found on bean class: " + targetType);
+					logger.trace("No @EventListener annotations found on bean class: " + targetType.getName());
 				}
 			}
 			else {
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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,10 +23,10 @@
 import java.lang.annotation.Target;
 
 /**
- * Declares that a field should be formatted as a date time.
+ * Declares that a field or method parameter should be formatted as a date or time.
  *
  * <p>Supports formatting by style pattern, ISO date time pattern, or custom format pattern string.
- * Can be applied to {@code java.util.Date}, {@code java.util.Calendar}, {@code java.long.Long},
+ * Can be applied to {@code java.util.Date}, {@code java.util.Calendar}, {@code java.lang.Long},
  * Joda-Time value types; and as of Spring 4 and JDK 8, to JSR-310 <code>java.time</code> types too.
  *
  * <p>For style-based formatting, set the {@link #style} attribute to be the style pattern code.
@@ -35,7 +35,7 @@
  * A date or time may be omitted by specifying the style character '-'.
  *
  * <p>For ISO-based formatting, set the {@link #iso} attribute to be the desired {@link ISO} format,
- * such as {@link ISO#DATE}. For custom formatting, set the {@link #pattern()} attribute to be the
+ * such as {@link ISO#DATE}. For custom formatting, set the {@link #pattern} attribute to be the
  * DateTime pattern, such as {@code yyyy/MM/dd hh:mm:ss a}.
  *
  * <p>Each attribute is mutually exclusive, so only set one attribute per annotation instance
@@ -64,7 +64,7 @@
 
 	/**
 	 * The ISO pattern to use to format the field.
-	 * The possible ISO patterns are defined in the {@link ISO} enum.
+	 * <p>The possible ISO patterns are defined in the {@link ISO} enum.
 	 * <p>Defaults to {@link ISO#NONE}, indicating this attribute should be ignored.
 	 * Set this attribute when you wish to format your field in accordance with an ISO format.
 	 */
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Declares that a field should be formatted as a number.
+ * Declares that a field or method parameter should be formatted as a number.
  *
  * <p>Supports formatting by style or custom pattern string.
  * Can be applied to any JDK {@code java.lang.Number} type.
@@ -37,7 +37,7 @@
  * When the {@link #pattern} attribute is specified, it takes precedence over
  * the {@link #style} attribute. When no annotation attributes are specified,
  * the default format applied is style-based for either number of currency,
- * depending on the annotated field type.
+ * depending on the annotated field or method parameter type.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
diff --git a/spring-core/src/main/java/org/springframework/asm/package-info.java b/spring-core/src/main/java/org/springframework/asm/package-info.java
@@ -1,15 +1,13 @@
 /**
  * Spring's repackaging of
- * <a href="http://asm.ow2.org">org.objectweb.asm 5.0</a>
+ * <a href="http://asm.ow2.org">ASM</a>
  * (for internal use only).
  *
  * <p>This repackaging technique avoids any potential conflicts with
  * dependencies on ASM at the application level or from third-party
  * libraries and frameworks.
  *
  * <p>As this repackaging happens at the class file level, sources
- * and javadocs are not available here. See the original ObjectWeb
- * <a href="http://asm.ow2.org/asm50/javadoc/user">ASM 5.0 javadocs</a>
- * for details when working with these classes.
+ * and javadocs are not available here.
  */
 package org.springframework.asm;
diff --git a/spring-core/src/main/java/org/springframework/cglib/package-info.java b/spring-core/src/main/java/org/springframework/cglib/package-info.java
@@ -1,15 +1,13 @@
 /**
  * Spring's repackaging of
- * <a href="http://cglib.sourceforge.net">net.sf.cglib 3.2</a>
+ * <a href="http://cglib.sourceforge.net">CGLIB</a>
  * (for internal use only).
  *
  * <p>This repackaging technique avoids any potential conflicts with
  * dependencies on CGLIB at the application level or from third-party
  * libraries and frameworks.
  *
  * <p>As this repackaging happens at the class file level, sources
- * and javadocs are not available here. See the original
- * <a href="http://cglib.sourceforge.net/apidocs">CGLIB 3.2 javadocs</a>
- * for details when working with these classes.
+ * and javadocs are not available here.
  */
 package org.springframework.cglib;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -57,7 +57,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return source;
 		}
 		Collection<?> sourceCollection = (Collection<?>) source;
-		if (sourceCollection.size() == 0) {
+		if (sourceCollection.isEmpty()) {
 			return null;
 		}
 		Object firstElement = sourceCollection.iterator().next();
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -154,7 +154,7 @@ private void assertProtocolAndFilenames(Resource[] resources, String protocol, S
 	private void assertFilenameIn(Resource resource, String... filenames) {
 		String filename = resource.getFilename();
 		assertTrue(resource + " does not have a filename that matches any of the specified names",
-			Arrays.stream(filenames).anyMatch(filename::endsWith));
+				Arrays.stream(filenames).anyMatch(filename::endsWith));
 	}
 
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -168,11 +168,11 @@ public static void splitSqlScript(EncodedResource resource, String script, Strin
 			String blockCommentStartDelimiter, String blockCommentEndDelimiter, List<String> statements)
 			throws ScriptException {
 
-		Assert.hasText(script, "script must not be null or empty");
-		Assert.notNull(separator, "separator must not be null");
-		Assert.hasText(commentPrefix, "commentPrefix must not be null or empty");
-		Assert.hasText(blockCommentStartDelimiter, "blockCommentStartDelimiter must not be null or empty");
-		Assert.hasText(blockCommentEndDelimiter, "blockCommentEndDelimiter must not be null or empty");
+		Assert.hasText(script, "'script' must not be null or empty");
+		Assert.notNull(separator, "'separator' must not be null");
+		Assert.hasText(commentPrefix, "'commentPrefix' must not be null or empty");
+		Assert.hasText(blockCommentStartDelimiter, "'blockCommentStartDelimiter' must not be null or empty");
+		Assert.hasText(blockCommentEndDelimiter, "'blockCommentEndDelimiter' must not be null or empty");
 
 		StringBuilder sb = new StringBuilder();
 		boolean inSingleQuote = false;
@@ -199,7 +199,7 @@ else if (!inSingleQuote && (c == '"')) {
 			}
 			if (!inSingleQuote && !inDoubleQuote) {
 				if (script.startsWith(separator, i)) {
-					// we've reached the end of the current statement
+					// We've reached the end of the current statement
 					if (sb.length() > 0) {
 						statements.add(sb.toString());
 						sb = new StringBuilder();
@@ -208,32 +208,31 @@ else if (!inSingleQuote && (c == '"')) {
 					continue;
 				}
 				else if (script.startsWith(commentPrefix, i)) {
-					// skip over any content from the start of the comment to the EOL
+					// Skip over any content from the start of the comment to the EOL
 					int indexOfNextNewline = script.indexOf("\n", i);
 					if (indexOfNextNewline > i) {
 						i = indexOfNextNewline;
 						continue;
 					}
 					else {
-						// if there's no EOL, we must be at the end
-						// of the script, so stop here.
+						// If there's no EOL, we must be at the end of the script, so stop here.
 						break;
 					}
 				}
 				else if (script.startsWith(blockCommentStartDelimiter, i)) {
-					// skip over any block comments
+					// Skip over any block comments
 					int indexOfCommentEnd = script.indexOf(blockCommentEndDelimiter, i);
 					if (indexOfCommentEnd > i) {
 						i = indexOfCommentEnd + blockCommentEndDelimiter.length() - 1;
 						continue;
 					}
 					else {
-						throw new ScriptParseException(String.format("Missing block comment end delimiter [%s].",
-							blockCommentEndDelimiter), resource);
+						throw new ScriptParseException(
+								"Missing block comment end delimiter: " + blockCommentEndDelimiter, resource);
 					}
 				}
 				else if (c == ' ' || c == '\n' || c == '\t') {
-					// avoid multiple adjacent whitespace characters
+					// Avoid multiple adjacent whitespace characters
 					if (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' ') {
 						c = ' ';
 					}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -395,12 +395,7 @@ protected byte[] generateMultipartBoundary() {
 	 * or a newly built {@link HttpEntity} wrapper for that part
 	 */
 	protected HttpEntity<?> getHttpEntity(Object part) {
-		if (part instanceof HttpEntity) {
-			return (HttpEntity<?>) part;
-		}
-		else {
-			return new HttpEntity<Object>(part);
-		}
+		return (part instanceof HttpEntity ? (HttpEntity<?>) part : new HttpEntity<Object>(part));
 	}
 
 	/**
@@ -415,7 +410,7 @@ protected String getFilename(Object part) {
 		if (part instanceof Resource) {
 			Resource resource = (Resource) part;
 			String filename = resource.getFilename();
-			if (this.multipartCharset != null) {
+			if (filename != null && this.multipartCharset != null) {
 				filename = MimeDelegate.encode(filename, this.multipartCharset.name());
 			}
 			return filename;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/GenericHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/GenericHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -67,14 +67,14 @@ T read(Type type, Class<?> contextClass, HttpInputMessage inputMessage)
 
 	/**
 	 * Indicates whether the given class can be written by this converter.
-	 * This method should perform the same checks than
+	 * <p>This method should perform the same checks than
 	 * {@link HttpMessageConverter#canWrite(Class, MediaType)} with additional ones
 	 * related to the generic type.
-	 * @param type the (potentially generic) type to test for writability, can be
-	 * {@code null} if not specified.
+	 * @param type the (potentially generic) type to test for writability
+	 * (can be {@code null} if not specified)
 	 * @param clazz the source object class to test for writability
-	 * @param mediaType the media type to write, can be {@code null} if not specified.
-	 * Typically the value of an {@code Accept} header.
+	 * @param mediaType the media type to write (can be {@code null} if not specified);
+	 * typically the value of an {@code Accept} header.
 	 * @return {@code true} if writable; {@code false} otherwise
 	 * @since 4.2
 	 */
diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -35,17 +35,17 @@ public interface HttpMessageConverter<T> {
 	/**
 	 * Indicates whether the given class can be read by this converter.
 	 * @param clazz the class to test for readability
-	 * @param mediaType the media type to read, can be {@code null} if not specified.
-	 * Typically the value of a {@code Content-Type} header.
+	 * @param mediaType the media type to read (can be {@code null} if not specified);
+	 * typically the value of a {@code Content-Type} header.
 	 * @return {@code true} if readable; {@code false} otherwise
 	 */
 	boolean canRead(Class<?> clazz, MediaType mediaType);
 
 	/**
 	 * Indicates whether the given class can be written by this converter.
 	 * @param clazz the class to test for writability
-	 * @param mediaType the media type to write, can be {@code null} if not specified.
-	 * Typically the value of an {@code Accept} header.
+	 * @param mediaType the media type to write (can be {@code null} if not specified);
+	 * typically the value of an {@code Accept} header.
 	 * @return {@code true} if writable; {@code false} otherwise
 	 */
 	boolean canWrite(Class<?> clazz, MediaType mediaType);
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/GsonFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/GsonFactoryBean.java
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ def customizePom(pom, gradleProject) {`
`29`	`29`	`}`
`30`	`30`	`licenses {`
`31`	`31`	`license {`
`32`		`- name "The Apache Software License, Version 2.0"`
`33`		`- url "http://www.apache.org/licenses/LICENSE-2.0.txt"`
	`32`	`+ name "Apache License, Version 2.0"`
	`33`	`+ url "http://www.apache.org/licenses/LICENSE-2.0"`
`34`	`34`	`distribution "repo"`
`35`	`35`	`}`
`36`	`36`	`}`
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-2017 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.`
`@@ -39,10 +39,11 @@ public class CacheNamespaceHandler extends NamespaceHandlerSupport {`
`39`	`39`
`40`	`40`	`static final String DEFAULT_CACHE_MANAGER_BEAN_NAME = "cacheManager";`
`41`	`41`
	`42`	`+`
`42`	`43`	`static String extractCacheManager(Element element) {`
`43`		`- return (element.hasAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE) ? element`
`44`		`- .getAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE)`
`45`		`- : CacheNamespaceHandler.DEFAULT_CACHE_MANAGER_BEAN_NAME);`
	`44`	`+ return (element.hasAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE) ?`
	`45`	`+ element.getAttribute(CacheNamespaceHandler.CACHE_MANAGER_ATTRIBUTE) :`
	`46`	`+ CacheNamespaceHandler.DEFAULT_CACHE_MANAGER_BEAN_NAME);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`static BeanDefinition parseKeyGenerator(Element element, BeanDefinition def) {`
`@@ -53,9 +54,11 @@ static BeanDefinition parseKeyGenerator(Element element, BeanDefinition def) {`
`53`	`54`	`return def;`
`54`	`55`	`}`
`55`	`56`
	`57`	`+`
`56`	`58`	`@Override`
`57`	`59`	`public void init() {`
`58`	`60`	`registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenCacheBeanDefinitionParser());`
`59`	`61`	`registerBeanDefinitionParser("advice", new CacheAdviceParser());`
`60`	`62`	`}`
	`63`	`+`
`61`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2016 the original author or authors.`
	`2`	`+ * Copyright 2002-2017 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.`
`@@ -145,7 +145,7 @@ public EventListener inspect(Method method) {`
`145`	`145`	`if (CollectionUtils.isEmpty(annotatedMethods)) {`
`146`	`146`	`this.nonAnnotatedClasses.add(targetType);`
`147`	`147`	`if (logger.isTraceEnabled()) {`
`148`		`- logger.trace("No @EventListener annotations found on bean class: " + targetType);`
	`148`	`+ logger.trace("No @EventListener annotations found on bean class: " + targetType.getName());`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`else {`