Merge branch '2.7.x'

2022-03-25 12:06:16 +00:00
parent a59f60c614 64888b0deb
commit 3de024594f
3 changed files with 13 additions and 4 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java
@@ -27,8 +27,6 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;

-import org.jetbrains.annotations.NotNull;
-
 import org.springframework.core.io.UrlResource;
 import org.springframework.util.Assert;

@@ -54,7 +52,6 @@ public final class ImportCandidates implements Iterable<String> {
 		this.candidates = Collections.unmodifiableList(candidates);
 	}

-	@NotNull
 	@Override
 	public Iterator<String> iterator() {
 		return this.candidates.iterator();