From eb4b0a7526df043460539f4d3f271e9c5f8b4d28 Mon Sep 17 00:00:00 2001 From: Ivan Ushankin Date: Tue, 30 Jun 2015 15:10:42 +0300 Subject: [PATCH] Fixed #59: SwaggerParser.parse(String swaggerAsString) always returns null --- .../java/io/swagger/parser/SwaggerParser.java | 2 +- .../src/test/scala/SwaggerReaderTest.scala | 17 +++++++++++++++++ 2 files changed, 18 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 04e311b200..5a14660eb1 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 @@ -55,7 +55,7 @@ public Swagger parse(String swaggerAsString, List auths) { Swagger output; try { output = new Swagger20Parser().parse(swaggerAsString); - if (output != null && auths != null && auths.size() > 0) { + if (output != null) { return new SwaggerResolver().resolve(output, auths); } } catch (IOException e) { diff --git a/modules/swagger-parser/src/test/scala/SwaggerReaderTest.scala b/modules/swagger-parser/src/test/scala/SwaggerReaderTest.scala index b1ac69aec3..4189893a62 100644 --- a/modules/swagger-parser/src/test/scala/SwaggerReaderTest.scala +++ b/modules/swagger-parser/src/test/scala/SwaggerReaderTest.scala @@ -1,9 +1,14 @@ +import io.swagger.models.Swagger import io.swagger.parser.SwaggerParser import io.swagger.util.Json +import org.apache.commons.io.FileUtils import org.junit.runner.RunWith import org.scalatest.{FlatSpec, Matchers} import org.scalatest.junit.JUnitRunner +import java.io.File +import java.nio.charset.StandardCharsets + @RunWith(classOf[JUnitRunner]) class SwaggerReaderTest extends FlatSpec with Matchers { val m = Json.mapper() @@ -41,4 +46,16 @@ class SwaggerReaderTest extends FlatSpec with Matchers { }""" ) } + + it should "read the issue 59 resource" in { + val parser = new SwaggerParser() + val sampleFilePath = "./src/test/resources/uber.json" + + val swaggerFromFile = parser.parse(FileUtils.readFileToString(new File(sampleFilePath), StandardCharsets.UTF_8)) + val swaggerFromString = parser.read(sampleFilePath) + + swaggerFromFile.isInstanceOf[Swagger] should be(true) + swaggerFromString.isInstanceOf[Swagger] should be(true) + swaggerFromFile should equal(swaggerFromString) + } }