Avoid mutation of org.springdoc.core.properties.AbstractSwaggerUiConfigProperties.urls and replace it with mutation of org.springdoc.core.properties.AbstractSwaggerUiConfigProperties.SwaggerUrl.url when necessary. Enhance SpringDocApp8MultipleUrlsSeveralParallelRequestsTest by specifying custom servlet path to check no exception is thrown.

Author: dgswan

springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerWelcome.java

@@ -142,9 +142,10 @@ else if (swaggerUiConfigParameters.isValidUrl(swaggerUiUrl))
 						.forEach(swaggerUrl -> {
 							final var url = buildUrlWithContextPath(swaggerUrl.getUrl());
 							if (!Objects.equals(url, swaggerUrl.getUrl())) {
-								swaggerUiConfigParameters.getUrls().remove(swaggerUrl);
-								swaggerUrl.setUrl(url);
-								swaggerUiConfigParameters.getUrls().add(swaggerUrl);
+								swaggerUiConfigParameters.getUrls()
+										.stream()
+										.filter(swaggerUrl::equals)
+										.forEach(subUrl -> subUrl.setUrl(url));
 							}
 						});
 			}

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app8/SpringDocApp8MultipleUrlsSeveralParallelRequestsTest.java

@@ -41,6 +41,7 @@
  * @author Dmitry Lebedko (lebedko.dmitrii@gmail.com)
  */
 @TestPropertySource(properties = {
+		"spring.mvc.servlet.path=/servlet-path",
 		"springdoc.swagger-ui.urls[0].name=first-user-list",
 		"springdoc.swagger-ui.urls[0].url=/api-docs.yaml",
 		"springdoc.swagger-ui.urls[1].name=second-user-list",
@@ -63,14 +64,14 @@ public void swagger_config_for_multiple_groups_and_many_parallel_requests() {
 						try {
 							mockMvc.perform(get("/v3/api-docs/swagger-config"))
 									.andExpect(status().isOk())
-									.andExpect(jsonPath("configUrl", equalTo("/v3/api-docs/swagger-config")))
+									.andExpect(jsonPath("configUrl", equalTo("/servlet-path/v3/api-docs/swagger-config")))
 										.andExpect(jsonPath("url").doesNotExist())
 									.andExpect(jsonPath("urls.length()", equalTo(3)))
-									.andExpect(jsonPath("urls[0].url", equalTo("/api-docs.yaml")))
+									.andExpect(jsonPath("urls[0].url", equalTo("/servlet-path/api-docs.yaml")))
 									.andExpect(jsonPath("urls[0].name", equalTo("first-user-list")))
-									.andExpect(jsonPath("urls[1].url", equalTo("/api-docs.yaml")))
+									.andExpect(jsonPath("urls[1].url", equalTo("/servlet-path/api-docs.yaml")))
 									.andExpect(jsonPath("urls[1].name", equalTo("second-user-list")))
-									.andExpect(jsonPath("urls[2].url", equalTo("/api-docs.yaml")))
+									.andExpect(jsonPath("urls[2].url", equalTo("/servlet-path/api-docs.yaml")))
 									.andExpect(jsonPath("urls[2].name", equalTo("third-user-list")));
 						} catch (Exception e) {
 							throw new RuntimeException(e);