Skip to content

Commit 3623b6e

Browse files
bnasslahsenbnasslahsen
committed
Unexpected path behaviour when using management port (actuator). Fixes #1603.
1 parent d2e71dc commit 3623b6e

File tree

17 files changed

+25
-25
lines changed

17 files changed

+25
-25
lines changed

‎springdoc-openapi-common/src/main/java/org/springdoc/core/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public final class Constants {
359359
/**
360360
* The constant DEFAULT_SWAGGER_UI_ACTUATOR_PATH.
361361
*/
362-
public static final String DEFAULT_SWAGGER_UI_ACTUATOR_PATH = "swaggerui";
362+
public static final String DEFAULT_SWAGGER_UI_ACTUATOR_PATH = "swagger-ui";
363363

364364
/**
365365
* The constant DEFAULT_API_DOCS_ACTUATOR_URL.

‎springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ void testIndex() throws Exception {
4848

4949
@Test
5050
public void testIndexActuator() {
51-
String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui", String.class);
51+
String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui", String.class);
5252
assertTrue(contentAsString.contains("Swagger UI"));
5353
}
5454

5555
@Test
5656
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);
5858
String expected = getContent("results/app13-1.json");
5959
assertEquals(expected, contentAsString, true);
6060
}

‎springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ void testIndex() throws Exception {
4848

4949
@Test
5050
public void testIndexActuator() {
51-
String contentAsString = actuatorRestTemplate.getForObject("/application/swaggerui", String.class);
51+
String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui", String.class);
5252
assertTrue(contentAsString.contains("Swagger UI"));
5353
}
5454

5555
@Test
5656
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);
5858
String expected = getContent("results/app14-1.json");
5959
assertEquals(expected, contentAsString, true);
6060
}

‎springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ void testIndex() throws Exception {
5151

5252
@Test
5353
public void testIndexActuator() {
54-
String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui", String.class);
54+
String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui", String.class);
5555
assertTrue(contentAsString.contains("Swagger UI"));
5656
}
5757

5858
@Test
5959
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);
6161
String expected = getContent("results/app15-1.json");
6262
assertEquals(expected, contentAsString, true);
6363
}

‎springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ void testIndex() throws Exception {
5151

5252
@Test
5353
public void testIndexActuator() {
54-
String contentAsString = actuatorRestTemplate.getForObject("/test/application/swaggerui", String.class);
54+
String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui", String.class);
5555
assertTrue(contentAsString.contains("Swagger UI"));
5656
}
5757

5858
@Test
5959
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);
6161
String expected = getContent("results/app16-1.json");
6262
assertEquals(expected, contentAsString, true);
6363
}

‎springdoc-openapi-ui/src/test/resources/results/app13-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/application/swaggerui/swagger-config",
2+
"configUrl": "/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9092/application/swagger-ui/oauth2-redirect.html",
44
"url": "/application/openapi",
55
"validatorUrl": ""

‎springdoc-openapi-ui/src/test/resources/results/app14-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/application/swaggerui/swagger-config",
2+
"configUrl": "/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9093/application/swagger-ui/oauth2-redirect.html",
44
"urls": [
55
{

‎springdoc-openapi-ui/src/test/resources/results/app15-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/test/application/swaggerui/swagger-config",
2+
"configUrl": "/test/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9094/test/application/swagger-ui/oauth2-redirect.html",
44
"url": "/test/application/openapi",
55
"validatorUrl": ""

‎springdoc-openapi-ui/src/test/resources/results/app16-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/test/application/swaggerui/swagger-config",
2+
"configUrl": "/test/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9095/test/application/swagger-ui/oauth2-redirect.html",
44
"urls": [
55
{

‎springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ void testIndex() {
5454

5555
@Test
5656
public void testIndexActuator() {
57-
HttpStatus httpStatusMono = webClient.get().uri("/application/swaggerui")
57+
HttpStatus httpStatusMono = webClient.get().uri("/application/swagger-ui")
5858
.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
5959
assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
6060
}
6161

6262
@Test
6363
public void testIndexSwaggerConfig() throws Exception {
64-
String contentAsString = webClient.get().uri("/application/swaggerui/swagger-config").retrieve()
64+
String contentAsString = webClient.get().uri("/application/swagger-ui/swagger-config").retrieve()
6565
.bodyToMono(String.class).block();
6666
String expected = getContent("results/app13-1.json");
6767
assertEquals(expected, contentAsString, true);

‎springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ void testIndex() {
5353

5454
@Test
5555
public void testIndexActuator() {
56-
HttpStatus httpStatusMono = webClient.get().uri("/application/swaggerui")
56+
HttpStatus httpStatusMono = webClient.get().uri("/application/swagger-ui")
5757
.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
5858
assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
5959
}
6060

6161
@Test
6262
public void testIndexSwaggerConfig() throws Exception {
63-
String contentAsString = webClient.get().uri("/application/swaggerui/swagger-config").retrieve()
63+
String contentAsString = webClient.get().uri("/application/swagger-ui/swagger-config").retrieve()
6464
.bodyToMono(String.class).block();
6565
String expected = getContent("results/app14-1.json");
6666
assertEquals(expected, contentAsString, true);

‎springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ void testIndex() {
5656

5757
@Test
5858
public void testIndexActuator() {
59-
HttpStatus httpStatusMono = webClient.get().uri("/test/application/swaggerui")
59+
HttpStatus httpStatusMono = webClient.get().uri("/test/application/swagger-ui")
6060
.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
6161
assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
6262
}
6363

6464
@Test
6565
public void testIndexSwaggerConfig() throws Exception {
66-
String contentAsString = webClient.get().uri("/test/application/swaggerui/swagger-config").retrieve()
66+
String contentAsString = webClient.get().uri("/test/application/swagger-ui/swagger-config").retrieve()
6767
.bodyToMono(String.class).block();
6868
String expected = getContent("results/app15-1.json");
6969
assertEquals(expected, contentAsString, true);

‎springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ void testIndex() {
5555

5656
@Test
5757
public void testIndexActuator() {
58-
HttpStatus httpStatusMono = webClient.get().uri("/test/application/swaggerui")
58+
HttpStatus httpStatusMono = webClient.get().uri("/test/application/swagger-ui")
5959
.exchangeToMono( clientResponse -> Mono.just(clientResponse.statusCode())).block();
6060
assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND);
6161
}
6262

6363
@Test
6464
public void testIndexSwaggerConfig() throws Exception {
65-
String contentAsString = webClient.get().uri("/test/application/swaggerui/swagger-config").retrieve()
65+
String contentAsString = webClient.get().uri("/test/application/swagger-ui/swagger-config").retrieve()
6666
.bodyToMono(String.class).block();
6767
String expected = getContent("results/app16-1.json");
6868
assertEquals(expected, contentAsString, true);

‎springdoc-openapi-webflux-ui/src/test/resources/results/app13-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/application/swaggerui/swagger-config",
2+
"configUrl": "/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9092/application/webjars/swagger-ui/oauth2-redirect.html",
44
"url": "/application/openapi",
55
"validatorUrl": ""

‎springdoc-openapi-webflux-ui/src/test/resources/results/app14-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/application/swaggerui/swagger-config",
2+
"configUrl": "/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9093/application/webjars/swagger-ui/oauth2-redirect.html",
44
"urls": [
55
{

‎springdoc-openapi-webflux-ui/src/test/resources/results/app15-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/test/application/swaggerui/swagger-config",
2+
"configUrl": "/test/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9094/test/application/webjars/swagger-ui/oauth2-redirect.html",
44
"url": "/test/application/openapi",
55
"validatorUrl": ""

‎springdoc-openapi-webflux-ui/src/test/resources/results/app16-1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"configUrl": "/test/application/swaggerui/swagger-config",
2+
"configUrl": "/test/application/swagger-ui/swagger-config",
33
"oauth2RedirectUrl": "http://localhost:9095/test/application/webjars/swagger-ui/oauth2-redirect.html",
44
"urls": [
55
{

0 commit comments

Comments
 (0)