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

Merge branch '2.5.x' into 2.6.x

Browse Source 
Closes gh-30850
This commit is contained in:
Andy Wilkinson
2022-05-03 15:06:04 +01:00
parent b20a8bd778 111dfd8911
commit fa327a783d
50 changed files with 106 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@@ -213,7 +213,7 @@ public final class Metadata {
.filter((item) -> item.isOfItemType(this.itemType) && name.equals(item.getName()))
.collect(Collectors.toList());
if (candidates.size() > 1) {
throw new IllegalStateException("More that one metadata item with name '" + name + "': " + candidates);
throw new IllegalStateException("More than one metadata item with name '" + name + "': " + candidates);
}
return (candidates.size() == 1) ? candidates.get(0) : null;
}