Polishing

jhoeller · jhoeller · commit 106a7570981b · 2019-02-12T09:07:58.000+01:00
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -363,7 +363,7 @@ private void assertNotException(String attributeName, Object attributeValue) {
 	private void assertAttributeType(String attributeName, Object attributeValue, Class<?> expectedType) {
 		if (!expectedType.isInstance(attributeValue)) {
 			throw new IllegalArgumentException(String.format(
-					"Attribute '%s' is of type [%s], but [%s] was expected in attributes for annotation [%s]",
+					"Attribute '%s' is of type %s, but %s was expected in attributes for annotation [%s]",
 					attributeName, attributeValue.getClass().getSimpleName(), expectedType.getSimpleName(),
 					this.displayName));
 		}
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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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,6 +28,7 @@
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.ObjectUtils;
 
@@ -124,7 +125,7 @@ public static AnnotationAttributes getMergedAnnotationAttributes(
 
 		// Get the unmerged list of attributes for the target annotation.
 		List<AnnotationAttributes> attributesList = attributesMap.get(annotationName);
-		if (attributesList == null || attributesList.isEmpty()) {
+		if (CollectionUtils.isEmpty(attributesList)) {
 			return null;
 		}
 
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 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 @@ public void getEnumWithUnknownAttributeName() {
 	public void getEnumWithTypeMismatch() {
 		attributes.put("color", "RED");
 		exception.expect(IllegalArgumentException.class);
-		exception.expectMessage(containsString("Attribute 'color' is of type [String], but [Enum] was expected"));
+		exception.expectMessage(containsString("Attribute 'color' is of type String, but Enum was expected"));
 		attributes.getEnum("color");
 	}
 
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/test-data-with-multi-line-nested-comments.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/test-data-with-multi-line-nested-comments.sql
@@ -11,7 +11,7 @@ INSERT INTO users(first_name, last_name) VALUES('Juergen', 'Hoeller');
 -- A fancy multi-line comments that puts
 -- single line comments inside of a multi-line
 -- comment block.
-Moreover, the block commend end delimiter
+Moreover, the block comment end delimiter
 appears on a line that can potentially also
 be a single-line comment if we weren't
 already inside a multi-line comment run.

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-2019 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.`
`@@ -154,7 +154,7 @@ public void getEnumWithUnknownAttributeName() {`
`154`	`154`	`public void getEnumWithTypeMismatch() {`
`155`	`155`	`attributes.put("color", "RED");`
`156`	`156`	`exception.expect(IllegalArgumentException.class);`
`157`		`- exception.expectMessage(containsString("Attribute 'color' is of type [String], but [Enum] was expected"));`
	`157`	`+ exception.expectMessage(containsString("Attribute 'color' is of type String, but Enum was expected"));`
`158`	`158`	`attributes.getEnum("color");`
`159`	`159`	`}`
`160`	`160`