Skip to content

Fixing Contact Object vendor Extension was not parsed #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2019
Merged

Fixing Contact Object vendor Extension was not parsed #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3780e0b
refs - #1204 - fixing Contact Object vendor Extension was not parsed …
gracekarina Oct 4, 2019
7491690
refs - #1204 - removing commented code
gracekarina Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,10 @@ public Contact contact(ObjectNode node, String location, ParseResult result) {
// extra keys
Set<String> keys = getKeys(node);
for(String key : keys) {
if(!CONTACT_KEYS.contains(key)) {
if(key.startsWith("x-")) {
contact.setVendorExtension(key, extension(node.get(key)));
}
else if(!CONTACT_KEYS.contains(key)) {
result.extra(location + ".contact", key, node.get(key));
}
}
Expand Down
9 changes: 9 additions & 0 deletions modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@

public class SwaggerParserTest {

@Test
public void testIssue1204() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("issue1204.yaml", null, true);
System.out.println(result.getMessages());
assertTrue(result.getMessages().size() == 0);
assertNotNull(result.getSwagger());

}

@Test
public void testIssue1169() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("issue1169.yaml", null, true);
Expand Down
3 changes: 1 addition & 2 deletions modules/swagger-parser/src/test/java/io/swagger/parser/util/SwaggerDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,7 @@ public void testContact() {
assertEquals(contact.getName(), "tony");
assertEquals(contact.getUrl(), "url");
assertEquals(contact.getEmail(), "email");

assertTrue(messages.contains("attribute info.contact.x-fun is unexpected"));

assertTrue(messages.contains("attribute info.bad is unexpected"));
assertTrue(messages.contains("attribute info.contact.invalid is unexpected"));

Expand Down
Loading