Don't prepend slashes to baseUrl if baseUrl already begins with a slash

alexweav · alexweav · commit dd5e7058eae2 · 2019-06-03T16:36:49.000-05:00
diff --git a/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java b/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java
@@ -420,7 +420,7 @@ private List<Server> convert(List<Scheme> schemes, String host, String basePath)
                 servers.add(server);
             }
         } else {
-            if (!"/".equals(baseUrl)) {
+            if (!StringUtils.startsWith(baseUrl, "/") && !"/".equals(baseUrl)) {
                 baseUrl = "//" + baseUrl;
             }
             Server server = new Server();

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ private List<Server> convert(List<Scheme> schemes, String host, String basePath)`
`420`	`420`	`servers.add(server);`
`421`	`421`	`}`
`422`	`422`	`} else {`
`423`		`- if (!"/".equals(baseUrl)) {`
	`423`	`+ if (!StringUtils.startsWith(baseUrl, "/") && !"/".equals(baseUrl)) {`
`424`	`424`	`baseUrl = "//" + baseUrl;`
`425`	`425`	`}`
`426`	`426`	`Server server = new Server();`