Polish

Signed-off-by: Daeho Kwon <[email protected]>

Author: kwondh5217

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java

@@ -374,17 +374,13 @@ private void configureFromAnnotation(FilterRegistrationBean<Filter> bean, Filter
 				bean.addInitParameter(param.name(), param.value());
 			}
 
-			@SuppressWarnings("unchecked")
-			Map<String, ServletRegistrationBean<?>> servletRegistrationBeans = (Map<String, ServletRegistrationBean<?>>) (Map<?, ?>) this.beanFactory
-				.getBeansOfType(ServletRegistrationBean.class);
-
-			for (Class<?> servletClass : registration.servletRegistrationBeans()) {
-				for (ServletRegistrationBean<?> registrationBean : servletRegistrationBeans.values()) {
-					if (servletClass.isInstance(registrationBean.getServlet())) {
-						bean.addServletRegistrationBeans(registrationBean);
+			this.beanFactory.getBeanProvider(ServletRegistrationBean.class).forEach((servletRegistrationBean) -> {
+				for (Class<?> servletClass : registration.servletRegistrationBeans()) {
+					if (servletClass.isInstance(servletRegistrationBean.getServlet())) {
+						bean.addServletRegistrationBeans(servletRegistrationBean);
 					}
 				}
-			}
+			});
 		}
 
 	}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.web.servlet;
 
+import java.util.Collection;
+
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
@@ -140,6 +142,10 @@ void shouldApplyFilterRegistrationAnnotation() {
 			assertThat(filterRegistrationBean.getUrlPatterns()).containsExactly("/test/*");
 			assertThat(filterRegistrationBean.getInitParameters()).containsEntry("env", "test")
 				.containsEntry("debug", "true");
+			Collection<ServletRegistrationBean<?>> servletRegistrationBeans = filterRegistrationBean.getServletRegistrationBeans();
+			assertThat(servletRegistrationBeans).hasSize(1);
+			assertThat(servletRegistrationBeans.iterator().next().getServletName())
+					.isEqualTo("testServletRegistrationBean");
 
 		});
 	}
@@ -184,25 +190,6 @@ void shouldApplyOrderFromOrderAttribute() {
 					.isEqualTo(ServletConfigurationWithAnnotationAndOrder.ORDER));
 	}
 
-	@Test
-	void shouldApplyServletRegistrationBeansInFilterRegistration() {
-		load(FilterWithServletRegistrationBeansConfiguration.class);
-
-		ServletContextInitializerBeans initializerBeans = new ServletContextInitializerBeans(
-				this.context.getBeanFactory(), TestServletContextInitializer.class);
-
-		FilterRegistrationBean<?> frb = initializerBeans.stream()
-			.filter(FilterRegistrationBean.class::isInstance)
-			.map(FilterRegistrationBean.class::cast)
-			.filter((f) -> "testFilter".equals(f.getFilterName()))
-			.findFirst()
-			.orElseThrow();
-
-		assertThat(frb.getServletRegistrationBeans()).hasSize(1);
-		assertThat(frb.getServletRegistrationBeans().iterator().next().getServletName())
-			.isEqualTo("testServletRegistrationBean");
-	}
-
 	private void load(Class<?>... configuration) {
 		this.context = new AnnotationConfigApplicationContext(configuration);
 	}
@@ -305,25 +292,14 @@ static class FilterConfigurationWithAnnotation {
 		@FilterRegistration(enabled = false, name = "test", asyncSupported = false,
 				dispatcherTypes = DispatcherType.ERROR, matchAfter = true, servletNames = "test",
 				urlPatterns = "/test/*", initParameters = { @WebInitParam(name = "env", value = "test"),
-						@WebInitParam(name = "debug", value = "true") })
+				@WebInitParam(name = "debug", value = "true") }, servletRegistrationBeans = { TestServlet.class })
 		TestFilter testFilter() {
 			return new TestFilter();
 		}
 
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	static class FilterWithServletRegistrationBeansConfiguration {
-
 		@Bean
 		ServletRegistrationBean<TestServlet> testServletRegistrationBean() {
-			return new ServletRegistrationBean<>(new TestServlet(), "/test");
-		}
-
-		@Bean
-		@FilterRegistration(name = "testFilter", servletRegistrationBeans = TestServlet.class)
-		TestFilter testFilter() {
-			return new TestFilter();
+			return new ServletRegistrationBean<>(new TestServlet());
 		}
 
 	}