Skip to content

Commit ef74a02

Browse files
committed
GroupedApi orders by displayName instead of name. Fixes #2576
1 parent ea45be8 commit ef74a02

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigParameters.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,9 @@ public Map<String, Object> getConfigParameters() {
304304
private void put(String urls, Set<SwaggerUrl> swaggerUrls, Map<String, Object> params) {
305305
Comparator<SwaggerUrl> swaggerUrlComparator;
306306
if (groupsOrder.isAscending())
307-
swaggerUrlComparator = Comparator.comparing(SwaggerUrl::getName);
307+
swaggerUrlComparator = Comparator.comparing(SwaggerUrl::getDisplayName);
308308
else
309-
swaggerUrlComparator = (h1, h2) -> h2.getName().compareTo(h1.getName());
309+
swaggerUrlComparator = (h1, h2) -> h2.getDisplayName().compareTo(h1.getDisplayName());
310310

311311
swaggerUrls = swaggerUrls.stream().sorted(swaggerUrlComparator).filter(elt -> StringUtils.isNotEmpty(elt.getUrl())).collect(Collectors.toCollection(LinkedHashSet::new));
312312
if (!CollectionUtils.isEmpty(swaggerUrls)) {

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocApp4Test.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public void swagger_config_for_multiple_groups() throws Exception {
3737
.andExpect(status().isOk())
3838
.andExpect(jsonPath("configUrl", equalTo("/v3/api-docs/swagger-config")))
3939
.andExpect(jsonPath("url").doesNotExist())
40-
.andExpect(jsonPath("urls[0].url", equalTo("/v3/api-docs/stores")))
41-
.andExpect(jsonPath("urls[0].name", equalTo("stores")))
42-
.andExpect(jsonPath("urls[1].url", equalTo("/v3/api-docs/pets")))
43-
.andExpect(jsonPath("urls[1].name", equalTo("The pets")))
40+
.andExpect(jsonPath("urls[1].url", equalTo("/v3/api-docs/stores")))
41+
.andExpect(jsonPath("urls[1].name", equalTo("stores")))
42+
.andExpect(jsonPath("urls[0].url", equalTo("/v3/api-docs/pets")))
43+
.andExpect(jsonPath("urls[0].name", equalTo("zpets")))
4444
.andExpect(jsonPath("$['urls.primaryName']", equalTo("pets")));
4545
}
4646
}

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocTestApp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public GroupedOpenApi groupOpenApi() {
4747
String[] paths = { "/pet/**" };
4848
return GroupedOpenApi.builder()
4949
.group("pets")
50-
.displayName("The pets")
50+
.displayName("zpets")
5151
.pathsToMatch(paths)
5252
.build();
5353
}

0 commit comments

Comments
 (0)