From d0128071ec89df33c361a6788f7a7213143368ee Mon Sep 17 00:00:00 2001
From: Dmytro Danilenkov <milgoff@gmail.com>
Date: Thu, 10 Apr 2025 14:39:54 +0200
Subject: [PATCH] Add missing attributes to ServletRegistration annotation

See gh-45007

Signed-off-by: Dmytro Danilenkov <milgoff@gmail.com>
---
 .../ServletContextInitializerBeans.java       |  5 +++
 .../boot/web/servlet/ServletRegistration.java | 15 +++++++
 .../ServletContextInitializerBeansTests.java  | 40 +++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
index 84642aff41c..195a707cd05 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
@@ -65,6 +65,7 @@ import org.springframework.util.StringUtils;
  * @author Brian Clozel
  * @author Moritz Halbritter
  * @author Daeho Kwon
+ * @author Dmytro Danilenkov
  * @since 1.4.0
  */
 public class ServletContextInitializerBeans extends AbstractCollection<ServletContextInitializer> {
@@ -320,6 +321,10 @@ public class ServletContextInitializerBeans extends AbstractCollection<ServletCo
 			bean.setIgnoreRegistrationFailure(registration.ignoreRegistrationFailure());
 			bean.setLoadOnStartup(registration.loadOnStartup());
 			bean.setUrlMappings(Arrays.asList(registration.urlMappings()));
+			for (WebInitParam param : registration.initParameters()) {
+				bean.addInitParameter(param.name(), param.value());
+			}
+			bean.setMultipartConfig(new MultipartConfigElement(registration.multipartConfig()));
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistration.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistration.java
index e515747295f..e054a8b9e36 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistration.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistration.java
@@ -23,6 +23,8 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import jakarta.servlet.Servlet;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.annotation.WebInitParam;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AliasFor;
@@ -33,6 +35,7 @@ import org.springframework.core.annotation.Order;
  * annotation-based alternative to {@link ServletRegistrationBean}.
  *
  * @author Moritz Halbritter
+ * @author Dmytro Danilenkov
  * @since 3.5.0
  * @see ServletRegistrationBean
  */
@@ -87,4 +90,16 @@ public @interface ServletRegistration {
 	 */
 	int loadOnStartup() default -1;
 
+	/**
+	 * Init parameters to set on the servlet (mirrors {@code @WebInitParam} usage).
+	 * @return array of {@link WebInitParam}
+	 */
+	WebInitParam[] initParameters() default {};
+
+	/**
+	 * Multipart configuration.
+	 * @return multipart config {@link MultipartConfig}
+	 */
+	MultipartConfig multipartConfig() default @MultipartConfig;
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java
index 00186098e89..c0e5a5e87ea 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java
@@ -27,6 +27,7 @@ import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.MultipartConfig;
 import jakarta.servlet.annotation.WebInitParam;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
@@ -51,6 +52,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Andy Wilkinson
  * @author Moritz Halbritter
  * @author Daeho Kwon
+ * @author Dmytro Danilenkov
  */
 class ServletContextInitializerBeansTests {
 
@@ -207,6 +209,29 @@ class ServletContextInitializerBeansTests {
 					.isEqualTo(ServletConfigurationWithAnnotationAndOrder.ORDER));
 	}
 
+	@Test
+	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);
+		});
+
+	}
+
+	private void assertThatSingleServletRegistration(ServletContextInitializerBeans initializerBeans,
+			ThrowingConsumer<ServletRegistrationBean<?>> code) {
+		assertThatSingleRegistration(initializerBeans, ServletRegistrationBean.class, code::acceptThrows);
+	}
+
 	private void load(Class<?>... configuration) {
 		this.context = new AnnotationConfigApplicationContext(configuration);
 	}
@@ -454,4 +479,19 @@ class ServletContextInitializerBeansTests {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class ServletConfigurationWithExtendedAttributes {
+
+		@Bean
+		@ServletRegistration(name = "extended", urlMappings = "/extended/*",
+				initParameters = { @WebInitParam(name = "hello", value = "world"),
+						@WebInitParam(name = "flag", value = "true") },
+				multipartConfig = @MultipartConfig(location = "/tmp", maxFileSize = 1024, maxRequestSize = 4096,
+						fileSizeThreshold = 128))
+		TestServlet testServletWithInitParametersAndMultipart() {
+			return new TestServlet();
+		}
+
+	}
+
 }