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

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-08-01 08:48:09 +02:00
parent 8367c57d96 9de3d33e65
commit 143e4f026f
8 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java
View File

@@ -115,8 +115,10 @@ class PropertyMappingContextCustomizer implements ContextCustomizer {
private String getAnnotationsDescription(Set<Class<?>> annotations) {
StringBuilder result = new StringBuilder();
for (Class<?> annotation : annotations) {
result.append((result.length() != 0) ? ", " : "");
result.append("@" + ClassUtils.getShortName(annotation));
if (result.length() != 0) {
result.append(", ");
}
result.append('@').append(ClassUtils.getShortName(annotation));
}
result.insert(0, (annotations.size() != 1) ? "annotations " : "annotation ");
return result.toString();