feat: enable easier override for SpringServlet (#20276) (#20298)

Fixes #19994 Co-authored-by: Teppo Kurki <teppo.kurki@vaadin.com>
vaadin · Oct 22, 2024 · a840fcc · a840fcc
1 parent cc752d4
commit a840fcc
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringBootAutoConfiguration.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringBootAutoConfiguration.java
@@ -88,10 +88,21 @@ public ServletContextInitializer contextInitializer() {
     public ServletRegistrationBean<SpringServlet> servletRegistrationBean(
             ObjectProvider<MultipartConfigElement> multipartConfig,
             VaadinConfigurationProperties configurationProperties) {
+        boolean rootMapping = RootMappedCondition
+                .isRootMapping(configurationProperties.getUrlMapping());
+        return configureServletRegistrationBean(multipartConfig,
+                configurationProperties,
+                new SpringServlet(context, rootMapping));
+    }
+
+    public static ServletRegistrationBean<SpringServlet> configureServletRegistrationBean(
+            ObjectProvider<MultipartConfigElement> multipartConfig,
+            VaadinConfigurationProperties configurationProperties,
+            SpringServlet servletInstance) {
+
         String mapping = configurationProperties.getUrlMapping();
-        Map<String, String> initParameters = new HashMap<>();
         boolean rootMapping = RootMappedCondition.isRootMapping(mapping);
-
+        Map<String, String> initParameters = new HashMap<>();
         if (rootMapping) {
             mapping = VaadinServletConfiguration.VAADIN_SERVLET_MAPPING;
             initParameters.put(
@@ -105,7 +116,7 @@ public ServletRegistrationBean<SpringServlet> servletRegistrationBean(
         initParameters.put(ApplicationConfig.JSR356_MAPPING_PATH, pushUrl);
 
         ServletRegistrationBean<SpringServlet> registration = new ServletRegistrationBean<>(
-                new SpringServlet(context, rootMapping), mapping);
+                servletInstance, mapping);
         registration.setInitParameters(initParameters);
         registration
                 .setAsyncSupported(configurationProperties.isAsyncSupported());