Properly parsing single-segment paths as relative uris

softwaremill · Jan 26, 2021 · 550d2fa · 550d2fa
1 parent 999ac2b
commit 550d2fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/scala/sttp/model/UriInterpolator.scala b/core/src/main/scala/sttp/model/UriInterpolator.scala
@@ -152,9 +152,10 @@ object UriInterpolator {
 
       override def tokenize(s: String): (Tokenizer, Vector[Token]) = {
         SchemePattern.findPrefixOf(s) match {
-          case Some(scheme) if scheme.length == s.length =>
-            (this, Vector(StringToken(scheme))) // scheme (or another component) might be continued
-          case _ if s.isEmpty => (this, Vector(StringToken(""))) // scheme (or another component) might be continued
+          // #59: if the entire string matches the pattern, then there's no scheme terminator (`:`). This means there's
+          // no scheme, hence - tokenizing as a relative uri.
+          case Some(scheme) if scheme.length == s.length => AfterScheme.tokenize(scheme)
+          case _ if s.isEmpty                            => (this, Vector(StringToken(""))) // scheme (or another component) might be continued
           case Some(scheme) if s(scheme.length) == ':' =>
             val rest = s.substring(scheme.length + 1)
             val (next, afterSchemeTokens) = AfterScheme.tokenize(rest)

diff --git a/core/src/test/scala/sttp/model/UriInterpolatorTests.scala b/core/src/test/scala/sttp/model/UriInterpolatorTests.scala
@@ -174,6 +174,8 @@ class UriInterpolatorTests extends AnyFunSuite with Matchers {
       (uri"/a/b/c?x=$None", "/a/b/c"),
       (uri"/$v1/b/c", s"/$v1/b/c"),
       (uri"/$v1/$v2/c", s"/$v1/$v2encoded/c"),
+      (uri"a", "a"),
+      (uri"$v1", s"$v1"),
       (uri"a/b/c", "a/b/c"),
       (uri"$v1/b/c", s"$v1/b/c"),
       (uri"$v1/$v2/c", s"$v1/$v2encoded/c"),