Skip to content

Commit 339e5df

Browse files
authored
Merge pull request #969 from OpenAPITools/fix_vendor_extension
Fix missing top level extensions in OAS v2 spec
2 parents 6b8215b + f079abc commit 339e5df

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ public SwaggerParseResult convert(SwaggerDeserializationResult parse) {
139139

140140
Swagger swagger = parse.getSwagger();
141141

142+
if (swagger.getVendorExtensions() != null) {
143+
openAPI.setExtensions(convert(swagger.getVendorExtensions()));
144+
}
145+
142146
if (swagger.getExternalDocs() != null) {
143147
openAPI.setExternalDocs(convert(swagger.getExternalDocs()));
144148
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,13 @@ public void testIssue755() throws Exception {
727727
final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_755_YAML);
728728
assertNotNull(oas);
729729
}
730+
731+
@Test(description = "OpenAPI v2 converter - top-level extensions should be preserved")
732+
public void testTopLevelExtensions() throws Exception {
733+
final OpenAPI oas = getConvertedOpenAPIFromJsonFile(PARAMETER_CONVERSION_JSON);
734+
assertNotNull(oas);
735+
assertEquals((String)oas.getExtensions().get("x-some-extensions"), "hello");
736+
}
730737

731738
@Test(description = "OpenAPI v2 converter - Conversion param extensions should be preserved")
732739
public void testIssue820() throws Exception {

modules/swagger-parser-v2-converter/src/test/resources/parameter-conversion.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"swagger": "2.0",
3+
"x-some-extensions": "hello",
34
"info": {
45
"version": "1.0",
56
"title": "x-example"

0 commit comments

Comments
 (0)