Skip to content

Fix for issue 845 #846

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
Sep 25, 2018
Merged

Fix for issue 845 #846

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
0912ac3
Fix for issue 845
ymohdriz Sep 25, 2018
47ff142
Merge branch 'master' into branch_Fix_845
ymohdriz Sep 25, 2018
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
2 changes: 1 addition & 1 deletion modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public SwaggerDeserializationResult readWithInfo(String swaggerAsString) {
}

public SwaggerDeserializationResult readWithInfo(String swaggerAsString, boolean resolve) {
if (swaggerAsString == null) {
if (swaggerAsString == null || swaggerAsString.trim().isEmpty()) {
return new SwaggerDeserializationResult().message("empty or null swagger supplied");
}
try {
Expand Down
7 changes: 6 additions & 1 deletion 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 @@ -54,6 +54,12 @@

public class SwaggerParserTest {

@Test
public void testIssue845() {
SwaggerDeserializationResult swaggerDeserializationResult = new SwaggerParser().readWithInfo("");
assertEquals(swaggerDeserializationResult.getMessages().get(0), "empty or null swagger supplied");
}

@Test
public void testIssue834() {
Swagger swagger = new SwaggerParser().read("issue-834/index.yaml", null, true);
Expand Down Expand Up @@ -86,7 +92,6 @@ public void testIssue811_RefSchema_ToRefSchema() {
Assert.assertEquals(model.get$ref() ,"#/definitions/schema-with-reference");
}


@Test
public void testIssue811() throws Exception {
SwaggerParser parser = new SwaggerParser();
Expand Down