Skip to content

Commit 24b6120

Browse files
authored
Merge pull request #1334 from swagger-api/reverse-issue#1236
reverting changes for issue #1236 - added test
2 parents ee9d1a6 + 5e9f055 commit 24b6120

File tree

4 files changed

+49
-139
lines changed

4 files changed

+49
-139
lines changed

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -413,13 +413,8 @@ public Server getServer(ObjectNode obj, String location, ParseResult result, Str
413413
if("http".equals(absURI.getScheme()) || "https".equals(absURI.getScheme())){
414414
value = absURI.resolve(new URI(value)).toString();
415415
}
416-
else {
417-
result.warning(location," invalid url : "+value);
418-
}
419-
420416
} catch (URISyntaxException e) {
421417
result.warning(location,"invalid url : "+value);
422-
e.printStackTrace();
423418
}
424419

425420
}

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,13 +2262,14 @@ public void testParseOptionsSkipMatchesTrue() {
22622262
}
22632263

22642264
@Test
2265-
public void testIssue1236() {
2265+
public void testRegressionIssue1236() {
22662266
final ParseOptions options = new ParseOptions();
22672267
options.setResolve(true);
22682268

22692269
SwaggerParseResult result = new OpenAPIV3Parser()
2270-
.readLocation("src/test/resources/issue-1236/petstore.json", null, options);
2271-
assertEquals(result.getMessages().get(0), "attribute .servers. invalid url : /te st/sample.yaml");
2270+
.readLocation("src/test/resources/testRegressionIssue1236.yaml", null, options);
2271+
assertTrue(result.getMessages().size() == 0);
2272+
22722273
}
22732274

22742275
@Test

modules/swagger-parser-v3/src/test/resources/issue-1236/petstore.json

Lines changed: 0 additions & 131 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
openapi: 3.0.0
2+
info:
3+
title: Issue with server
4+
license:
5+
name: Apache-2.0
6+
url: https://www.apache.org/licenses/LICENSE-2.0.html
7+
version: 1.0.0
8+
servers:
9+
- url: http://{server}.swagger.io:{port}/v2
10+
description: petstore server
11+
variables:
12+
server:
13+
default: petstore
14+
enum:
15+
- petstore
16+
- qa-petstore
17+
- dev-petstore
18+
port:
19+
default: "80"
20+
enum:
21+
- "80"
22+
- "8080"
23+
- url: https://localhost:8080/{version}
24+
description: The local server
25+
variables:
26+
version:
27+
default: v2
28+
enum:
29+
- v1
30+
- v2
31+
- url: /api/v1
32+
description: The local server
33+
variables:
34+
version:
35+
default: v2
36+
enum:
37+
- v1
38+
- v2
39+
paths:
40+
/ping:
41+
get:
42+
operationId: pingGet
43+
responses:
44+
'201':
45+
description: OK

0 commit comments

Comments
 (0)