Cannot override servers in api-docs.yaml using OpenApiCustomiser; Fixes #1188.

bnasslahsen · bnasslahsen · commit 088eb2959c59 · 2021-06-30T19:01:49.000+02:00
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/OpenAPIService.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/OpenAPIService.java
@@ -477,6 +477,8 @@ private List<Server> resolveProperties(List<Server> servers) {
 		servers.forEach(server -> {
 			resolveProperty(server::getUrl, server::url, propertyResolverUtils);
 			resolveProperty(server::getDescription, server::description, propertyResolverUtils);
+			if(CollectionUtils.isEmpty(server.getVariables()))
+				server.setVariables(null);
 		});
 		return servers;
 	}
diff --git a/springdoc-openapi-webmvc-core/src/test/resources/results/app137.json b/springdoc-openapi-webmvc-core/src/test/resources/results/app137.json
@@ -8,8 +8,7 @@
   "servers": [
     {
       "url": "http://test.toto.com",
-      "description": "toto desc",
-      "variables": {}
+      "description": "toto desc"
     }
   ],
   "paths": {

Original file line number	Diff line number	Diff line change
`@@ -477,6 +477,8 @@ private List<Server> resolveProperties(List<Server> servers) {`
`477`	`477`	`servers.forEach(server -> {`
`478`	`478`	`resolveProperty(server::getUrl, server::url, propertyResolverUtils);`
`479`	`479`	`resolveProperty(server::getDescription, server::description, propertyResolverUtils);`
	`480`	`+ if(CollectionUtils.isEmpty(server.getVariables()))`
	`481`	`+ server.setVariables(null);`
`480`	`482`	`});`
`481`	`483`	`return servers;`
`482`	`484`	`}`