aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2018-01-23 13:45:29 -0800
committerJakob Odersky <jakob@driver.xyz>2018-01-23 13:45:29 -0800
commit632552cfc56cdd25ead6860d58acbf0c1226c808 (patch)
tree984b9fbc3adfadfd541a3f7585570f37fccea608
parent28dd795938a5ac0ac47f6dd67767fba062f80345 (diff)
downloaddriver-core-632552cfc56cdd25ead6860d58acbf0c1226c808.tar.gz
driver-core-632552cfc56cdd25ead6860d58acbf0c1226c808.tar.bz2
driver-core-632552cfc56cdd25ead6860d58acbf0c1226c808.zip
Hotfix for swagger: keep javascript new line formattingv1.6.14
-rw-r--r--src/main/scala/xyz/driver/core/rest/Swagger.scala6
1 files changed, 3 insertions, 3 deletions
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