Fix for issue #45001 - ServletRegistrationBean has those properties, but @ServletRegistration hasn't: initParameters, servletRegistrationBeans, multipartConfig Signed-off-by: Dmytro Danilenkov <[email protected]>

Signed-off-by: Dmytro Danilenkov <[email protected]>

Author: dmytrodanilenkov

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

@@ -181,29 +181,19 @@ void shouldApplyOrderFromOrderAttribute() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void shouldApplyExtendedServletRegistrationAnnotation() {
 		load(ServletConfigurationWithExtendedAttributes.class);
-		// Grab all initializers in the context, including beans that are adapted from @ServletRegistration
 		ServletContextInitializerBeans initializerBeans = new ServletContextInitializerBeans(
 				this.context.getBeanFactory(), TestServletContextInitializer.class);
 
-		// We expect two registrations in this config: 'testServletWithInitParametersAndMultipart'
-		// and 'testServletWithExtraBean'. So let's filter them individually or pick the one we want to assert.
-
-		// 1) Check the one with initParameters + multipartConfig
 		ServletRegistrationBean<?> bean = findServletRegistrationBeanByName(initializerBeans, "extended");
-		assertThat(bean).as("extended servlet registration bean").isNotNull();
 
-		// Verify that the standard attributes were applied
 		assertThat(bean.getServletName()).isEqualTo("extended");
 		assertThat(bean.getUrlMappings()).containsExactly("/extended/*");
 
-		// Verify our new initParameters
 		assertThat(bean.getInitParameters()).containsEntry("hello", "world")
 				.containsEntry("flag", "true");
 
-		// Verify multi-part config
 		assertThat(bean.getMultipartConfig()).isNotNull();
 		assertThat(bean.getMultipartConfig().getLocation()).isEqualTo("/tmp");
 		assertThat(bean.getMultipartConfig().getMaxFileSize()).isEqualTo(1024);
@@ -212,28 +202,20 @@ void shouldApplyExtendedServletRegistrationAnnotation() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void shouldApplyServletRegistrationAnnotationWithExtraRegistrationBeans() {
 		load(ServletConfigurationWithExtendedAttributes.class);
 		ServletContextInitializerBeans initializerBeans = new ServletContextInitializerBeans(
 				this.context.getBeanFactory(), TestServletContextInitializer.class);
 
-		// 2) Check the one referencing 'servletRegistrationBeans'
 		ServletRegistrationBean<?> bean = findServletRegistrationBeanByName(initializerBeans, "extendedWithExtraBeans");
 		assertThat(bean).as("extendedWithExtraBeans registration bean").isNotNull();
 
-		// Confirm standard attributes
 		assertThat(bean.getServletName()).isEqualTo("extendedWithExtraBeans");
 		assertThat(bean.getUrlMappings()).containsExactly("/extra/*");
 
-		// Confirm that the extra init param from MyExtraServletRegistrationBean was merged
 		assertThat(bean.getInitParameters()).containsEntry("extra", "fromExtraBean");
 	}
 
-	/**
-	 * Simple helper method to locate a specific ServletRegistrationBean by its name
-	 * from the given ServletContextInitializerBeans collection.
-	 */
 	@SuppressWarnings("rawtypes")
 	private ServletRegistrationBean findServletRegistrationBeanByName(
 			ServletContextInitializerBeans initializerBeans, String servletName) {