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

@@ -323,21 +323,13 @@ private void configureFromAnnotation(ServletRegistrationBean<Servlet> bean, Serv
 			bean.setLoadOnStartup(registration.loadOnStartup());
 			bean.setUrlMappings(Arrays.asList(registration.urlMappings()));
 
-			if (registration.initParameters().length > 0) {
-				Map<String, String> initParams = new LinkedHashMap<>();
-				for (WebInitParam param : registration.initParameters()) {
-					initParams.put(param.name(), param.value());
-				}
-				bean.setInitParameters(initParams);
+			for (WebInitParam param : registration.initParameters()) {
+				bean.addInitParameter(param.name(), param.value());
 			}
 
 			MultipartConfig multipart = registration.multipartConfig();
-			boolean isMultipartConfigUsed = !(multipart.location().isEmpty() && multipart.maxFileSize() == -1L
-					&& multipart.maxRequestSize() == -1L && multipart.fileSizeThreshold() == 0);
-			if (isMultipartConfigUsed) {
-				bean.setMultipartConfig(new MultipartConfigElement(multipart.location(), multipart.maxFileSize(),
-						multipart.maxRequestSize(), multipart.fileSizeThreshold()));
-			}
+			bean.setMultipartConfig(new MultipartConfigElement(multipart.location(), multipart.maxFileSize(),
+					multipart.maxRequestSize(), multipart.fileSizeThreshold()));
 
 		}