Make AnnotationUtils Java 6 source compatible

sbrannen · sbrannen · commit acc8c895bfc4 · 2015-08-31T15:54:46.000+02:00
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
@@ -1514,7 +1514,7 @@ static List<String> getAttributeAliasNames(Method attribute) {
 		Assert.notNull(attribute, "attribute must not be null");
 
 		AliasDescriptor descriptor = AliasDescriptor.from(attribute);
-		return (descriptor == null ? Collections.emptyList() : descriptor.getAttributeAliasNames());
+		return (descriptor == null ? Collections.<String> emptyList() : descriptor.getAttributeAliasNames());
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1514,7 +1514,7 @@ static List<String> getAttributeAliasNames(Method attribute) {`
`1514`	`1514`	`Assert.notNull(attribute, "attribute must not be null");`
`1515`	`1515`
`1516`	`1516`	`AliasDescriptor descriptor = AliasDescriptor.from(attribute);`
`1517`		`- return (descriptor == null ? Collections.emptyList() : descriptor.getAttributeAliasNames());`
	`1517`	`+ return (descriptor == null ? Collections.<String> emptyList() : descriptor.getAttributeAliasNames());`
`1518`	`1518`	`}`
`1519`	`1519`
`1520`	`1520`	`/**`