Skip to content

Commit 19e234a

Browse files
authored
Merge pull request #791 from ymohdriz/branch_v2.0.1_Fix790
Fix for issue 790
2 parents 8523805 + 13d98d2 commit 19e234a

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -408,14 +408,9 @@ private List<Server> convert(List<Scheme> schemes, String host, String basePath)
408408
servers.add(server);
409409
}
410410
} else {
411-
if (!"/".equals(baseUrl)) {
412-
Server server = new Server();
413-
server.setUrl(baseUrl);
414-
415-
servers.add(server);
416-
} else {
417-
return null;
418-
}
411+
Server server = new Server();
412+
server.setUrl(baseUrl);
413+
servers.add(server);
419414
}
420415

421416
return servers;

modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,10 @@ public void testIssue30() throws Exception {
433433
assertNotNull(oas);
434434
}
435435

436-
@Test(description = "No Servers - without host, basePath, scheme")
436+
@Test(description = "Expect a default server object when a swagger without host, basePath and scheme is converted to openAPI")
437437
public void testIssue31() throws Exception {
438438
OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_31_JSON);
439-
assertNull(oas.getServers());
439+
assertNotNull(oas.getServers());
440440
}
441441

442442
@Test(description = "Convert schema, property and array examples")

0 commit comments

Comments
 (0)