Skip to content

Commit d32ff61

Browse files
authored
Merge pull request #716 from ackintosh/fix-swaggerparseresult-message
Fix missing SwaggerParseResult.message
2 parents a010ae5 + 86e3211 commit d32ff61

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,13 @@ public SwaggerParseResult convert(SwaggerDeserializationResult parse) {
126126
return null;
127127
}
128128

129+
SwaggerParseResult output = new SwaggerParseResult().messages(parse.getMessages());
130+
129131
if (parse.getSwagger() == null) {
130-
return new SwaggerParseResult()
131-
.messages(parse.getMessages());
132+
return output;
132133
}
133134

134135
OpenAPI openAPI = new OpenAPI();
135-
SwaggerParseResult output = new SwaggerParseResult();
136-
137136
SwaggerInventory inventory = new SwaggerInventory().process(parse.getSwagger());
138137

139138
Swagger swagger = parse.getSwagger();

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,17 @@ public void testParameterConversion() throws Exception {
639639
assertFalse(parameter.getExplode());
640640
}
641641

642+
@Test(description = "OpenAPI v2 converter - SwaggerParseResult has message")
643+
public void testSwaggerParseResultHasMessage() throws Exception {
644+
SwaggerConverter converter = new SwaggerConverter();
645+
String swaggerAsString = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource(PET_STORE_JSON).toURI())));
646+
ParseOptions parseOptions = new ParseOptions();
647+
parseOptions.setResolve(false);
648+
SwaggerParseResult result = converter.readContents(swaggerAsString, null, parseOptions);
649+
650+
assertNotNull(result.getMessages());
651+
}
652+
642653
private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException, URISyntaxException {
643654
SwaggerConverter converter = new SwaggerConverter();
644655
String swaggerAsString = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource(file).toURI())));

0 commit comments

Comments
 (0)