Unexpected path behaviour when using management port (actuator). Fixes #1603.

bnasslahsen · bnasslahsen · commit 3623b6e7ee9b · 2022-04-21T19:17:07.000+02:00
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/Constants.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/Constants.java
@@ -359,7 +359,7 @@ public final class Constants {
 	/**
 	 * The constant DEFAULT_SWAGGER_UI_ACTUATOR_PATH.
 	 */
-	public static final String DEFAULT_SWAGGER_UI_ACTUATOR_PATH = "swaggerui";
+	public static final String DEFAULT_SWAGGER_UI_ACTUATOR_PATH = "swagger-ui";
 
 	/**
 	 * The constant DEFAULT_API_DOCS_ACTUATOR_URL.
diff --git a/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java b/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java
@@ -48,13 +48,13 @@ void testIndex() throws Exception {
 
 	@Test
 	public void testIndexActuator() {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui", String.class);
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui/swagger-config", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui/swagger-config", String.class);
 		String expected = getContent("results/app13-1.json");
 		assertEquals(expected, contentAsString, true);
 	}
diff --git a/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java b/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java
@@ -48,13 +48,13 @@ void testIndex() throws Exception {
 
 	@Test
 	public void testIndexActuator() {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui", String.class);
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui/swagger-config", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui/swagger-config", String.class);
 		String expected = getContent("results/app14-1.json");
 		assertEquals(expected, contentAsString, true);
 	}
diff --git a/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java b/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java
@@ -51,13 +51,13 @@ void testIndex() throws Exception {
 
 	@Test
 	public void testIndexActuator() {
-		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui", String.class);
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui/swagger-config", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui/swagger-config", String.class);
 		String expected = getContent("results/app15-1.json");
 		assertEquals(expected, contentAsString, true);
 	}
diff --git a/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java b/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java
@@ -51,13 +51,13 @@ void testIndex() throws Exception {
 
 	@Test
 	public void testIndexActuator() {
-		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui", String.class);
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui/swagger-config", String.class);
+		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui/swagger-config", String.class);
 		String expected = getContent("results/app16-1.json");
 		assertEquals(expected, contentAsString, true);
 	}
diff --git a/springdoc-openapi-ui/src/test/resources/results/app13-1.json b/springdoc-openapi-ui/src/test/resources/results/app13-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/application/swaggerui/swagger-config",
+  "configUrl": "/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9092/application/swagger-ui/oauth2-redirect.html",
   "url": "/application/openapi",
   "validatorUrl": ""
diff --git a/springdoc-openapi-ui/src/test/resources/results/app14-1.json b/springdoc-openapi-ui/src/test/resources/results/app14-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/application/swaggerui/swagger-config",
+  "configUrl": "/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9093/application/swagger-ui/oauth2-redirect.html",
   "urls": [
     {
diff --git a/springdoc-openapi-ui/src/test/resources/results/app15-1.json b/springdoc-openapi-ui/src/test/resources/results/app15-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/test/application/swaggerui/swagger-config",
+  "configUrl": "/test/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9094/test/application/swagger-ui/oauth2-redirect.html",
   "url": "/test/application/openapi",
   "validatorUrl": ""
diff --git a/springdoc-openapi-ui/src/test/resources/results/app16-1.json b/springdoc-openapi-ui/src/test/resources/results/app16-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/test/application/swaggerui/swagger-config",
+  "configUrl": "/test/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9095/test/application/swagger-ui/oauth2-redirect.html",
   "urls": [
     {
diff --git a/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java b/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java
@@ -54,14 +54,14 @@ void testIndex() {
 
 	@Test
 	public void testIndexActuator() {
-		HttpStatus httpStatusMono = webClient.get().uri("/application/swaggerui")
+		HttpStatus httpStatusMono = webClient.get().uri("/application/swagger-ui")
 				.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
 		assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = webClient.get().uri("/application/swaggerui/swagger-config").retrieve()
+		String contentAsString = webClient.get().uri("/application/swagger-ui/swagger-config").retrieve()
 				.bodyToMono(String.class).block();
 		String expected = getContent("results/app13-1.json");
 		assertEquals(expected, contentAsString, true);
diff --git a/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java b/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java
@@ -53,14 +53,14 @@ void testIndex() {
 
 	@Test
 	public void testIndexActuator() {
-		HttpStatus httpStatusMono = webClient.get().uri("/application/swaggerui")
+		HttpStatus httpStatusMono = webClient.get().uri("/application/swagger-ui")
 				.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
 		assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = webClient.get().uri("/application/swaggerui/swagger-config").retrieve()
+		String contentAsString = webClient.get().uri("/application/swagger-ui/swagger-config").retrieve()
 				.bodyToMono(String.class).block();
 		String expected = getContent("results/app14-1.json");
 		assertEquals(expected, contentAsString, true);
diff --git a/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java b/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java
@@ -56,14 +56,14 @@ void testIndex() {
 
 	@Test
 	public void testIndexActuator() {
-		HttpStatus httpStatusMono = webClient.get().uri("/test/application/swaggerui")
+		HttpStatus httpStatusMono = webClient.get().uri("/test/application/swagger-ui")
 				.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
 		assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = webClient.get().uri("/test/application/swaggerui/swagger-config").retrieve()
+		String contentAsString = webClient.get().uri("/test/application/swagger-ui/swagger-config").retrieve()
 				.bodyToMono(String.class).block();
 		String expected = getContent("results/app15-1.json");
 		assertEquals(expected, contentAsString, true);
diff --git a/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java b/springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java
@@ -55,14 +55,14 @@ void testIndex() {
 
 	@Test
 	public void testIndexActuator() {
-		HttpStatus httpStatusMono = webClient.get().uri("/test/application/swaggerui")
+		HttpStatus httpStatusMono = webClient.get().uri("/test/application/swagger-ui")
 				.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
 		assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
 	}
 
 	@Test
 	public void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = webClient.get().uri("/test/application/swaggerui/swagger-config").retrieve()
+		String contentAsString = webClient.get().uri("/test/application/swagger-ui/swagger-config").retrieve()
 				.bodyToMono(String.class).block();
 		String expected = getContent("results/app16-1.json");
 		assertEquals(expected, contentAsString, true);
diff --git a/springdoc-openapi-webflux-ui/src/test/resources/results/app13-1.json b/springdoc-openapi-webflux-ui/src/test/resources/results/app13-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/application/swaggerui/swagger-config",
+  "configUrl": "/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9092/application/webjars/swagger-ui/oauth2-redirect.html",
   "url": "/application/openapi",
   "validatorUrl": ""
diff --git a/springdoc-openapi-webflux-ui/src/test/resources/results/app14-1.json b/springdoc-openapi-webflux-ui/src/test/resources/results/app14-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/application/swaggerui/swagger-config",
+  "configUrl": "/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9093/application/webjars/swagger-ui/oauth2-redirect.html",
   "urls": [
     {
diff --git a/springdoc-openapi-webflux-ui/src/test/resources/results/app15-1.json b/springdoc-openapi-webflux-ui/src/test/resources/results/app15-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/test/application/swaggerui/swagger-config",
+  "configUrl": "/test/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9094/test/application/webjars/swagger-ui/oauth2-redirect.html",
   "url": "/test/application/openapi",
   "validatorUrl": ""
diff --git a/springdoc-openapi-webflux-ui/src/test/resources/results/app16-1.json b/springdoc-openapi-webflux-ui/src/test/resources/results/app16-1.json
@@ -1,5 +1,5 @@
 {
-  "configUrl": "/test/application/swaggerui/swagger-config",
+  "configUrl": "/test/application/swagger-ui/swagger-config",
   "oauth2RedirectUrl": "http://localhost:9095/test/application/webjars/swagger-ui/oauth2-redirect.html",
   "urls": [
     {

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ void testIndex() throws Exception {`
`48`	`48`
`49`	`49`	`@Test`
`50`	`50`	`public void testIndexActuator() {`
`51`		`- String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui", String.class);`
	`51`	`+ String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui", String.class);`
`52`	`52`	`assertTrue(contentAsString.contains("Swagger UI"));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Test`
`56`	`56`	`public void testIndexSwaggerConfig() throws Exception {`
`57`		`- String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui/swagger-config", String.class);`
	`57`	`+ String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui/swagger-config", String.class);`
`58`	`58`	`String expected = getContent("results/app13-1.json");`
`59`	`59`	`assertEquals(expected, contentAsString, true);`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,13 @@ void testIndex() throws Exception {`
`51`	`51`
`52`	`52`	`@Test`
`53`	`53`	`public void testIndexActuator() {`
`54`		`- String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui", String.class);`
	`54`	`+ String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui", String.class);`
`55`	`55`	`assertTrue(contentAsString.contains("Swagger UI"));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Test`
`59`	`59`	`public void testIndexSwaggerConfig() throws Exception {`
`60`		`- String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui/swagger-config", String.class);`
	`60`	`+ String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui/swagger-config", String.class);`
`61`	`61`	`String expected = getContent("results/app15-1.json");`
`62`	`62`	`assertEquals(expected, contentAsString, true);`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "configUrl": "/application/swaggerui/swagger-config",`
	`2`	`+ "configUrl": "/application/swagger-ui/swagger-config",`
`3`	`3`	`"oauth2RedirectUrl": "http://localhost:9092/application/swagger-ui/oauth2-redirect.html",`
`4`	`4`	`"url": "/application/openapi",`
`5`	`5`	`"validatorUrl": ""`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "configUrl": "/test/application/swaggerui/swagger-config",`
	`2`	`+ "configUrl": "/test/application/swagger-ui/swagger-config",`
`3`	`3`	`"oauth2RedirectUrl": "http://localhost:9094/test/application/swagger-ui/oauth2-redirect.html",`
`4`	`4`	`"url": "/test/application/openapi",`
`5`	`5`	`"validatorUrl": ""`