From 632552cfc56cdd25ead6860d58acbf0c1226c808 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 23 Jan 2018 13:45:29 -0800 Subject: Hotfix for swagger: keep javascript new line formatting --- src/main/scala/xyz/driver/core/rest/Swagger.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz/driver/core/rest/Swagger.scala b/src/main/scala/xyz/driver/core/rest/Swagger.scala index d110cd3..a3d942c 100644 --- a/src/main/scala/xyz/driver/core/rest/Swagger.scala +++ b/src/main/scala/xyz/driver/core/rest/Swagger.scala @@ -98,7 +98,7 @@ class Swagger( contentType: ContentType, substitution: (String, String)): Route = get { Option(this.getClass.getClassLoader.getResource(resourceName)) flatMap ResourceFile.apply match { - case Some(ResourceFile(url, length, _)) => + case Some(ResourceFile(url, length @ _, _)) => extractSettings { settings => val stream = StreamConverters .fromInputStream(() => url.openStream()) @@ -107,9 +107,9 @@ class Swagger( .map { line => line.replaceAll(s"\\{\\{${substitution._1}\\}\\}", substitution._2) } - .map(line => ByteString(line)) + .map(line => ByteString(line + "\n")) complete( - HttpEntity.Default(contentType, length, stream) + HttpEntity(contentType, stream) ) } case None => reject -- cgit v1.2.3