Skip to content
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

Fix compilation errors found in Scala3 Open Community Build #367

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Fix compilation errors found in Scala3 Open Community Build #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpMessage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ final class HttpRequest(
/**
* All cookies provided by the client in one or more `Cookie` headers.
*/
def cookies: immutable.Seq[HttpCookiePair] = for (`Cookie`(cookies) <- headers; cookie <- cookies) yield cookie
def cookies: immutable.Seq[HttpCookiePair] = for (case `Cookie`(cookies) <- headers; cookie <- cookies) yield cookie

/**
* Determines whether this request can be safely retried, which is the case only of the request method is idempotent.
Expand Down
3 changes: 2 additions & 1 deletion ...-core/src/test/scala/org/apache/pekko/http/impl/engine/client/NewConnectionPoolSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,8 @@ class NewConnectionPoolSpec extends PekkoSpecWithMaterializer("""
}

val requestSourceQueuePromise = Promise[SourceQueueWithComplete[_]]()
val requestSource = Source.queue(8, OverflowStrategy.fail).mapMaterializedValue(requestSourceQueuePromise.success)
val requestSource = Source.queue[HttpEntity.ChunkStreamPart](8, OverflowStrategy.fail)
.mapMaterializedValue(requestSourceQueuePromise.success)
val slowRequestEntity = Chunked(ContentTypes.`text/plain(UTF-8)`, requestSource)
val request =
HttpRequest(uri = s"http://$serverHostName:$serverPort/abc?query#fragment", entity = slowRequestEntity)
Expand Down
8 changes: 4 additions & 4 deletions http/src/main/scala/org/apache/pekko/http/scaladsl/server/ContentNegotation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class MediaTypeNegotiator(requestHeaders: Seq[HttpHeader]) {
*/
val acceptedMediaRanges: List[MediaRange] =
(for {
Accept(mediaRanges) <- requestHeaders
case Accept(mediaRanges) <- requestHeaders
range <- mediaRanges
} yield range).sortBy { // `sortBy` is stable, i.e. upholds the original order on identical weights
case x if x.isWildcard => (2, -x.params.size, -x.qValue)
Expand Down Expand Up @@ -63,7 +63,7 @@ final class CharsetNegotiator(requestHeaders: Seq[HttpHeader]) {
*/
val acceptedCharsetRanges: List[HttpCharsetRange] =
(for {
`Accept-Charset`(charsetRanges) <- requestHeaders
case `Accept-Charset`(charsetRanges) <- requestHeaders
range <- charsetRanges
} yield range).sortBy { // `sortBy` is stable, i.e. upholds the original order on identical keys
case _: HttpCharsetRange.`*` => 1f // most general, needs to come last
Expand Down Expand Up @@ -171,7 +171,7 @@ final class EncodingNegotiator(requestHeaders: Seq[HttpHeader]) {
*/
val acceptedEncodingRanges: List[HttpEncodingRange] =
(for {
`Accept-Encoding`(encodingRanges) <- requestHeaders
case `Accept-Encoding`(encodingRanges) <- requestHeaders
range <- encodingRanges
} yield range).sortBy { // `sortBy` is stable, i.e. upholds the original order on identical keys
case _: HttpEncodingRange.`*` => 1f // most general, needs to come last
Expand Down Expand Up @@ -230,7 +230,7 @@ final class LanguageNegotiator(requestHeaders: Seq[HttpHeader]) {
*/
val acceptedLanguageRanges: List[LanguageRange] =
(for {
`Accept-Language`(languageRanges) <- requestHeaders
case `Accept-Language`(languageRanges) <- requestHeaders
range <- languageRanges
} yield range).sortBy { // `sortBy` is stable, i.e. upholds the original order on identical keys
case _: LanguageRange.`*` => 1f // most general, needs to come last
Expand Down