diff options
| author | adamw <adam@warski.org> | 2017-10-05 17:23:21 +0200 |
|---|---|---|
| committer | adamw <adam@warski.org> | 2017-10-05 17:23:21 +0200 |
| commit | 43baccc0edf12e8951c903d6697d7ee24a201e63 (patch) | |
| tree | 1bc38795ed0c8a79f5889e5c3ba72eb52199bc2b /core | |
| parent | 295b0d02768b933992f69f47ac73ed0c7989e80b (diff) | |
| download | sttp-43baccc0edf12e8951c903d6697d7ee24a201e63.tar.gz sttp-43baccc0edf12e8951c903d6697d7ee24a201e63.tar.bz2 sttp-43baccc0edf12e8951c903d6697d7ee24a201e63.zip | |
Updating dependencies
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala b/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala index a99bab8..f1e6beb 100644 --- a/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala +++ b/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala @@ -248,7 +248,8 @@ object UriInterpolator { object UriBuilder { case object Scheme extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { split(t, Set[Token](SchemeEnd)) match { case Left(tt) => (u.scheme("http"), tt) case Right((schemeTokens, _, otherTokens)) => @@ -259,7 +260,8 @@ object UriInterpolator { } case object UserInfo extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { split(t, Set[Token](AtInAuthority)) match { case Left(tt) => (u, tt) case Right((uiTokens, _, otherTokens)) => @@ -293,7 +295,8 @@ object UriInterpolator { } case object HostPort extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { split(t, Set[Token](PathStart, QueryStart, FragmentStart)) match { case Left(tt) => (hostPortFromTokens(u, tt), Vector.empty) @@ -386,7 +389,8 @@ object UriInterpolator { } case object Fragment extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { t match { case FragmentStart +: tt => (u.fragment(tokensToStringOpt(tt)), Vector.empty) @@ -484,7 +488,8 @@ object UriInterpolator { * These empty string tokens need to be removed so that e.g. extra key-value * mappings are not generated. */ - private def removeEmptyTokensAroundExp(tokens: Vector[Token]): Vector[Token] = { + private def removeEmptyTokensAroundExp( + tokens: Vector[Token]): Vector[Token] = { def doRemove(t: Vector[Token], acc: Vector[Token]): Vector[Token] = t match { case StringToken("") +: (e: ExpressionToken) +: tail => |