Skip to content

Optimized Uri.withQuery #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raboof merged 3 commits into from
Dec 16, 2024
Merged

Optimized Uri.withQuery #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f44cf64
Optimized Uri.withQuery
Dec 12, 2024
c893fb5
Improved UriSpec percent encoding tests
Dec 15, 2024
3383c26
Fix UriSpec test for Scala 2.12
Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/Uri.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ sealed abstract case class Uri(scheme: String, authority: Authority, path: Path,
/**
* Returns a copy of this Uri with the given query.
*/
def withQuery(query: Query): Uri = copy(rawQueryString = if (query.isEmpty) None else Some(query.toString))
def withQuery(query: Query): Uri =
createUnsafe(scheme, authority, path, if (query.isEmpty) None else Some(query.toString), fragment)

@YoniKF YoniKF Dec 12, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a copyUnsafe method and calling it here and also in all the other with... methods (this assumes that the query stored inside Uri is also already encoded).


/**
* Returns a copy of this Uri with the given query string.
Expand Down
6 changes: 6 additions & 0 deletions http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,12 @@ class UriSpec extends AnyWordSpec with Matchers {
uri.withRawQueryString("param1=val%22ue1") shouldEqual Uri("http://host/path?param1=val%22ue1#fragment")
uri.withRawQueryString("param1=val\"ue1") shouldEqual Uri("http://host/path?param1=val%22ue1#fragment")

uri.withQuery(Query("param1=val\"ue1")) shouldEqual Uri("http://host/path?param1=val%22ue1#fragment")
uri.withQuery(Query(("param1", "val\"ue1"))) shouldEqual Uri("http://host/path?param1=val%22ue1#fragment")
uri.withQuery(Query(Some("param1=val\"ue1"))) shouldEqual Uri("http://host/path?param1=val%22ue1#fragment")
val query = Query.newBuilder.+=("param1" -> "val\"ue1").result()
uri.withQuery(query) shouldEqual Uri("http://host/path?param1=val%22ue1#fragment")

uri.withFragment("otherFragment") shouldEqual Uri("http://host/path?query#otherFragment")
}

Expand Down