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/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java

@@ -35,9 +35,7 @@
 import jakarta.servlet.Filter;
 import jakarta.servlet.MultipartConfigElement;
 import jakarta.servlet.Servlet;
-import jakarta.servlet.annotation.MultipartConfig;
 import jakarta.servlet.annotation.WebInitParam;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -96,9 +94,9 @@ public ServletContextInitializerBeans(ListableBeanFactory beanFactory,
 		addServletContextInitializerBeans(beanFactory);
 		addAdaptableBeans(beanFactory);
 		this.sortedList = this.initializers.values()
-			.stream()
-			.flatMap((value) -> value.stream().sorted(AnnotationAwareOrderComparator.INSTANCE))
-			.toList();
+				.stream()
+				.flatMap((value) -> value.stream().sorted(AnnotationAwareOrderComparator.INSTANCE))
+				.toList();
 		logMappings(this.initializers);
 	}
 
@@ -327,9 +325,7 @@ private void configureFromAnnotation(ServletRegistrationBean<Servlet> bean, Serv
 				bean.addInitParameter(param.name(), param.value());
 			}
 
-			MultipartConfig multipart = registration.multipartConfig();
-			bean.setMultipartConfig(new MultipartConfigElement(multipart.location(), multipart.maxFileSize(),
-					multipart.maxRequestSize(), multipart.fileSizeThreshold()));
+			bean.setMultipartConfig(new MultipartConfigElement(registration.multipartConfig()));
 
 		}
 

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

@@ -98,6 +98,7 @@
 
 	/**
 	 * Multipart configuration.
+	 * @return multipart config {@link MultipartConfig}
 	 */
 	MultipartConfig multipartConfig() default @MultipartConfig;
 

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

@@ -203,19 +203,22 @@ void shouldApplyExtendedServletRegistrationAnnotation() {
 		load(ServletConfigurationWithExtendedAttributes.class);
 		ServletContextInitializerBeans initializerBeans = new ServletContextInitializerBeans(
 				this.context.getBeanFactory(), TestServletContextInitializer.class);
+		assertThatSingleServletRegistration(initializerBeans, (bean) -> {
+			assertThat(bean.getServletName()).isEqualTo("extended");
+			assertThat(bean.getUrlMappings()).containsExactly("/extended/*");
+			assertThat(bean.getInitParameters()).containsEntry("hello", "world").containsEntry("flag", "true");
+			assertThat(bean.getMultipartConfig()).isNotNull();
+			assertThat(bean.getMultipartConfig().getLocation()).isEqualTo("/tmp");
+			assertThat(bean.getMultipartConfig().getMaxFileSize()).isEqualTo(1024);
+			assertThat(bean.getMultipartConfig().getMaxRequestSize()).isEqualTo(4096);
+			assertThat(bean.getMultipartConfig().getFileSizeThreshold()).isEqualTo(128);
+		});
 
-		ServletRegistrationBean<?> bean = findServletRegistrationBeanByName(initializerBeans, "extended");
-
-		assertThat(bean.getServletName()).isEqualTo("extended");
-		assertThat(bean.getUrlMappings()).containsExactly("/extended/*");
-
-		assertThat(bean.getInitParameters()).containsEntry("hello", "world").containsEntry("flag", "true");
+	}
 
-		assertThat(bean.getMultipartConfig()).isNotNull();
-		assertThat(bean.getMultipartConfig().getLocation()).isEqualTo("/tmp");
-		assertThat(bean.getMultipartConfig().getMaxFileSize()).isEqualTo(1024);
-		assertThat(bean.getMultipartConfig().getMaxRequestSize()).isEqualTo(4096);
-		assertThat(bean.getMultipartConfig().getFileSizeThreshold()).isEqualTo(128);
+	private void assertThatSingleServletRegistration(ServletContextInitializerBeans initializerBeans,
+			ThrowingConsumer<ServletRegistrationBean<?>> code) {
+		assertThatSingleRegistration(initializerBeans, ServletRegistrationBean.class, code::acceptThrows);
 	}
 
 	private void load(Class<?>... configuration) {
@@ -452,14 +455,4 @@ TestServlet testServletWithInitParametersAndMultipart() {
 
 	}
 
-	private ServletRegistrationBean<?> findServletRegistrationBeanByName(
-			ServletContextInitializerBeans initializerBeans, String name) {
-		return initializerBeans.stream()
-			.filter(ServletRegistrationBean.class::isInstance)
-			.map(ServletRegistrationBean.class::cast)
-			.filter((r) -> name.equals(r.getServletName()))
-			.findFirst()
-			.orElse(null);
-	}
-
 }