From 0912ac35e9ef2980e5ab143e1e045cf80a4e00b2 Mon Sep 17 00:00:00 2001 From: Mohammed Rizwan Date: Tue, 25 Sep 2018 15:15:41 +0530 Subject: [PATCH] Fix for issue 845 Incorrect error message when the input is empty string in Swagger 2.0 --- .../src/main/java/io/swagger/parser/SwaggerParser.java | 2 +- .../src/test/java/io/swagger/parser/SwaggerParserTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java b/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java index 45ae3be253..5041c0cfb2 100644 --- a/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java +++ b/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java @@ -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 { diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java index 87a53d5fc6..dfc9f7075e 100644 --- a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java +++ b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java @@ -54,6 +54,12 @@ public class SwaggerParserTest { + @Test + public void testEmptyStringAsContent() { + SwaggerDeserializationResult swaggerDeserializationResult = new SwaggerParser().readWithInfo(""); + assertEquals(swaggerDeserializationResult.getMessages().get(0), "empty or null swagger supplied"); + } + @Test public void testIssue697() throws Exception { String yaml = "{\n" +