@@ -88,10 +88,21 @@ public ServletContextInitializer contextInitializer() {
88
88
public ServletRegistrationBean <SpringServlet > servletRegistrationBean (
89
89
ObjectProvider <MultipartConfigElement > multipartConfig ,
90
90
VaadinConfigurationProperties configurationProperties ) {
91
+ boolean rootMapping = RootMappedCondition
92
+ .isRootMapping (configurationProperties .getUrlMapping ());
93
+ return configureServletRegistrationBean (multipartConfig ,
94
+ configurationProperties ,
95
+ new SpringServlet (context , rootMapping ));
96
+ }
97
+
98
+ public static ServletRegistrationBean <SpringServlet > configureServletRegistrationBean (
99
+ ObjectProvider <MultipartConfigElement > multipartConfig ,
100
+ VaadinConfigurationProperties configurationProperties ,
101
+ SpringServlet servletInstance ) {
102
+
91
103
String mapping = configurationProperties .getUrlMapping ();
92
- Map <String , String > initParameters = new HashMap <>();
93
104
boolean rootMapping = RootMappedCondition .isRootMapping (mapping );
94
-
105
+ Map < String , String > initParameters = new HashMap <>();
95
106
if (rootMapping ) {
96
107
mapping = VaadinServletConfiguration .VAADIN_SERVLET_MAPPING ;
97
108
initParameters .put (
@@ -105,7 +116,7 @@ public ServletRegistrationBean<SpringServlet> servletRegistrationBean(
105
116
initParameters .put (ApplicationConfig .JSR356_MAPPING_PATH , pushUrl );
106
117
107
118
ServletRegistrationBean <SpringServlet > registration = new ServletRegistrationBean <>(
108
- new SpringServlet ( context , rootMapping ) , mapping );
119
+ servletInstance , mapping );
109
120
registration .setInitParameters (initParameters );
110
121
registration
111
122
.setAsyncSupported (configurationProperties .isAsyncSupported ());
0 commit comments