Avoid use of Stream API in ControllerAdviceBean

sbrannen · sbrannen · commit 2759b4b909ab · 2019-06-21T13:49:49.000+03:00
diff --git a/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java b/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.method;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryUtils;
@@ -42,6 +41,7 @@
  * @author Rossen Stoyanchev
  * @author Brian Clozel
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.2
  */
 public class ControllerAdviceBean implements Ordered {
@@ -186,10 +186,13 @@ public String toString() {
 	 * instances.
 	 */
 	public static List<ControllerAdviceBean> findAnnotatedBeans(ApplicationContext context) {
-		return Arrays.stream(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context, Object.class))
-				.filter(name -> context.findAnnotationOnBean(name, ControllerAdvice.class) != null)
-				.map(name -> new ControllerAdviceBean(name, context))
-				.collect(Collectors.toList());
+		List<ControllerAdviceBean> adviceBeans = new ArrayList<>();
+		for (String name : BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context, Object.class)) {
+			if (context.findAnnotationOnBean(name, ControllerAdvice.class) != null) {
+				adviceBeans.add(new ControllerAdviceBean(name, context));
+			}
+		}
+		return adviceBeans;
 	}
 
 	private static int initOrderFromBean(Object bean) {
