You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/02/18 11:34:51 UTC
[incubator-pekko-http] branch main updated: update some akka refs (#70)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new f47c735e2 update some akka refs (#70)
f47c735e2 is described below
commit f47c735e20d62fa58ce81e43cb4f5d82a1c9272b
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sat Feb 18 12:34:47 2023 +0100
update some akka refs (#70)
* update some akka refs
* Update build.sbt
* build expects 'pekko.http.build.pekko.version'
---
.github/workflows/nightly.yml | 4 +--
CONTRIBUTING.md | 40 +++++++++++-----------
build.sbt | 19 +++++-----
.../paradox/client-side/client-https-support.md | 2 +-
.../main/paradox/client-side/client-transport.md | 2 +-
docs/src/main/paradox/common/encoding.md | 2 +-
docs/src/main/paradox/common/http-model.md | 8 ++---
docs/src/main/paradox/common/marshalling.md | 10 +++---
docs/src/main/paradox/common/unmarshalling.md | 8 ++---
docs/src/main/paradox/common/xml-support.md | 2 +-
docs/src/main/paradox/compatibility-guidelines.md | 2 +-
docs/src/main/paradox/contributing.md | 11 +++---
docs/src/main/paradox/introduction.md | 14 ++++----
docs/src/main/paradox/reference.md | 4 +--
.../routing-dsl/directives/alphabetically.md | 2 +-
.../directives/coding-directives/decodeRequest.md | 2 +-
.../coding-directives/decodeRequestWith.md | 2 +-
.../routing-dsl/directives/custom-directives.md | 2 +-
.../file-and-resource-directives/index.md | 2 +-
.../directives/future-directives/onComplete.md | 2 +-
.../main/paradox/routing-dsl/directives/index.md | 12 +++----
.../directives/route-directives/complete.md | 2 +-
.../directives/route-directives/handle.md | 2 +-
.../directives/route-directives/handleSync.md | 2 +-
.../directives/route-directives/index.md | 2 +-
.../directives/route-directives/reject.md | 2 +-
.../security-directives/authenticateBasic.md | 2 +-
.../security-directives/authenticateBasicAsync.md | 2 +-
.../security-directives/authenticateBasicPF.md | 2 +-
.../authenticateBasicPFAsync.md | 2 +-
.../security-directives/authenticateOAuth2.md | 2 +-
.../security-directives/authenticateOAuth2Async.md | 2 +-
.../security-directives/authenticateOAuth2PF.md | 2 +-
.../authenticateOAuth2PFAsync.md | 2 +-
.../main/paradox/routing-dsl/exception-handling.md | 2 +-
docs/src/main/paradox/routing-dsl/index.md | 4 +--
docs/src/main/paradox/routing-dsl/overview.md | 4 +--
docs/src/main/paradox/routing-dsl/rejections.md | 10 +++---
docs/src/main/paradox/routing-dsl/routes.md | 12 +++----
docs/src/main/paradox/routing-dsl/testkit.md | 2 +-
.../paradox/server-side/graceful-termination.md | 20 +++++------
docs/src/main/paradox/server-side/http2.md | 6 ++--
docs/src/main/paradox/server-side/low-level-api.md | 2 +-
.../main/paradox/server-side/websocket-support.md | 6 ++--
.../java/docs/http/javadsl/Http2ClientApp.java | 4 +--
.../test/java/docs/http/javadsl/ModelDocTest.java | 2 +-
.../javadsl/server/JsonStreamingExamplesTest.java | 2 +-
.../directives/FutureDirectivesExamplesTest.java | 4 +--
.../RespondWithDirectivesExamplesTest.java | 2 +-
.../directives/JsonStreamingExamplesSpec.scala | 8 ++---
http-bench-jmh/README.md | 6 ++--
.../unmarshalling/sse/LineParserBenchmark.scala | 2 +-
http-core/src/main/resources/reference.conf | 2 +-
.../http/impl/engine/rendering/RenderSupport.scala | 2 +-
.../apache/pekko/http/scaladsl/TestServer.scala | 2 +-
.../autobahn-jenkins/step-2-run-sbt-client.sh | 2 +-
.../autobahn-jenkins/step-5-server-tests-all.sh | 2 +-
http-scalafix/README.md | 2 +-
.../http/scaladsl/server/EntityStreamingSpec.scala | 20 +++++------
.../pekko/http/scaladsl/server/TestServer.scala | 2 +-
.../directives/FileUploadDirectivesSpec.scala | 4 +--
.../server/directives/ContentTypeResolver.java | 2 +-
.../pekko/http/scaladsl/Http2ServerTest.scala | 2 +-
scripts/commits-for-release-notes.sh | 24 ++++++-------
scripts/release-train-issue-template.md | 2 +-
65 files changed, 169 insertions(+), 175 deletions(-)
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c20be4f5c..79ed59cb0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -39,10 +39,10 @@ jobs:
key: build-target-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
- name: Compile everything
- run: sbt -Dakka.http.build.akka.version=${{ matrix.PEKKO_VERSION }} ++${{ matrix.SCALA_VERSION }} Test/compile
+ run: sbt -Dpekko.http.build.pekko.version=${{ matrix.PEKKO_VERSION }} ++${{ matrix.SCALA_VERSION }} Test/compile
- name: Run all tests JDK ${{ matrix.JABBA_JDK }}, Scala ${{ matrix.SCALA_VERSION }}, Akka ${{ matrix.PEKKO_VERSION }}
- run: sbt -Dakka.http.parallelExecution=false -Dakka.test.timefactor=2 -Dakka.http.build.akka.version=${{ matrix.PEKKO_VERSION }} ++${{ matrix.SCALA_VERSION }} mimaReportBinaryIssues test
+ run: sbt -Dakka.http.parallelExecution=false -Dakka.test.timefactor=2 -Dpekko.http.build.pekko.version=${{ matrix.PEKKO_VERSION }} ++${{ matrix.SCALA_VERSION }} mimaReportBinaryIssues test
- name: Upload test results
uses: actions/upload-artifact@v2 # upload test results
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da4f8a8d5..43ae59352 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ We follow the standard GitHub [fork & pull](https://help.github.com/articles/usi
You're always welcome to submit your PR straight away and start the discussion (without reading the rest of this wonderful doc, or the README.md). The goal of these notes is to make your experience contributing to Pekko HTTP as smooth and pleasant as possible. We're happy to guide you through the process once you've submitted your PR.
-# The Pekko Community
+# The Apache Pekko Community
If you have questions about the contribution process or discuss specific issues, please interact with the community using the following resources.
@@ -22,7 +22,7 @@ Depending on which version (or sometimes module) you want to work on, you should
## Tags
-Pekko-http uses tags to categorise issues into groups or mark their phase in development.
+Pekko HTTP uses tags to categorise issues into groups or mark their phase in development.
Most notably many tags start `t:` prefix (as in `topic:`), which categorises issues in terms of which module they relate to. Examples are:
@@ -52,7 +52,7 @@ Pull Request validation states:
- `validating => [tested | needs-attention]` - signify pull request validation status
-# Pekko-http contributing guidelines
+# Pekko HTTP contributing guidelines
These guidelines apply to all Apache Pekko projects, by which we mean both the `apache/incubator-pekko` repository,
as well as any plugins or additional repos located under the Pekko GitHub organisation, e.g. `apache/incubator-pekko-http` and others.
@@ -70,7 +70,7 @@ The steps are exactly the same for everyone involved in the project (be it core
1. To avoid duplicated effort, it might be good to check the [issue tracker](https://github.com/apache/incubator-pekko-http/issues) and [existing pull requests](https://github.com/apache/incubator-pekko-http/pulls) for existing work.
- If there is no ticket yet, feel free to [create one](https://github.com/apache/incubator-pekko-http/issues/new) to discuss the problem and the approach you want to take to solve it.
-1. [Fork the project](https://github.com/apache/incubator-pekko-http#fork-destination-box) on GitHub. You'll need to create a feature-branch for your work on your fork, as this way you'll be able to submit a PullRequest against the mainline Pekko-http.
+1. [Fork the project](https://github.com/apache/incubator-pekko-http#fork-destination-box) on GitHub. You'll need to create a feature-branch for your work on your fork, as this way you'll be able to submit a PullRequest against the mainline Pekko HTTP.
1. Create a branch on your fork and work on the feature. For example: `git checkout -b wip-custom-headers-pekko-http`
- Please make sure to follow the general quality guidelines (specified below) when developing your patch.
- Please write additional tests covering your feature and adjust existing ones if needed before submitting your Pull Request. The `validatePullRequest` sbt task ([explained below](#the-validatepullrequest-task)) may come in handy to verify your changes are correct.
@@ -87,10 +87,10 @@ The steps are exactly the same for everyone involved in the project (be it core
The TL;DR; of the above very precise workflow version is:
-1. Fork pekko-http
+1. Fork incubator-pekko-http
2. Hack and test on your feature (on a branch)
3. Submit a PR
-4. Sign the an ASF CLA if necessary
+4. Sign the ASF CLA if necessary
4. Keep polishing it until received enough LGTM
5. Profit!
@@ -98,7 +98,7 @@ Note that the pekko-http sbt project is not as large as the Pekko one, so `sbt`
## The `validatePullRequest` task
-The Pekko-http build includes a special task called `validatePullRequest` which investigates the changes made as well as dirty
+The Pekko HTTP build includes a special task called `validatePullRequest` which investigates the changes made as well as dirty
(uncommitted changes) in your local working directory and figures out which projects are impacted by those changes,
then running tests only on those projects.
@@ -114,7 +114,7 @@ To use the task simply type, and the output should include entries like shown be
[info] Detected changes in directories: [docs, project, pekko-http-tests, pekko-protobuf, pekko-http-testkit, pekko-http, pekko-http-core, pekko-stream]
```
-By default changes are diffed with the `main` branch when working locally, if you want to validate against a different
+By default, changes are diffed with the `main` branch when working locally, if you want to validate against a different
target PR branch you can do so by setting the PR_TARGET_BRANCH environment variable for SBT:
```
@@ -123,11 +123,11 @@ PR_TARGET_BRANCH=origin/example sbt validatePullRequest
## Developing against Pekko `main`
-Pekko-http codebase has not been switched yet to support Pekko "core" libs. This will happen soon. We currently build with Akka "core" libs.
+Pekko HTTP codebase is currently built with snapshot versions of the Pekko core libraries.
-Since Pekko HTTP is released separately to Pekko "core" yet some features require changes in Pekko itself, it is sometimes very useful
+Since Pekko HTTP is released separately to Pekko "core", yet some features require changes in Pekko itself, it is sometimes very useful
to be able to develop Pekko HTTP with Pekko's sources used directly instead of the binary dependency. You can check out the Pekko
-repository and run sbt with `-Dakka.sources=$HOME/akka` to develop Pekko HTTP with Pekko as a source dependency instead of a binary one.
+repository and run sbt with `-Dpekko.sources=$HOME/akka` to develop Pekko HTTP with Pekko as a source dependency instead of a binary one.
This allows simple and fast iterations on changes that would need to be introduced in Pekko to develop a feature in HTTP that would require those.
@@ -135,7 +135,7 @@ This allows simple and fast iterations on changes that would need to be introduc
Binary compatibility rules and guarantees are described in depth in the [Binary Compatibility Rules
](https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html) section of the documentation.
-Pekko-http uses MiMa (which is short for [Lightbend Migration Manager](https://github.com/lightbend/migration-manager)) to
+Pekko HTTP uses MiMa (which is short for [Lightbend Migration Manager](https://github.com/lightbend/migration-manager)) to
validate binary compatibility of incoming Pull Requests. If your PR fails due to binary compatibility issues, you may see
an error like this:
@@ -145,10 +145,10 @@ an error like this:
[error] filter with: ProblemFilters.exclude[ReversedMissingMethodProblem]("org.apache.pekko.stream.scaladsl.FlowOps.foldAsync")
```
-In such situations it's good to consult with a core team member if the violation can be safely ignored (by adding the above snippet to the project's
+In such situations, it's good to consult with a core team member if the violation can be safely ignored (by adding the above snippet to the project's
`src/main/mima-filters`), or if it would indeed break binary compatibility.
-Situations when it may be fine to ignore a MiMa issued warning include:
+Situations where it may be fine to ignore a MiMa issued warning include:
- if it is touching any class marked as `private[pekko]`, `/** INTERNAL API*/` or similar markers
- if it is concerning internal classes (often recognizable by package names like `dungeon`, `impl`, `internal` etc.)
@@ -163,7 +163,7 @@ incompatibility has been successfully ignored after adding it to the filter file
## Pull Request Requirements
-For a Pull Request to be considered at all it has to meet these requirements:
+For a Pull Request to be considered at all, it has to meet these requirements:
1. Regardless if the code introduces new features or fixes bugs or regressions, it must have comprehensive tests.
1. The code must be well documented in the Lightbend's standard documentation format (see the ‘Documentation’ section below).
@@ -173,7 +173,7 @@ For a Pull Request to be considered at all it has to meet these requirements:
1. All source files in the project must have a Apache copyright notice in the file header.
1. The Notices file for the project includes the Apache copyright notice and no other files contain copyright notices. See https://www.apache.org/legal/src-headers.html for instructions for managing this approach for copyrights.
- Pekko-http uses the first choice, having copyright notices in every file header.
+ Pekko HTTP uses the first choice, having copyright notices in every file header.
### Additional guidelines
@@ -214,7 +214,7 @@ The rendered documentation will be available under `docs/target/paradox/site/mai
### JavaDoc
-Pekko-http generates JavaDoc-style API documentation using the [genjavadoc](https://github.com/lightbend/genjavadoc) sbt plugin, since the sources are written mostly in Scala.
+Pekko HTTP generates JavaDoc-style API documentation using the [genjavadoc](https://github.com/lightbend/genjavadoc) sbt plugin, since the sources are written mostly in Scala.
Generating JavaDoc is not enabled by default, as it's not needed on day-to-day development as it's expected to just work.
If you'd like to check if you links and formatting looks good in JavaDoc (and not only in ScalaDoc), you can generate it by running:
@@ -277,9 +277,9 @@ git config blame.ignoreRevsFile .git-blame-ignore-revs
## Pull request validation workflow details
-Pekko-http uses Github Actions to validate PRs. It builds it, runs the tests and comments on the Pull Request in GitHub.
+Pekko HTTP uses Github Actions to validate PRs. It builds it, runs the tests and comments on the Pull Request in GitHub.
-In order to speed up PR validation times, the Pekko-http build contains a special sbt task called `validatePullRequest`,
+In order to speed up PR validation times, the Pekko HTTP build contains a special sbt task called `validatePullRequest`,
which is smart enough to figure out which projects should be built if a PR only has changes in some parts of the project.
For example, if your PR only touches `pekko-http-testkit`, no `pekko-parsing` tests need to be run, however the task
will validate all projects that depend on `pekko-http-testkit` (including samples).
@@ -293,7 +293,7 @@ the validator to test all projects.
### Scala style
-Pekko-http uses [scalafmt](https://scalameta.org/scalafmt/) to enforce some of the code style rules.
+Pekko HTTP uses [scalafmt](https://scalameta.org/scalafmt/) to enforce some of the code style rules.
### Java style
diff --git a/build.sbt b/build.sbt
index bdf694927..74adc76f8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -15,12 +15,12 @@ inThisBuild(Def.settings(
organization := "org.apache.pekko",
apiURL := {
val apiVersion = if (isSnapshot.value) "current" else version.value
- Some(url(s"https://doc.akka.io/api/akka-http/$apiVersion/"))
+ Some(url(s"https://pekko.apache.org/api/pekko-http/$apiVersion/"))
},
scmInfo := Some(
ScmInfo(url("https://github.com/apache/incubator-pekko-http"), "git@github.com:apache/incubator-pekko-http.git")),
licenses := Seq("Apache-2.0" -> url("https://opensource.org/licenses/Apache-2.0")),
- description := "Pekko Http: Modern, fast, asynchronous, streaming-first HTTP server and client.",
+ description := "Apache Pekko Http: Modern, fast, asynchronous, streaming-first HTTP server and client.",
testOptions ++= Seq(
Tests.Argument(TestFrameworks.JUnit, "-q", "-v"),
Tests.Argument(TestFrameworks.ScalaTest, "-oDF")),
@@ -421,24 +421,21 @@ lazy val docs = project("docs")
paradoxGroups := Map("Language" -> Seq("Scala", "Java")),
Compile / paradoxProperties ++= Map(
"project.name" -> "Apache Pekko HTTP",
- "canonical.base_url" -> "https://pekko.apache.org/docs/akka-http/current",
- "akka.version" -> PekkoDependency.docs.version,
+ "canonical.base_url" -> "https://pekko.apache.org/docs/pekko-http/current",
+ "pekko.version" -> PekkoDependency.docs.version,
"akka.minimum.version25" -> PekkoDependency.minimumExpectedPekkoVersion,
"akka.minimum.version26" -> PekkoDependency.minimumExpectedPekko26Version,
"jackson.xml.version" -> Dependencies.jacksonXmlVersion,
"scalafix.version" -> _root_.scalafix.sbt.BuildInfo.scalafixVersion, // grab from scalafix plugin directly
"extref.pekko-docs.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s",
- "javadoc.akka.http.base_url" -> {
- val v = if (isSnapshot.value) "current" else version.value
- s"https://doc.akka.io/japi/akka-http/$v"
- },
"javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${PekkoDependency.docs.link}",
"javadoc.akka.link_style" -> "direct",
- "scaladoc.akka.http.base_url" -> {
+ "scaladoc.pekko.http.base_url" -> {
val v = if (isSnapshot.value) "current" else version.value
- s"https://doc.akka.io/api/akka-http/$v"
+ s"https://pekko.apache.org/api/pekko/current/$v/org/apache"
},
- "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${PekkoDependency.docs.link}",
+ "scaladoc.pekko.base_url" -> "https://pekko.apache.org/api/pekko/current/org/apache",
+ "javadoc.base_url" -> "https://pekko.apache.org/japi/pekko-http/current/org/apache",
"algolia.docsearch.api_key" -> "0ccbb8bf5148554a406fbf07df0a93b9",
"algolia.docsearch.index_name" -> "akka-http",
"google.analytics.account" -> "UA-21117439-1",
diff --git a/docs/src/main/paradox/client-side/client-https-support.md b/docs/src/main/paradox/client-side/client-https-support.md
index 32de026dc..43bb03513 100644
--- a/docs/src/main/paradox/client-side/client-https-support.md
+++ b/docs/src/main/paradox/client-side/client-https-support.md
@@ -12,7 +12,7 @@ Java
: @@snip [ConnectionContext.scala](/http-core/src/main/scala/org/apache/pekko/http/javadsl/ConnectionContext.scala) { #https-client-context-creation }
In addition to the `outgoingConnection`, `newHostConnectionPool` and `cachedHostConnectionPool` methods the
-@scala[@scaladoc[org.apache.pekko.http.scaladsl.Http](akka.http.scaladsl.Http$)]@java[@javadoc[org.apache.pekko.http.javadsl.Http](akka.http.javadsl.Http)]
+@scala[@scaladoc[org.apache.pekko.http.scaladsl.Http](org.apache.pekko.http.scaladsl.Http$)]@java[@javadoc[org.apache.pekko.http.javadsl.Http](org.apache.pekko.http.javadsl.Http)]
extension also defines `outgoingConnectionHttps`, `newHostConnectionPoolHttps` and
`cachedHostConnectionPoolHttps`. These methods work identically to their counterparts without the `-Https` suffix,
with the exception that all connections will always be encrypted.
diff --git a/docs/src/main/paradox/client-side/client-transport.md b/docs/src/main/paradox/client-side/client-transport.md
index 68a8058b7..719593bcd 100644
--- a/docs/src/main/paradox/client-side/client-transport.md
+++ b/docs/src/main/paradox/client-side/client-transport.md
@@ -2,7 +2,7 @@
The client side infrastructure has support to plug different transport mechanisms underneath (the API may still change in the future). A client side
transport is represented by an instance of
-@scala[@scaladoc[org.apache.pekko.http.scaladsl.ClientTransport](akka.http.scaladsl.ClientTransport)]@java[@javadoc[org.apache.pekko.http.javadsl.ClientTransport](akka.http.javadsl.ClientTransport)]:
+@scala[@scaladoc[org.apache.pekko.http.scaladsl.ClientTransport](org.apache.pekko.http.scaladsl.ClientTransport)]@java[@javadoc[org.apache.pekko.http.javadsl.ClientTransport](org.apache.pekko.http.javadsl.ClientTransport)]:
Scala
: @@snip [ClientTransport.scala](/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ClientTransport.scala) { #client-transport-definition }
diff --git a/docs/src/main/paradox/common/encoding.md b/docs/src/main/paradox/common/encoding.md
index 28ee01f7c..331097df8 100644
--- a/docs/src/main/paradox/common/encoding.md
+++ b/docs/src/main/paradox/common/encoding.md
@@ -5,7 +5,7 @@ The [HTTP spec](https://tools.ietf.org/html/rfc7231#section-3.1.2.1) defines a `
Currently, Apache Pekko HTTP supports the compression and decompression of HTTP requests and responses with the `gzip` or
`deflate` encodings.
-The core logic for this lives in the @scala[@scaladoc[org.apache.pekko.http.scaladsl.coding](akka.http.scaladsl.coding.index) package.]@java[@javadoc[org.apache.pekko.http.javadsl.coding.Coder](akka.http.javadsl.coding.Coder) enum class.]
+The core logic for this lives in the @scala[@scaladoc[org.apache.pekko.http.scaladsl.coding](org.apache.pekko.http.scaladsl.coding.index) package.]@java[@javadoc[org.apache.pekko.http.javadsl.coding.Coder](org.apache.pekko.http.javadsl.coding.Coder) enum class.]
## Server side
diff --git a/docs/src/main/paradox/common/http-model.md b/docs/src/main/paradox/common/http-model.md
index ce9c017f3..0c70a39ac 100644
--- a/docs/src/main/paradox/common/http-model.md
+++ b/docs/src/main/paradox/common/http-model.md
@@ -384,7 +384,7 @@ types (such as matching a custom header against a @apidoc[RawHeader] in routing
@@@
@@@ note { .group-java }
-Implement @apidoc[ModeledCustomHeader] and @java[@javadoc[ModeledCustomHeaderFactory](akka.http.javadsl.model.headers.ModeledCustomHeaderFactory)] instead of @apidoc[CustomHeader] to be
+Implement @apidoc[ModeledCustomHeader] and @java[@javadoc[ModeledCustomHeaderFactory](org.apache.pekko.http.javadsl.model.headers.ModeledCustomHeaderFactory)] instead of @apidoc[CustomHeader] to be
able to use the convenience methods that allow parsing the custom user-defined header from @apidoc[HttpHeader].
@@@
@@ -426,7 +426,7 @@ or @scala[`Http().superPool`]@java[`Http.get(sys).superPool`], usually need the
<a id="registeringcustommediatypes"></a>
## Registering Custom Media Types
-Apache Pekko HTTP @scala[@scaladoc[predefines](akka.http.scaladsl.model.MediaTypes$)]@java[@javadoc[predefines](akka.http.javadsl.model.MediaTypes)] most commonly encountered media types and emits them in their well-typed form while parsing http messages.
+Apache Pekko HTTP @scala[@scaladoc[predefines](org.apache.pekko.http.scaladsl.model.MediaTypes$)]@java[@javadoc[predefines](org.apache.pekko.http.javadsl.model.MediaTypes)] most commonly encountered media types and emits them in their well-typed form while parsing http messages.
Sometimes you may want to define a custom media type and inform the parser infrastructure about how to handle these custom
media types, e.g. that `application/custom` is to be treated as `NonBinary` with `WithFixedCharset`. To achieve this you
need to register the custom media type in the server's settings by configuring @apidoc[ParserSettings] like this:
@@ -443,7 +443,7 @@ in the right style / place.
<a id="registeringcustomstatuscodes"></a>
## Registering Custom Status Codes
-Similarly to media types, Apache Pekko HTTP @scala[@scaladoc:[predefines](akka.http.scaladsl.model.StatusCodes$)]@java[@javadoc:[predefines](akka.http.javadsl.model.StatusCodes)]
+Similarly to media types, Apache Pekko HTTP @scala[@scaladoc:[predefines](org.apache.pekko.http.scaladsl.model.StatusCodes$)]@java[@javadoc:[predefines](org.apache.pekko.http.javadsl.model.StatusCodes)]
well-known status codes, however sometimes you may need to use a custom one (or are forced to use an API which returns custom status codes).
Similarly to the media types registration, you can register custom status codes by configuring @apidoc[ParserSettings] like this:
@@ -456,7 +456,7 @@ Java
<a id="registeringcustommethod"></a>
## Registering Custom HTTP Method
-Apache Pekko HTTP also allows you to define custom HTTP methods, other than the well-known methods @scala[@scaladoc[predefined](akka.http.scaladsl.model.HttpMethods$)]@java[@javadoc[predefined](akka.http.javadsl.model.HttpMethods)] in Apache Pekko HTTP.
+Apache Pekko HTTP also allows you to define custom HTTP methods, other than the well-known methods @scala[@scaladoc[predefined](org.apache.pekko.http.scaladsl.model.HttpMethods$)]@java[@javadoc[predefined](org.apache.pekko.http.javadsl.model.HttpMethods)] in Apache Pekko HTTP.
To use a custom HTTP method, you need to define it, and then add it to parser settings like below:
Scala
diff --git a/docs/src/main/paradox/common/marshalling.md b/docs/src/main/paradox/common/marshalling.md
index 0d777c368..250111c97 100644
--- a/docs/src/main/paradox/common/marshalling.md
+++ b/docs/src/main/paradox/common/marshalling.md
@@ -56,7 +56,7 @@ Specifically these are:
@@@ div { .group-scala }
- * @scaladoc[PredefinedToEntityMarshallers](akka.http.scaladsl.marshalling.PredefinedToEntityMarshallers)
+ * @scaladoc[PredefinedToEntityMarshallers](org.apache.pekko.http.scaladsl.marshalling.PredefinedToEntityMarshallers)
* `Array[Byte]`
* @apidoc[org.apache.pekko.util.ByteString]
* `Array[Char]`
@@ -64,7 +64,7 @@ Specifically these are:
* `org.apache.pekko.http.scaladsl.model.FormData`
* `org.apache.pekko.http.scaladsl.model.MessageEntity`
* `T <: org.apache.pekko.http.scaladsl.model.Multipart`
- * @scaladoc[PredefinedToResponseMarshallers](akka.http.scaladsl.marshalling.PredefinedToResponseMarshallers)
+ * @scaladoc[PredefinedToResponseMarshallers](org.apache.pekko.http.scaladsl.marshalling.PredefinedToResponseMarshallers)
* `T`, if a `ToEntityMarshaller[T]` is available
* @apidoc[HttpResponse]
* @apidoc[StatusCode]
@@ -72,12 +72,12 @@ Specifically these are:
* `(Int, T)`, if a `ToEntityMarshaller[T]` is available
* `(StatusCode, immutable.Seq[HttpHeader], T)`, if a `ToEntityMarshaller[T]` is available
* `(Int, immutable.Seq[HttpHeader], T)`, if a `ToEntityMarshaller[T]` is available
- * @scaladoc[PredefinedToRequestMarshallers](akka.http.scaladsl.marshalling.PredefinedToRequestMarshallers)
+ * @scaladoc[PredefinedToRequestMarshallers](org.apache.pekko.http.scaladsl.marshalling.PredefinedToRequestMarshallers)
* @apidoc[HttpRequest]
* @apidoc[Uri]
* `(HttpMethod, Uri, T)`, if a `ToEntityMarshaller[T]` is available
* `(HttpMethod, Uri, immutable.Seq[HttpHeader], T)`, if a `ToEntityMarshaller[T]` is available
- * @scaladoc[GenericMarshallers](akka.http.scaladsl.marshalling.GenericMarshallers)
+ * @scaladoc[GenericMarshallers](org.apache.pekko.http.scaladsl.marshalling.GenericMarshallers)
* @apidoc[Marshaller[Throwable, T]]
* @apidoc[Marshaller[Option[A], B]], if a @apidoc[Marshaller[A, B]] and an `EmptyValue[B]` is available
* @apidoc[Marshaller[Either[A1, A2], B]], if a @apidoc[Marshaller[A1, B]] and a @apidoc[Marshaller[A2, B]] is available
@@ -172,7 +172,7 @@ request using the @ref[Routing DSL](../routing-dsl/index.md).
@@@ div { .group-scala }
However, you can also use the marshalling infrastructure directly if you wish, which can be useful for example in tests.
-The best entry point for this is the @scaladoc[Marshal](akka.http.scaladsl.marshalling.Marshal) object, which you can use like this:
+The best entry point for this is the @scaladoc[Marshal](org.apache.pekko.http.scaladsl.marshalling.Marshal) object, which you can use like this:
@@snip [MarshalSpec.scala](/docs/src/test/scala/docs/http/scaladsl/MarshalSpec.scala) { #use-marshal }
diff --git a/docs/src/main/paradox/common/unmarshalling.md b/docs/src/main/paradox/common/unmarshalling.md
index 7134e6408..e7d9763af 100644
--- a/docs/src/main/paradox/common/unmarshalling.md
+++ b/docs/src/main/paradox/common/unmarshalling.md
@@ -32,8 +32,8 @@ For the client side, see @ref[Processing Responses](../client-side/request-and-r
Apache Pekko HTTP already predefines a number of unmarshallers for the most common types.
Specifically these are:
- * @scala[@scaladoc[PredefinedFromStringUnmarshallers](akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers)]
- @java[@javadoc[StringUnmarshallers](akka.http.javadsl.unmarshalling.StringUnmarshallers)]
+ * @scala[@scaladoc[PredefinedFromStringUnmarshallers](org.apache.pekko.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers)]
+ @java[@javadoc[StringUnmarshallers](org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers)]
* `Byte`
* `Short`
* @scala[`Int`]@java[`Integer`]
@@ -41,7 +41,7 @@ Specifically these are:
* `Float`
* `Double`
* `Boolean`
- * @scala[@scaladoc[PredefinedFromEntityUnmarshallers](akka.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers)]
+ * @scala[@scaladoc[PredefinedFromEntityUnmarshallers](org.apache.pekko.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers)]
@java[@apidoc[Unmarshaller]]
* @scala[`Array[Byte]`]@java[`byte[]`]
* @apidoc[org.apache.pekko.util.ByteString]
@@ -50,7 +50,7 @@ Specifically these are:
* @scala[`org.apache.pekko.http.scaladsl.model.FormData`]@java[`org.apache.pekko.http.javadsl.model.FormData`]
@@@ div { .group-scala }
- * @scaladoc[GenericUnmarshallers](akka.http.scaladsl.unmarshalling.GenericUnmarshallers)
+ * @scaladoc[GenericUnmarshallers](org.apache.pekko.http.scaladsl.unmarshalling.GenericUnmarshallers)
* @apidoc[Unmarshaller[T, T]](Unmarshaller) (identity unmarshaller)
* @apidoc[Unmarshaller[Option[A], B]], if an @apidoc[Unmarshaller[A, B]] is available
* @apidoc[Unmarshaller[A, Option[B]]], if an @apidoc[Unmarshaller[A, B]] is available
diff --git a/docs/src/main/paradox/common/xml-support.md b/docs/src/main/paradox/common/xml-support.md
index 4656a1602..81b5929eb 100644
--- a/docs/src/main/paradox/common/xml-support.md
+++ b/docs/src/main/paradox/common/xml-support.md
@@ -29,7 +29,7 @@ For XML Apache Pekko HTTP currently provides support for [Scala XML][scala-xml]
## Scala XML Support
-The @scaladoc[ScalaXmlSupport](akka.http.scaladsl.marshallers.xml.ScalaXmlSupport) trait provides a `FromEntityUnmarshaller[NodeSeq]` and `ToEntityMarshaller[NodeSeq]` that
+The @scaladoc[ScalaXmlSupport](org.apache.pekko.http.scaladsl.marshallers.xml.ScalaXmlSupport) trait provides a `FromEntityUnmarshaller[NodeSeq]` and `ToEntityMarshaller[NodeSeq]` that
you can use directly or build upon.
In order to enable support for (un)marshalling from and to XML with [Scala XML][scala-xml] `NodeSeq` you must add
diff --git a/docs/src/main/paradox/compatibility-guidelines.md b/docs/src/main/paradox/compatibility-guidelines.md
index 89be5a6cd..c3181a7d7 100644
--- a/docs/src/main/paradox/compatibility-guidelines.md
+++ b/docs/src/main/paradox/compatibility-guidelines.md
@@ -139,7 +139,7 @@ The same goes for `pekko-http-testkit`: If the testkit is used, explicitly decla
@@dependency [sbt,Gradle,Maven] {
symbol1=PekkoVersion
- value1=$akka.version$
+ value1=$pekko.version$
bomGroup2=org.apache.pekko
bomArtifact2=pekko-http-bom_$scala.binary.version$
bomVersionSymbols2=PekkoHttpVersion
diff --git a/docs/src/main/paradox/contributing.md b/docs/src/main/paradox/contributing.md
index ac6e587fe..12be79c3c 100644
--- a/docs/src/main/paradox/contributing.md
+++ b/docs/src/main/paradox/contributing.md
@@ -10,13 +10,13 @@ For a more detailed description of our process, please refer to the [CONTRIBUTIN
Testing snapshot versions can help us find bugs before a release. We publish snapshot versions for every commit to the `main` branch.
-The latest published snapshot version is [![SonatypeSnapshots-badge][]][SonatypeSnapshots].
+The latest published snapshot version can be found in [SonatypeSnapshots].
### Configure repository
sbt
: ```scala
- resolvers += "akka-http-snapshot-repository" at "https://oss.sonatype.org/content/repositories/snapshots"
+ resolvers += "pekko-http-snapshot-repository" at "https://repository.apache.org/content/repositories/snapshots"
```
Maven
@@ -27,7 +27,7 @@ Maven
<repository>
<id>pekko-http-snapshots</id>
<name>Pekko HTTP Snapshots</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
</repository>
</repositories>
...
@@ -38,10 +38,9 @@ Gradle
: ```gradle
repositories {
maven {
- url "https://oss.sonatype.org/content/repositories/snapshots"
+ url "https://repository.apache.org/content/repositories/snapshots"
}
}
```
-[SonatypeSnapshots-badge]: https://img.shields.io/nexus/s/https/oss.sonatype.org/com.typesafe.akka/akka-http-core_2.13.svg
-[SonatypeSnapshots]: https://oss.sonatype.org/content/repositories/snapshots/com/typesafe/akka/akka-http-core_2.13/
+[SonatypeSnapshots]: https://repository.apache.org/content/repositories/snapshots/org/apache/pekko/pekko-http-core_2.13/
diff --git a/docs/src/main/paradox/introduction.md b/docs/src/main/paradox/introduction.md
index ab381f0e0..f7d206366 100644
--- a/docs/src/main/paradox/introduction.md
+++ b/docs/src/main/paradox/introduction.md
@@ -34,7 +34,7 @@ choose an Apache Pekko version to run against and add a manual dependency to `pe
@@dependency [sbt,Gradle,Maven] {
symbol1=PekkoVersion
- value1=$akka.version$
+ value1=$pekko.version$
bomGroup2="org.apache.pekko" bomArtifact2="pekko-http-bom_$scala.binary.version$" bomVersionSymbols2="PekkoHttpVersion"
symbol2="PekkoHttpVersion"
value2="$project.version$"
@@ -52,20 +52,20 @@ Alternatively, you can bootstrap a new project with Apache Pekko HTTP already co
@@@ div { .group-scala }
For Scala (sbt)
: ```sh
- sbt new akka/pekko-http-quickstart-scala.g8
+ sbt new akka/akka-http-quickstart-scala.g8
```
@@@
@@@ div { .group-java }
For Java (Maven or Gradle)
: ```sh
- sbt new akka/pekko-http-quickstart-java.g8
+ sbt new akka/akka-http-quickstart-java.g8
```
From there on the prepared project can be built using Gradle or Maven.
@@@
More instructions can be found on the @scala[[template
-project](https://github.com/akka/pekko-http-quickstart-scala.g8)]@java[[template
-project](https://github.com/akka/pekko-http-quickstart-java.g8)].
+project](https://github.com/akka/akka-http-quickstart-scala.g8)]@java[[template
+project](https://github.com/akka/akka-http-quickstart-java.g8)].
## Routing DSL for HTTP servers
@@ -78,8 +78,8 @@ narrowing it down to only handle HTTP `get` requests and then `complete` those w
will be sent back as an HTTP OK with the string as response body.
The
-@scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]
-@java[@javadoc[Route](akka.http.javadsl.server.Route)]
+@scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]
+@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)]
created using the Route DSL is then "bound" to a port to start serving HTTP requests:
Scala
diff --git a/docs/src/main/paradox/reference.md b/docs/src/main/paradox/reference.md
index 15b6526d2..ec2c2d7d9 100644
--- a/docs/src/main/paradox/reference.md
+++ b/docs/src/main/paradox/reference.md
@@ -2,8 +2,8 @@
## API Documentation
- * @scaladoc:[Scaladoc](akka.http.scaladsl.index)
- * @javadoc:[Javadoc](akka.http.javadsl.package-summary)
+ * @scaladoc:[Scaladoc](org.apache.pekko.http.scaladsl.index)
+ * @javadoc:[Javadoc](org.apache.pekko.http.javadsl.package-summary)
## Directives
diff --git a/docs/src/main/paradox/routing-dsl/directives/alphabetically.md b/docs/src/main/paradox/routing-dsl/directives/alphabetically.md
index 750dbbe19..4ee3e146f 100644
--- a/docs/src/main/paradox/routing-dsl/directives/alphabetically.md
+++ b/docs/src/main/paradox/routing-dsl/directives/alphabetically.md
@@ -84,7 +84,7 @@
|@ref[logRequest](debugging-directives/logRequest.md) | Produces a log entry for every incoming request |
|@ref[logRequestResult](debugging-directives/logRequestResult.md) | Produces a log entry for every incoming request and @apidoc[RouteResult] |
|@ref[logResult](debugging-directives/logResult.md) | Produces a log entry for every @apidoc[RouteResult] |
-|@ref[mapInnerRoute](basic-directives/mapInnerRoute.md) | Transforms its inner @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] with a @scala[`Route => Route`]@java[`UnaryOperator<Route>`] function [...]
+|@ref[mapInnerRoute](basic-directives/mapInnerRoute.md) | Transforms its inner @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] with a @scala[`Route => Route`]@java[`UnaryOperator<Route>`] function [...]
|@ref[mapRejections](basic-directives/mapRejections.md) | Transforms rejections from a previous route with an @scala[`immutable.Seq[Rejection] => immutable.Seq[Rejection]`]@java[`UnaryOperator<List<Rejection>>`] function |
|@ref[mapRequest](basic-directives/mapRequest.md) | Transforms the request with an @scala[`HttpRequest => HttpRequest`]@java[`UnaryOperator<HttpRequest>`] function |
|@ref[mapRequestContext](basic-directives/mapRequestContext.md) | Transforms the @apidoc[RequestContext] with a @scala[`RequestContext => RequestContext`]@java[`UnaryOperator<RequestContext>`] function |
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md
index 0ae30e0f4..26bd19dd0 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md
@@ -13,7 +13,7 @@
Decompresses the incoming request if it is `gzip` or `deflate` compressed. Uncompressed requests are passed through untouched.
If the request encoded with another encoding the request is rejected with an @apidoc[UnsupportedRequestEncodingRejection].
If the request entity after decoding exceeds `akka.http.routing.decode-max-size` the stream fails with an
-@scala[@scaladoc[EntityStreamSizeException](akka.http.scaladsl.model.EntityStreamSizeException)]@java[@javadoc[EntityStreamSizeException](akka.http.scaladsl.model.EntityStreamSizeException)].
+@scala[@scaladoc[EntityStreamSizeException](org.apache.pekko.http.scaladsl.model.EntityStreamSizeException)]@java[@javadoc[EntityStreamSizeException](org.apache.pekko.http.scaladsl.model.EntityStreamSizeException)].
## Example
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md
index 0d3a1165a..fc5ed2bb7 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md
@@ -13,7 +13,7 @@
Decodes the incoming request if it is encoded with one of the given encoders.
If the request encoding doesn't match one of the given encoders the request is rejected with an @apidoc[UnsupportedRequestEncodingRejection]. If no decoders are given the default encoders (`Gzip`, `Deflate`, `NoCoding`) are used.
If the request entity after decoding exceeds `akka.http.routing.decode-max-size` the stream fails with an
-@scala[@scaladoc[EntityStreamSizeException](akka.http.scaladsl.model.EntityStreamSizeException)]@java[@javadoc[EntityStreamSizeException](akka.http.scaladsl.model.EntityStreamSizeException)].
+@scala[@scaladoc[EntityStreamSizeException](org.apache.pekko.http.scaladsl.model.EntityStreamSizeException)]@java[@javadoc[EntityStreamSizeException](org.apache.pekko.http.scaladsl.model.EntityStreamSizeException)].
## Example
diff --git a/docs/src/main/paradox/routing-dsl/directives/custom-directives.md b/docs/src/main/paradox/routing-dsl/directives/custom-directives.md
index e02234713..d6f1f12dd 100644
--- a/docs/src/main/paradox/routing-dsl/directives/custom-directives.md
+++ b/docs/src/main/paradox/routing-dsl/directives/custom-directives.md
@@ -39,7 +39,7 @@ together in the @ref[BasicDirectives](basic-directives/index.md) trait.
## Transforming Directives
The second option for creating new directives is to transform an existing one using one of the
-“transformation methods”, which are defined on the @scaladoc[Directive](akka.http.scaladsl.server.Directive) class, the base class of all “regular” directives.
+“transformation methods”, which are defined on the @scaladoc[Directive](org.apache.pekko.http.scaladsl.server.Directive) class, the base class of all “regular” directives.
Apart from the combinator operators (`|` and `&`) and the case-class extractor (`as[T]`)
the following transformations are also defined on all `Directive` instances:
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/index.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/index.md
index 920ef27ec..698764c6f 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/index.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/index.md
@@ -2,7 +2,7 @@
Like the @ref[RouteDirectives](../route-directives/index.md) the @apidoc[FileAndResourceDirectives] are somewhat
special in pekko-http's routing DSL. Most other directives wrap an inner route and are therefore used as inner nodes of
-the route tree. These directives, instead, are indeed instance of @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)], i.e. **leaves** of the route tree that handle a
+the route tree. These directives, instead, are indeed instance of @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)], i.e. **leaves** of the route tree that handle a
request themselves without passing it on to an inner route.
So in most cases the inner-most element of a route structure branch is one of the @ref[RouteDirectives](../route-directives/index.md) or
diff --git a/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md b/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md
index 371692fff..7caa0f598 100644
--- a/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md
+++ b/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md
@@ -32,5 +32,5 @@ Using the `onComplete` directive means that you'll have to explicitly and manual
@@@
@@@ note { .group-scala }
-The identically named `onComplete` method of Scala's `Future` (from the standard library) does not work at all in this context since it's just a method that returns `Unit` - whereas Apache Pekko HTTP's `onComplete` is a `Directive` that creates a @scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult]).
+The identically named `onComplete` method of Scala's `Future` (from the standard library) does not work at all in this context since it's just a method that returns `Unit` - whereas Apache Pekko HTTP's `onComplete` is a `Directive` that creates a @scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult]).
@@@
diff --git a/docs/src/main/paradox/routing-dsl/directives/index.md b/docs/src/main/paradox/routing-dsl/directives/index.md
index cc8e28bc9..0f422dbee 100644
--- a/docs/src/main/paradox/routing-dsl/directives/index.md
+++ b/docs/src/main/paradox/routing-dsl/directives/index.md
@@ -30,7 +30,7 @@ The @ref[complete](route-directives/complete.md) directive simply completes the
@@@ div { .group-scala }
-Since @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] is just a type alias for a function type @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Rou [...]
+Since @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] is just a type alias for a function type @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.h [...]
instances can be written, e.g. as a function literal:
```scala
@@ -59,7 +59,7 @@ Route route = complete("yeah");
@@@ div { .group-scala }
-These three ways of writing this @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] are fully equivalent, the created `route` will behave identically in all
+These three ways of writing this @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] are fully equivalent, the created `route` will behave identically in all
cases.
Let's look at a slightly more complicated example to highlight one important point in particular.
@@ -140,7 +140,7 @@ Here, the inner route of the @ref[get](method-directives/get.md) directive is wr
However, as you can see from these examples, building routes with directives rather than "manually" results in code that
is a lot more concise and as such more readable and maintainable. In addition it provides for better composability (as
you will see in the coming sections). So, when using Apache Pekko HTTP's Routing DSL you should almost never have to fall back
-to creating routes via @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] function literals that directly manipulate the @ref[RequestContext](../routes.md#requestcontext).
+to creating routes via @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] function literals that directly manipulate the @ref[RequestContext](../routes.md#requestcontext).
@@@
@@ -197,7 +197,7 @@ It has a name, zero or more arguments and optionally an inner route (The @ref[Ro
are always used at the leaf-level and as such cannot have inner routes).
Additionally directives can "extract" a number of values and make them available to their inner routes as function
-arguments. When seen "from the outside" a directive with its inner route form an expression of type @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)].
+arguments. When seen "from the outside" a directive with its inner route form an expression of type @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)].
## What Directives do
@@ -256,7 +256,7 @@ Java
@@@ div { .group-scala }
-Or better (without dropping down to writing an explicit @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] function manually):
+Or better (without dropping down to writing an explicit @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] function manually):
@@snip [DirectiveExamplesSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/DirectiveExamplesSpec.scala) { #getOrPutUsingPipeAndExtractMethod }
@@ -370,7 +370,7 @@ anyOf(bindParameter(this::parameter, "foo"), bindParameter(this::parameter, "bar
```
In this previous example we make use of the `bindParameter` function located in `http/org.apache.pekko.http.javadsl.common.PartialApplication`.
In order to be able to call `anyOf`, we need to convert our directive that takes 2 parameters to a function that takes only 1.
-In this particular case we want to use the `parameter` directive that takes a `String` and a function from `String` to @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)],
+In this particular case we want to use the `parameter` directive that takes a `String` and a function from `String` to @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)],
so to be able to use it in combination with `anyOf`, we need to bind the first parameter to `foo` and to `bar` in the second one. `bindParameter(this::parameter, "foo")` is equivalent
to define your own function like this:
```java
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/complete.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/complete.md
index 76d3123f8..9444a6840 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/complete.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/complete.md
@@ -23,7 +23,7 @@ The signature shown is simplified, the real signature uses magnets. <a id="^1" h
Completes the request using the given argument(s).
-`complete` uses the given arguments to construct a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] which simply calls `complete` on the @apidoc[RequestContext]
+`complete` uses the given arguments to construct a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] which simply calls `complete` on the @apidoc[RequestContext]
with the respective @apidoc[HttpResponse] instance.
Completing the request will send the response "back up" the route structure where all the logic runs that wrapping
directives have potentially chained into the @ref[RouteResult](../../routes.md#routeresult) future transformation chain.
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md
index 5403ecf00..f8d2bf223 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md
@@ -10,7 +10,7 @@
## Description
-Creates a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)]
+Creates a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)]
that handles the request using a function or `PartialFunction` from @apidoc[HttpRequest] to a @scala[`Future`]@java[`CompletionStage`] of @apidoc[HttpResponse].
This directive can be used to include external components request processing components defined as a `Function` or `PartialFunction`
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md
index cef33320e..ad8bb2fcf 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md
@@ -10,7 +10,7 @@
## Description
-Creates a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)]
+Creates a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)]
that handles the request using a function or `PartialFunction` from @apidoc[HttpRequest] to a @apidoc[HttpResponse].
This directive can be used to include components into a routing tree that have been defined only in terms of the low-level model classes.
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/index.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/index.md
index 9ad1a578f..a7d89747d 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/index.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/index.md
@@ -2,7 +2,7 @@
The @apidoc[RouteDirectives] have a special role in akka-http's routing DSL. Contrary to all other directives (except most
@ref[FileAndResourceDirectives](../file-and-resource-directives/index.md)) they do not produce instances of type `Directive[L <: HList]` but rather "plain"
-routes of type @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)].
+routes of type @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)].
The reason is that the @apidoc[RouteDirectives] are not meant for wrapping an inner route (like most other directives, as
intermediate-level elements of a route structure, do) but rather form the leaves of the actual route structure **leaves**.
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md
index a58109e24..1ccef2f49 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md
@@ -12,7 +12,7 @@
Explicitly rejects the request optionally using the given rejection(s).
-`reject` uses the given rejection instances (which might be the empty `Seq`) to construct a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] which simply
+`reject` uses the given rejection instances (which might be the empty `Seq`) to construct a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] which simply
calls `requestContext.reject`. See the chapter on @ref[Rejections](../../rejections.md) for more information on what this means.
After the request has been rejected at the respective point it will continue to flow through the routing structure in
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md
index a62f20e25..95ab2f802 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[Authenticator[T]](akka.http.scaladsl.server.Directives#Authenticator[T]=akka.http.scaladsl.server.directives.Credentials=%3EOption[T])]@java[`Authenticator<T>` - function from `Optional<ProvidedCredentials>` to `Optional<T>`].
+Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[Authenticator[T]](org.apache.pekko.http.scaladsl.server.Directives#Authenticator[T]=org.apache.pekko.http.scaladsl.server.directives.Credentials=%3EOption[T])]@java[`Authenticator<T>` - function from `Optional<ProvidedCredentials>` to `Optional<T>`].
Provides support for handling [HTTP Basic Authentication](https://en.wikipedia.org/wiki/Basic_auth).
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md
index 334bc0ee4..4ab5bdffe 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[AsyncAuthenticator[T]](akka.http.scaladsl.server.Directives#AsyncAuthenticator[T]=akka.http.scaladsl.server.directives.Credentials=%3Escala.concurrent.Future[Option[T]])]@java[ `AsyncAuthenticator<T>` - function from `Optional<ProvidedCredentials>` to `CompletionStage<Optional<T>>`].
+Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[AsyncAuthenticator[T]](org.apache.pekko.http.scaladsl.server.Directives#AsyncAuthenticator[T]=org.apache.pekko.http.scaladsl.server.directives.Credentials=%3Escala.concurrent.Future[Option[T]])]@java[ `AsyncAuthenticator<T>` - function from `Optional<ProvidedCredentials>` to `CompletionStage<Optional<T>>`].
This variant of the @ref[authenticateBasic](authenticateBasic.md) directive returns a @scala[`Future[Option[T]]`]@java[`CompletionStage<Optional<T>>`] which allows freeing up the routing
layer of Apache Pekko HTTP, freeing it for other requests. It should be used whenever an authentication is expected to take
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md
index e72f1a5d3..9500e3a6c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[AuthenticatorPF[T]](akka.http.scaladsl.server.Directives#AuthenticatorPF[T]=PartialFunction[akka.http.scaladsl.server.directives.Credentials,T])]@java[`AuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `String`].
+Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[AuthenticatorPF[T]](org.apache.pekko.http.scaladsl.server.Directives#AuthenticatorPF[T]=PartialFunction[org.apache.pekko.http.scaladsl.server.directives.Credentials,T])]@java[`AuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `String`].
Provides support for handling [HTTP Basic Authentication](https://en.wikipedia.org/wiki/Basic_auth).
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md
index c8817757e..52d04205d 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[AsyncAuthenticatorPF[T]](akka.http.scaladsl.server.Directives#AsyncAuthenticatorPF[T]=PartialFunction[akka.http.scaladsl.server.directives.Credentials,scala.concurrent.Future[T]])]@java[`AsyncAuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `CompletionStage<User>`].
+Wraps the inner route with Http Basic authentication support using a given @scala[@scaladoc[AsyncAuthenticatorPF[T]](org.apache.pekko.http.scaladsl.server.Directives#AsyncAuthenticatorPF[T]=PartialFunction[org.apache.pekko.http.scaladsl.server.directives.Credentials,scala.concurrent.Future[T]])]@java[`AsyncAuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `CompletionStage<User>`].
Provides support for handling [HTTP Basic Authentication](https://en.wikipedia.org/wiki/Basic_auth).
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md
index 6fcf432d6..0a7b06c45 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[Authenticator[T]](akka.http.scaladsl.server.Directives#Authenticator[T]=akka.http.scaladsl.server.directives.Credentials=%3EOption[T])]@java[`Authenticator<T>` - function from `Optional<ProvidedCredentials>` to `Optional<T>`].
+Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[Authenticator[T]](org.apache.pekko.http.scaladsl.server.Directives#Authenticator[T]=org.apache.pekko.http.scaladsl.server.directives.Credentials=%3EOption[T])]@java[`Authenticator<T>` - function from `Optional<ProvidedCredentials>` to `Optional<T>`].
Provides support for extracting the so-called "*Bearer Token*" from the @apidoc[Authorization] HTTP Header,
which is used to initiate an OAuth2 authorization. The directive also supports extracting the Bearer Token from URI query parameter `access_token`, as described in [RFC 6750](https://tools.ietf.org/html/rfc6750).
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md
index 2b868af2c..1d6c16dcc 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[AsyncAuthenticator[T]](akka.http.scaladsl.server.Directives#AsyncAuthenticator[T]=akka.http.scaladsl.server.directives.Credentials=%3Escala.concurrent.Future[Option[T]])]@java[ `AsyncAuthenticator<T>` - function from `Optional<ProvidedCredentials>` to `CompletionStage<Optional<T>>`].
+Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[AsyncAuthenticator[T]](org.apache.pekko.http.scaladsl.server.Directives#AsyncAuthenticator[T]=org.apache.pekko.http.scaladsl.server.directives.Credentials=%3Escala.concurrent.Future[Option[T]])]@java[ `AsyncAuthenticator<T>` - function from `Optional<ProvidedCredentials>` to `CompletionStage<Optional<T>>`].
Provides support for extracting the so-called "*Bearer Token*" from the @apidoc[Authorization] HTTP Header,
which is used to initiate an OAuth2 authorization.
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md
index 9a8c6c7e1..6ff2a012f 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[AuthenticatorPF[T]](akka.http.scaladsl.server.Directives#AuthenticatorPF[T]=PartialFunction[akka.http.scaladsl.server.directives.Credentials,T])]@java[`AuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `String`].
+Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[AuthenticatorPF[T]](org.apache.pekko.http.scaladsl.server.Directives#AuthenticatorPF[T]=PartialFunction[org.apache.pekko.http.scaladsl.server.directives.Credentials,T])]@java[`AuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `String`].
Provides support for extracting the so-called "*Bearer Token*" from the @apidoc[Authorization] HTTP Header,
which is used to initiate an OAuth2 authorization.
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md
index aff75b046..c02d56c87 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md
@@ -11,7 +11,7 @@
## Description
-Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[AsyncAuthenticatorPF[T]](akka.http.scaladsl.server.Directives#AsyncAuthenticatorPF[T]=PartialFunction[akka.http.scaladsl.server.directives.Credentials,scala.concurrent.Future[T]])]@java[`AsyncAuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `CompletionStage<User>`].
+Wraps the inner route with OAuth Bearer Token authentication support using a given @scala[@scaladoc[AsyncAuthenticatorPF[T]](org.apache.pekko.http.scaladsl.server.Directives#AsyncAuthenticatorPF[T]=PartialFunction[org.apache.pekko.http.scaladsl.server.directives.Credentials,scala.concurrent.Future[T]])]@java[`AsyncAuthenticatorPF<T>` - Partial function from `Optional<ProvidedCredentials>` to `CompletionStage<User>`].
Provides support for extracting the so-called "*Bearer Token*" from the @apidoc[Authorization] HTTP Header,
which is used to initiate an OAuth2 authorization.
diff --git a/docs/src/main/paradox/routing-dsl/exception-handling.md b/docs/src/main/paradox/routing-dsl/exception-handling.md
index c1fa225ac..2723fe107 100644
--- a/docs/src/main/paradox/routing-dsl/exception-handling.md
+++ b/docs/src/main/paradox/routing-dsl/exception-handling.md
@@ -23,7 +23,7 @@ handle any exception.
So, if you'd like to customize the way certain exceptions are handled you need to write a custom @apidoc[ExceptionHandler].
Once you have defined your custom @apidoc[ExceptionHandler] you have two options for "activating" it:
- 1. @scala[Bring it into implicit scope at the top-level.]@java[Pass it to the `seal()` method of the @javadoc[Route](akka.http.javadsl.server.Route)]
+ 1. @scala[Bring it into implicit scope at the top-level.]@java[Pass it to the `seal()` method of the @javadoc[Route](org.apache.pekko.http.javadsl.server.Route)]
2. Supply it as argument to the @ref[handleExceptions](directives/execution-directives/handleExceptions.md) directive.
In the first case your handler will be "sealed" (which means that it will receive the default handler as a fallback for
diff --git a/docs/src/main/paradox/routing-dsl/index.md b/docs/src/main/paradox/routing-dsl/index.md
index 12f2d02d2..1cf938ae6 100644
--- a/docs/src/main/paradox/routing-dsl/index.md
+++ b/docs/src/main/paradox/routing-dsl/index.md
@@ -88,8 +88,8 @@ Scala
@@@
Next step is to define the
-@scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]
-@java[@javadoc[Route](akka.http.javadsl.server.Route)]
+@scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]
+@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)]
that will communicate with the previously defined behavior
and handle all its possible responses:
diff --git a/docs/src/main/paradox/routing-dsl/overview.md b/docs/src/main/paradox/routing-dsl/overview.md
index 70fe011a4..6566c3638 100644
--- a/docs/src/main/paradox/routing-dsl/overview.md
+++ b/docs/src/main/paradox/routing-dsl/overview.md
@@ -74,8 +74,8 @@ For learning how to work with the Routing DSL you should first understand the co
@@@ div { .group-scala }
> <a id="1" href="#^1">[1]</a> To be picked up automatically, the implicit conversion needs to be provided in the companion object of the source
-type. However, as @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] is just a type alias for `RequestContext => Future[RouteResult]`, there's no
-companion object for @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)]. Fortunately, the [implicit scope](https://www.scala-lang.org/files/archive/spec/2.11/07-implicits.html#implicit-parameters) for finding an implicit conversion also
+type. However, as @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] is just a type alias for `RequestContext => Future[RouteResult]`, there's no
+companion object for @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)]. Fortunately, the [implicit scope](https://www.scala-lang.org/files/archive/spec/2.11/07-implicits.html#implicit-parameters) for finding an implicit conversion also
includes all types that are "associated with any part" of the source type which in this case means that the
implicit conversion will also be picked up from `RouteResult.routeToFlow` automatically.
diff --git a/docs/src/main/paradox/routing-dsl/rejections.md b/docs/src/main/paradox/routing-dsl/rejections.md
index 1880456aa..c6e9779b1 100644
--- a/docs/src/main/paradox/routing-dsl/rejections.md
+++ b/docs/src/main/paradox/routing-dsl/rejections.md
@@ -22,7 +22,7 @@ and handle any rejection.
## Predefined Rejections
A rejection encapsulates a specific reason why a route was not able to handle a request. It is modeled as an object of
-type @apidoc[Rejection]. Apache Pekko HTTP comes with a set of @scala[@scaladoc[predefined rejections](akka.http.scaladsl.server.Rejection)]@java[@javadoc[predefined rejections](akka.http.javadsl.server.Rejections)], which are used by the many
+type @apidoc[Rejection]. Apache Pekko HTTP comes with a set of @scala[@scaladoc[predefined rejections](org.apache.pekko.http.scaladsl.server.Rejection)]@java[@javadoc[predefined rejections](org.apache.pekko.http.javadsl.server.Rejections)], which are used by the many
@ref[predefined directives](directives/alphabetically.md).
Rejections are gathered up over the course of a Route evaluation and finally converted to @apidoc[HttpResponse] replies by
@@ -31,11 +31,11 @@ the @ref[handleRejections](directives/execution-directives/handleRejections.md)
<a id="the-rejectionhandler"></a>
## The RejectionHandler
-The @ref[handleRejections](directives/execution-directives/handleRejections.md) directive delegates the actual job of converting a list of rejections to the provided @scala[@scaladoc[RejectionHandler](akka.http.scaladsl.server.RejectionHandler)]@java[@javadoc[RejectionHandler](akka.http.javadsl.server.RejectionHandler)],
+The @ref[handleRejections](directives/execution-directives/handleRejections.md) directive delegates the actual job of converting a list of rejections to the provided @scala[@scaladoc[RejectionHandler](org.apache.pekko.http.scaladsl.server.RejectionHandler)]@java[@javadoc[RejectionHandler](org.apache.pekko.http.javadsl.server.RejectionHandler)],
so it can choose whether it would like to handle the current set of rejections or not.
Unhandled rejections will simply continue to flow through the route structure.
-The default `RejectionHandler` applied by the top-level glue code that turns a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] into a
+The default `RejectionHandler` applied by the top-level glue code that turns a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] into a
@apidoc[Flow] or async handler function for the @ref[low-level API](../server-side/low-level-api.md)
@scala[(via `Route.toFlow` or `Route.toFunction`)]
will handle *all* rejections that reach it.
@@ -100,7 +100,7 @@ After having created a new `Builder` instance
you can attach handling logic for certain types of rejections through three helper methods:
@scala[handle(PartialFunction[Rejection, Route])]@java[handle(Class<T>, Function<T, Route>)]
-: Handles the provided type of rejections with the given function. The provided function simply produces a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] which is
+: Handles the provided type of rejections with the given function. The provided function simply produces a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] which is
run when the rejection is "caught". This makes the full power of the Routing DSL available for defining rejection
handlers and even allows for recursing back into the main route structure if required.
@@ -120,7 +120,7 @@ This way the priority between rejections is properly defined via the order of yo
Once you have defined your custom `RejectionHandler` you have two options for "activating" it:
- 1. @scala[Bring it into implicit scope at the top-level]@java[Pass it to the `seal()` method of the @javadoc[Route](akka.http.javadsl.server.Route) class]
+ 1. @scala[Bring it into implicit scope at the top-level]@java[Pass it to the `seal()` method of the @javadoc[Route](org.apache.pekko.http.javadsl.server.Route) class]
2. Supply it as an argument to the @ref[handleRejections](directives/execution-directives/handleRejections.md) directive
In the first case your handler will be "sealed" (which means that it will receive the default handler as a fallback for
diff --git a/docs/src/main/paradox/routing-dsl/routes.md b/docs/src/main/paradox/routing-dsl/routes.md
index e50c65daf..cbe83066e 100644
--- a/docs/src/main/paradox/routing-dsl/routes.md
+++ b/docs/src/main/paradox/routing-dsl/routes.md
@@ -16,7 +16,7 @@ It's a simple alias for a function turning a @apidoc[RequestContext] into a `Fut
@@@ div { .group-java }
-A @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] itself is a function that operates on a @apidoc[RequestContext] and returns a @apidoc[RouteResult]. The
+A @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] itself is a function that operates on a @apidoc[RequestContext] and returns a @apidoc[RouteResult]. The
@apidoc[RequestContext] is a data structure that contains the current request and auxiliary data like the so far unmatched
path of the request URI that gets passed through the route structure. It also contains the current `ExecutionContext`
and @apidoc[Materializer], so that these don't have to be passed around manually.
@@ -34,15 +34,15 @@ The first case is pretty clear, by calling `complete` a given response is sent t
request. In the second case "reject" means that the route does not want to handle the request. You'll see further down
in the section about route composition what this is good for.
-A @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] can be "sealed" using `Route.seal`, which relies on the in-scope `RejectionHandler` and @apidoc[ExceptionHandler]
+A @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] can be "sealed" using `Route.seal`, which relies on the in-scope `RejectionHandler` and @apidoc[ExceptionHandler]
instances to convert rejections and exceptions into appropriate HTTP responses for the client.
@ref[Sealing a Route](#sealing-a-route) is described more in detail later.
-Using `Route.toFlow` or `Route.toFunction` a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] can be lifted into a handler @apidoc[Flow] or async handler
+Using `Route.toFlow` or `Route.toFunction` a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] can be lifted into a handler @apidoc[Flow] or async handler
function to be used with a `bindAndHandleXXX` call from the @ref[Core Server API](../server-side/low-level-api.md).
-Note: There is also an implicit conversion from @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)] to @apidoc[Flow[HttpRequest, HttpResponse, Unit]] defined in the
+Note: There is also an implicit conversion from @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)] to @apidoc[Flow[HttpRequest, HttpResponse, Unit]] defined in the
@apidoc[RouteResult] companion, which relies on `Route.toFlow`.
<a id="requestcontext"></a>
@@ -59,7 +59,7 @@ modified copies.
<a id="routeresult"></a>
## RouteResult
-@apidoc[RouteResult] is a simple algebraic data type (ADT) that models the possible non-error results of a @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)].
+@apidoc[RouteResult] is a simple algebraic data type (ADT) that models the possible non-error results of a @scala[@scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](org.apache.pekko.http.javadsl.server.Route)].
It is defined as such:
@@@ div { .group-scala }
@@ -173,7 +173,7 @@ A sealed route has these properties:
As described in @ref[Rejections](rejections.md) and @ref[Exception Handling](exception-handling.md),
there are generally two ways to handle rejections and exceptions.
- * Bring rejection/exception handlers @scala[`into implicit scope at the top-level`]@java[`seal()` method of the @javadoc[Route](akka.http.javadsl.server.Route)]
+ * Bring rejection/exception handlers @scala[`into implicit scope at the top-level`]@java[`seal()` method of the @javadoc[Route](org.apache.pekko.http.javadsl.server.Route)]
* Supply handlers as arguments to @ref[handleRejections](directives/execution-directives/handleRejections.md#handlerejections) and @ref[handleExceptions](directives/execution-directives/handleExceptions.md#handleexceptions) directives
In the first case your handlers will be "sealed", (which means that it will receive the default handler as a fallback for all cases your handler doesn't handle itself)
diff --git a/docs/src/main/paradox/routing-dsl/testkit.md b/docs/src/main/paradox/routing-dsl/testkit.md
index 195dd4732..a5338a692 100644
--- a/docs/src/main/paradox/routing-dsl/testkit.md
+++ b/docs/src/main/paradox/routing-dsl/testkit.md
@@ -10,7 +10,7 @@ To use Apache Pekko HTTP TestKit, add the module to your project:
@@dependency [sbt,Gradle,Maven] {
symbol1=PekkoVersion
- value1=$akka.version$
+ value1=$pekko.version$
bomGroup2="org.apache.pekko" bomArtifact2="pekko-http-bom_$scala.binary.version$" bomVersionSymbols2="PekkoHttpVersion"
symbol2="PekkoHttpVersion"
value2="$project.version$"
diff --git a/docs/src/main/paradox/server-side/graceful-termination.md b/docs/src/main/paradox/server-side/graceful-termination.md
index 9592d2ca9..fc3d6e764 100644
--- a/docs/src/main/paradox/server-side/graceful-termination.md
+++ b/docs/src/main/paradox/server-side/graceful-termination.md
@@ -7,11 +7,11 @@ in a predictable and ordered fashion. For example, in a typical Apache Pekko app
The recommended Apache Pekko HTTP server shutdown consists of three steps:
-1. stop accepting new connections (@scala[@scaladoc[ServerBinding.unbind](akka.http.scaladsl.Http.ServerBinding)]@java[@javadoc[ServerBinding.unbind](akka.http.javadsl.ServerBinding)])
+1. stop accepting new connections (@scala[@scaladoc[ServerBinding.unbind](org.apache.pekko.http.scaladsl.Http.ServerBinding)]@java[@javadoc[ServerBinding.unbind](org.apache.pekko.http.javadsl.ServerBinding)])
1. try to finish handling of ongoing requests until the `hardTerminationDeadline` hits (see below for details)
-1. close open connections (@scala[@scaladoc[ServerBinding.terminate](akka.http.scaladsl.Http.ServerBinding)]@java[@javadoc[ServerBinding.terminate](akka.http.javadsl.ServerBinding)])
+1. close open connections (@scala[@scaladoc[ServerBinding.terminate](org.apache.pekko.http.scaladsl.Http.ServerBinding)]@java[@javadoc[ServerBinding.terminate](org.apache.pekko.http.javadsl.ServerBinding)])
-This recommended sequence can be added to Pekko's coordinated shutdown via @scala[@scaladoc[ServerBinding.addToCoordinatedShutdown](akka.http.scaladsl.Http.ServerBinding)]@java[@javadoc[ServerBinding.addToCoordinatedShutdown](akka.http.javadsl.ServerBinding)] like this:
+This recommended sequence can be added to Pekko's coordinated shutdown via @scala[@scaladoc[ServerBinding.addToCoordinatedShutdown](org.apache.pekko.http.scaladsl.Http.ServerBinding)]@java[@javadoc[ServerBinding.addToCoordinatedShutdown](org.apache.pekko.http.javadsl.ServerBinding)] like this:
Scala
: @@snip[snip](/docs/src/test/scala/docs/http/scaladsl/server/ServerShutdownExampleSpec.scala) { #suggested }
@@ -31,10 +31,10 @@ Java
## Graceful termination using `ServerTerminator`
Apache Pekko HTTP provides two APIs to "stop" the server, either of them are available via the
-@java[@javadoc[ServerBinding](akka.http.javadsl.ServerBinding)]
-@scala[@scaladoc[ServerBinding](akka.http.scaladsl.Http$$ServerBinding)]
+@java[@javadoc[ServerBinding](org.apache.pekko.http.javadsl.ServerBinding)]
+@scala[@scaladoc[ServerBinding](org.apache.pekko.http.scaladsl.Http$$ServerBinding)]
obtained from starting the server (by using any of the `bind...` methods on the
-@java[@javadoc[Http](akka.http.javadsl.Http)]@scala[@scaladoc[Http](akka.http.scaladsl.HttpExt)] extension).
+@java[@javadoc[Http](org.apache.pekko.http.javadsl.Http)]@scala[@scaladoc[Http](org.apache.pekko.http.scaladsl.HttpExt)] extension).
The first method, called `unbind()` causes the server to *stop accepting new connections*, however any existing
connections that are still being used will remain active until the client chooses to close them.
@@ -43,8 +43,8 @@ responses that might be still in flight and eventually terminate the entire syst
connections, this does mean that these can delay the termination of your system indefinitely.
A better and more graceful solution to terminate an Apache Pekko HTTP server is to use the
-@java[@javadoc[ServerBinding.terminate(Duration)](akka.http.javadsl.ServerBinding#terminate-java.time.Duration-)]
-@scala[@scaladoc[ServerBinding.terminate(FiniteDuration)](akka.http.scaladsl.Http$$ServerBinding#terminate%28FiniteDuration%29:Future[HttpTerminated])]
+@java[@javadoc[ServerBinding.terminate(Duration)](org.apache.pekko.http.javadsl.ServerBinding#terminate-java.time.Duration-)]
+@scala[@scaladoc[ServerBinding.terminate(FiniteDuration)](org.apache.pekko.http.scaladsl.Http$$ServerBinding#terminate%28FiniteDuration%29:Future[HttpTerminated])]
method, which not only performs the unbinding, but also
handles replying to new incoming requests with (configurable) "terminating" HTTP responses.
It also allows setting a deadline after which any connections that are still alive will be shut down forcefully.
@@ -52,8 +52,8 @@ More precisely, termination works by following these steps:
First, the server port is unbound and no new connections will be accepted (same as invoking `unbind()`).
Immediately the
-@java[@javadoc[ServerBinding#whenTerminationSignalIssued](akka.http.javadsl.ServerBinding#whenTerminationSignalIssued--) `CompletionStage`]
-@scala[@scaladoc[ServerBinding#whenTerminationSignalIssued](akka.http.scaladsl.Http$$ServerBinding#whenTerminationSignalIssued:Future[Deadline]) `Future`]
+@java[@javadoc[ServerBinding#whenTerminationSignalIssued](org.apache.pekko.http.javadsl.ServerBinding#whenTerminationSignalIssued--) `CompletionStage`]
+@scala[@scaladoc[ServerBinding#whenTerminationSignalIssued](org.apache.pekko.http.scaladsl.Http$$ServerBinding#whenTerminationSignalIssued:Future[Deadline]) `Future`]
is completed.
This can be used to signal parts of the application that the HTTP server is shutting down and they should clean up as well.
Note also that for more advanced shut down scenarios you may want to use the @extref[Coordinated Shutdown](pekko-docs:/actors.html#coordinated-shutdown) capabilities of Apache Pekko.
diff --git a/docs/src/main/paradox/server-side/http2.md b/docs/src/main/paradox/server-side/http2.md
index 0a95f14b8..ec8c7e9fa 100644
--- a/docs/src/main/paradox/server-side/http2.md
+++ b/docs/src/main/paradox/server-side/http2.md
@@ -20,7 +20,7 @@ akka.http.server.preview.enable-http2 = on
HTTP/2 is primarily used over a secure HTTPS connection which takes care of protocol negotiation and falling back to HTTP/1.1 over TLS when the client does not support HTTP/2.
See the @ref[HTTPS section](server-https-support.md) for how to set up HTTPS.
-You can use @scala[@scaladoc[Http().newServerAt(...).bind()](akka.http.scaladsl.ServerBuilder)]@java[@javadoc[Http().get(system).newServerAt(...).bind()](akka.http.javadsl.ServerBuilder)] as long as you followed the above steps:
+You can use @scala[@scaladoc[Http().newServerAt(...).bind()](org.apache.pekko.http.scaladsl.ServerBuilder)]@java[@javadoc[Http().get(system).newServerAt(...).bind()](org.apache.pekko.http.javadsl.ServerBuilder)] as long as you followed the above steps:
Scala
: @@snip[Http2Spec.scala](/docs/src/test/scala/docs/http/scaladsl/Http2Spec.scala) { #bindAndHandleSecure }
@@ -80,8 +80,8 @@ support.
Like in the [HTTP/1.1 'Chunked' transfer encoding](https://datatracker.ietf.org/doc/html/rfc7230#section-4.1.2),
HTTP/2 supports a [trailer part](https://httpwg.org/specs/rfc7540.html#rfc.section.8.1) containing headers
after the body. Apache Pekko HTTP currently doesn't expose the trailing headers of the request. For the response, you
-can either model the trailing headers as the @scala[@scaladoc[HttpEntity.LastChunk](akka.http.scaladsl.model.HttpEntity.LastChunk)]@java[last chunk]
-of a @scala[@scaladoc[HttpEntity.Chunked](akka.http.scaladsl.model.HttpEntity.Chunked)]@java[chunked] response entity, or use the
+can either model the trailing headers as the @scala[@scaladoc[HttpEntity.LastChunk](org.apache.pekko.http.scaladsl.model.HttpEntity.LastChunk)]@java[last chunk]
+of a @scala[@scaladoc[HttpEntity.Chunked](org.apache.pekko.http.scaladsl.model.HttpEntity.Chunked)]@java[chunked] response entity, or use the
@apidoc[trailer](AttributeKeys$) attribute:
Scala
diff --git a/docs/src/main/paradox/server-side/low-level-api.md b/docs/src/main/paradox/server-side/low-level-api.md
index ab1bcfd67..fbb54a465 100644
--- a/docs/src/main/paradox/server-side/low-level-api.md
+++ b/docs/src/main/paradox/server-side/low-level-api.md
@@ -34,7 +34,7 @@ the @ref[HTTP Model](../common/http-model.md) for more information on how HTTP m
## Starting and Stopping
-On the most basic level an Apache Pekko HTTP server is bound by invoking the `bind` method of the @scala[@scaladoc[org.apache.pekko.http.scaladsl.Http](akka.http.scaladsl.Http$)]@java[@javadoc[org.apache.pekko.http.javadsl.Http](akka.http.javadsl.Http)]
+On the most basic level an Apache Pekko HTTP server is bound by invoking the `bind` method of the @scala[@scaladoc[org.apache.pekko.http.scaladsl.Http](org.apache.pekko.http.scaladsl.Http$)]@java[@javadoc[org.apache.pekko.http.javadsl.Http](org.apache.pekko.http.javadsl.Http)]
extension:
Scala
diff --git a/docs/src/main/paradox/server-side/websocket-support.md b/docs/src/main/paradox/server-side/websocket-support.md
index ec27b42d7..3f96a8a07 100644
--- a/docs/src/main/paradox/server-side/websocket-support.md
+++ b/docs/src/main/paradox/server-side/websocket-support.md
@@ -13,9 +13,9 @@ i.e. a sequence of octets or a text message, i.e. a sequence of Unicode code poi
In the data model the two kinds of messages, binary and text messages, are represented by the two classes
@apidoc[BinaryMessage] and @apidoc[TextMessage] deriving from a common superclass
-@scala[@scaladoc[Message](akka.http.scaladsl.model.ws.Message)]@java[@javadoc[Message](akka.http.javadsl.model.ws.Message)].
+@scala[@scaladoc[Message](org.apache.pekko.http.scaladsl.model.ws.Message)]@java[@javadoc[Message](org.apache.pekko.http.javadsl.model.ws.Message)].
@scala[The subclasses @apidoc[BinaryMessage] and @apidoc[TextMessage] contain methods to access the data.]
-@java[The superclass @javadoc[Message](akka.http.javadsl.model.ws.Message)]
+@java[The superclass @javadoc[Message](org.apache.pekko.http.javadsl.model.ws.Message)]
contains `isText` and `isBinary` methods to distinguish a message and `asBinaryMessage` and `asTextMessage` methods to cast a message.]
Take the API of @apidoc[TextMessage] as an example (@apidoc[BinaryMessage] is very similar with `String` replaced by @apidoc[org.apache.pekko.util.ByteString]):
@@ -128,7 +128,7 @@ such an attribute is found, it is used to generate a response by passing a handl
@scala[`handleMessages`]@java[`handleMessagesWith`] method. If no such attribute is found a `400 Bad Request` response is generated.
@@@ div { .group-java }
-You can also use the @javadoc[WebSocket.handleWebSocketRequestWith](akka.http.javadsl.model.ws.WebSocket) helper method which can be used if
+You can also use the @javadoc[WebSocket.handleWebSocketRequestWith](org.apache.pekko.http.javadsl.model.ws.WebSocket) helper method which can be used if
only WebSocket requests are expected. The method looks for the @apidoc[WebSocketUpgrade] attribute and returns a response
that will install the passed WebSocket handler if the header is found. If the request is no WebSocket request it will
return a `400 Bad Request` error response.
diff --git a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
index d0f5ebdff..7fc453b18 100644
--- a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
+++ b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
@@ -28,9 +28,7 @@ import java.util.concurrent.CompletionStage;
import java.util.function.Function;
/** A small example app that shows how to use the HTTP/2 client API currently against actual internet servers
- * Mirroring the akka.https.scaladsl counterpart
- *
- * NOTE requires Akka > 2.5.31 to run on JDK 11
+ * Mirroring the scaladsl counterpart
*/
public class Http2ClientApp {
diff --git a/docs/src/test/java/docs/http/javadsl/ModelDocTest.java b/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
index f9c0c9f82..5ab82d386 100644
--- a/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
+++ b/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
@@ -127,7 +127,7 @@ public class ModelDocTest {
@Test
public void syntheticHeaderS3() {
//#synthetic-header-s3
- // imports akka.http.javadsl.model.headers.RawRequestURI
+ // imports org.apache.pekko.http.javadsl.model.headers.RawRequestURI
HttpRequest.create("/ignored").addHeader(RawRequestURI.create("/a/b%2Bc"));
//#synthetic-header-s3
}
diff --git a/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
index b7bb02752..173da5d3b 100644
--- a/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
@@ -137,7 +137,7 @@ public class JsonStreamingExamplesTest extends JUnitRouteTest {
JsonEntityStreamingSupport support = EntityStreamingSupport.json();
// imagine receiving such response from a service:
- String payload = "{\"uid\":1,\"txt\":\"#Akka rocks!\"}\n" +
+ String payload = "{\"uid\":1,\"txt\":\"#Pekko rocks!\"}\n" +
"{\"uid\":2,\"txt\":\"Streaming is so hot right now!\"}\n" +
"{\"uid\":3,\"txt\":\"You cannot enter the same river twice.\"}";
HttpEntity.Strict entity = HttpEntities.create(ContentTypes.APPLICATION_JSON, payload);
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
index ec3e859f9..deeba70fe 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
@@ -52,7 +52,7 @@ public class FutureDirectivesExamplesTest extends JUnitRouteTest {
public void testOnComplete() {
//#onComplete
// import static scala.compat.java8.JFunction.func;
- // import static akka.http.javadsl.server.PathMatchers.*;
+ // import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
final Route route = path(segment("divide").slash(integerSegment()).slash(integerSegment()),
(a, b) -> onComplete(
@@ -134,7 +134,7 @@ public class FutureDirectivesExamplesTest extends JUnitRouteTest {
public void testOnCompleteWithBreaker() throws InterruptedException {
//#onCompleteWithBreaker
// import static scala.compat.java8.JFunction.func;
- // import static akka.http.javadsl.server.PathMatchers.*;
+ // import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
final int maxFailures = 1;
final FiniteDuration callTimeout = FiniteDuration.create(5, TimeUnit.SECONDS);
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
index ed75997f5..b35b25db0 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
@@ -145,7 +145,7 @@ public class RespondWithDirectivesExamplesTest extends JUnitRouteTest {
final RawHeader elTonno = RawHeader.create("X-Fish-Name", "El Tonno");
// format: OFF
- // by default always include the Blippy and Akka headers,
+ // by default always include the Blippy and Pekko headers,
// unless a more specific X-Fish-Name is given by the inner route
final Route route =
respondWithDefaultHeaders(defaultHeaders, () -> // blippy and akka
diff --git a/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala b/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala
index 7b8d4cee4..6a3487749 100644
--- a/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala
+++ b/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala
@@ -25,7 +25,7 @@ class JsonStreamingExamplesSpec extends RoutingSpec with CompileOnlySpec {
// #tweet-model
val tweets = List(
- Tweet(1, "#Akka rocks!"),
+ Tweet(1, "#Pekko rocks!"),
Tweet(2, "Streaming is so hot right now!"),
Tweet(3, "You cannot enter the same river twice."))
def getTweets = Source(tweets)
@@ -62,7 +62,7 @@ class JsonStreamingExamplesSpec extends RoutingSpec with CompileOnlySpec {
Get("/tweets").withHeaders(AcceptJson) ~> route ~> check {
responseAs[String] shouldEqual
"""[""" +
- """{"txt":"#Akka rocks!","uid":1},""" +
+ """{"txt":"#Pekko rocks!","uid":1},""" +
"""{"txt":"Streaming is so hot right now!","uid":2},""" +
"""{"txt":"You cannot enter the same river twice.","uid":3}""" +
"""]"""
@@ -102,7 +102,7 @@ class JsonStreamingExamplesSpec extends RoutingSpec with CompileOnlySpec {
Get("/tweets").withHeaders(AcceptJson) ~> route ~> check {
responseAs[String] shouldEqual
- """{"txt":"#Akka rocks!","uid":1}""" + "\n" +
+ """{"txt":"#Pekko rocks!","uid":1}""" + "\n" +
"""{"txt":"Streaming is so hot right now!","uid":2}""" + "\n" +
"""{"txt":"You cannot enter the same river twice.","uid":3}""" + "\n"
}
@@ -135,7 +135,7 @@ class JsonStreamingExamplesSpec extends RoutingSpec with CompileOnlySpec {
Get("/tweets").withHeaders(AcceptCsv) ~> route ~> check {
responseAs[String] shouldEqual
- "1,#Akka rocks!" + "\n" +
+ "1,#Pekko rocks!" + "\n" +
"2,Streaming is so hot right now!" + "\n" +
"3,You cannot enter the same river twice." + "\n"
}
diff --git a/http-bench-jmh/README.md b/http-bench-jmh/README.md
index 2f14da3f2..930d63d9e 100644
--- a/http-bench-jmh/README.md
+++ b/http-bench-jmh/README.md
@@ -1,10 +1,10 @@
-# Akka Http Microbenchmarks
+# Apache Pekko Http Microbenchmarks
-This subproject contains some microbenchmarks parts of Akka Http.
+This subproject contains some microbenchmarks parts of Pekko Http.
You can run them like:
- project akka-http-bench-jmh
+ project http-bench-jmh
jmh:run -i 3 -wi 3 -f 1 .*LineParserBenchmark
Use 'jmh:run -h' to get an overview of the available options.
\ No newline at end of file
diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/LineParserBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/LineParserBenchmark.scala
index bc368f300..83bd9a65d 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/LineParserBenchmark.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/LineParserBenchmark.scala
@@ -52,7 +52,7 @@ class LineParserBenchmark {
@Setup
def setup(): Unit = {
- tempFile = Files.createTempFile("akka-http-linear-bench", s"-$lineSize")
+ tempFile = Files.createTempFile("http-linear-bench", s"-$lineSize")
val makeSampleFile = Source.single(line)
.runWith(FileIO.toPath(tempFile))
diff --git a/http-core/src/main/resources/reference.conf b/http-core/src/main/resources/reference.conf
index f3659f686..4cfb4d57b 100644
--- a/http-core/src/main/resources/reference.conf
+++ b/http-core/src/main/resources/reference.conf
@@ -1,5 +1,5 @@
########################################
-# akka-http-core Reference Config File #
+# pekko-http-core Reference Config File #
########################################
# This is the reference config file that contains all the default settings.
diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/rendering/RenderSupport.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/rendering/RenderSupport.scala
index 25f0ca29b..76868bbd3 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/rendering/RenderSupport.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/rendering/RenderSupport.scala
@@ -157,6 +157,6 @@ private[http] object RenderSupport {
}
def suppressionWarning(log: LoggingAdapter, h: HttpHeader,
- msg: String = "the akka-http-core layer sets this header automatically!"): Unit =
+ msg: String = "the pekko-http-core layer sets this header automatically!"): Unit =
log.warning("Explicitly set HTTP header '{}' is ignored, {}", h, msg)
}
diff --git a/http-core/src/test/scala/org/apache/pekko/http/scaladsl/TestServer.scala b/http-core/src/test/scala/org/apache/pekko/http/scaladsl/TestServer.scala
index 08f3637e8..27a17629c 100644
--- a/http-core/src/test/scala/org/apache/pekko/http/scaladsl/TestServer.scala
+++ b/http-core/src/test/scala/org/apache/pekko/http/scaladsl/TestServer.scala
@@ -70,7 +70,7 @@ object TestServer extends App {
ContentTypes.`text/html(UTF-8)`,
"""|<html>
| <body>
- | <h1>Say hello to <i>akka-http-core</i>!</h1>
+ | <h1>Say hello to <i>pekko-http-core</i>!</h1>
| <p>Defined resources:</p>
| <ul>
| <li><a href="/ping">/ping</a></li>
diff --git a/http-core/src/test/scripts/autobahn-jenkins/step-2-run-sbt-client.sh b/http-core/src/test/scripts/autobahn-jenkins/step-2-run-sbt-client.sh
index 63cb0e325..4ebb9a83b 100644
--- a/http-core/src/test/scripts/autobahn-jenkins/step-2-run-sbt-client.sh
+++ b/http-core/src/test/scripts/autobahn-jenkins/step-2-run-sbt-client.sh
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
## MOCK, use jenkins to run:
-# 'akka-http-core/test:run-main akka.http.impl.engine.ws.WSClientAutobahnTest'
+# 'http-core/test:run-main org.apache.pekko.http.impl.engine.ws.WSClientAutobahnTest'
diff --git a/http-core/src/test/scripts/autobahn-jenkins/step-5-server-tests-all.sh b/http-core/src/test/scripts/autobahn-jenkins/step-5-server-tests-all.sh
index b8d7596dd..f3394c89b 100644
--- a/http-core/src/test/scripts/autobahn-jenkins/step-5-server-tests-all.sh
+++ b/http-core/src/test/scripts/autobahn-jenkins/step-5-server-tests-all.sh
@@ -10,7 +10,7 @@ SBT_OPTS="-Dsbt.ivy.home=/localhome/jenkinsakka/.ivy2 -Dsbt.override.repos=false
# and only thanks to that, will it not be forced into [Stopped] state, as bash thinks sbt is awaiting on some input
# and then decides to stop it (instead of keep it running). Keeping it in a sub shell, keeps it running.
TEST_CLASS=akka.http.impl.engine.ws.WSServerAutobahnTest
-(java $SBT_OPTS -Dakka.ws-mode=sleep -Dakka.ws-host=127.0.0.1 -jar $SBT_JAR "akka-http-core-experimental/test:run-main $TEST_CLASS" | tee output &)
+(java $SBT_OPTS -Dakka.ws-mode=sleep -Dakka.ws-host=127.0.0.1 -jar $SBT_JAR "pekko-http-core-experimental/test:run-main $TEST_CLASS" | tee output &)
# because of the sub-shell $! is not reported, we need to find the PID some other way:
SUB_PID=$(jps -mlV | grep $TEST_CLASS | awk '{print $1}') # the PID of JVM
diff --git a/http-scalafix/README.md b/http-scalafix/README.md
index 3bfdde890..01a632c96 100644
--- a/http-scalafix/README.md
+++ b/http-scalafix/README.md
@@ -4,7 +4,7 @@ The setup of the scalafix module roughly follows the example in https://github.c
* Add before/after test file in scalafix-test-input / scalafix-test-output
* Add rule in scalafix-rules
- * run test in `akka-http-scalafix-tests`
+ * run test in `http-scalafix-tests`
## Applying locally defined rules to docs examples
diff --git a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/EntityStreamingSpec.scala b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/EntityStreamingSpec.scala
index f3d29d3a1..c2717b1f9 100755
--- a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/EntityStreamingSpec.scala
+++ b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/EntityStreamingSpec.scala
@@ -27,7 +27,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
// #models
val tweets = List(
- Tweet(1, "#Akka rocks!"),
+ Tweet(1, "#Pekko rocks!"),
Tweet(2, "Streaming is so hot right now!"),
Tweet(3, "You cannot enter the same river twice."))
def getTweets = Source(tweets)
@@ -59,7 +59,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
Get("/tweets").withHeaders(AcceptJson) ~> route ~> check {
responseAs[String] shouldEqual
"""[""" +
- """{"txt":"#Akka rocks!","uid":1},""" +
+ """{"txt":"#Pekko rocks!","uid":1},""" +
"""{"txt":"Streaming is so hot right now!","uid":2},""" +
"""{"txt":"You cannot enter the same river twice.","uid":3}""" +
"""]"""
@@ -91,7 +91,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
Get("/tweets").withHeaders(AcceptJson) ~> route ~> check {
responseAs[String] shouldEqual
- """{"txt":"#Akka rocks!","uid":1}""" + "\n" +
+ """{"txt":"#Pekko rocks!","uid":1}""" + "\n" +
"""{"txt":"Streaming is so hot right now!","uid":2}""" + "\n" +
"""{"txt":"You cannot enter the same river twice.","uid":3}""" + "\n"
}
@@ -108,7 +108,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
implicit val jsonStreamingSupport: JsonEntityStreamingSupport =
EntityStreamingSupport.json()
- val input = """{"uid":1,"txt":"#Akka rocks!"}""" + "\n" +
+ val input = """{"uid":1,"txt":"#Pekko rocks!"}""" + "\n" +
"""{"uid":2,"txt":"Streaming is so hot right now!"}""" + "\n" +
"""{"uid":3,"txt":"You cannot enter the same river twice."}"""
@@ -126,7 +126,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
// tests ------------------------------------------------------------
val all = source.runWith(Sink.seq).futureValue
all.head.uid should ===(1)
- all.head.txt should ===("#Akka rocks!")
+ all.head.txt should ===("#Pekko rocks!")
all.drop(1).head.uid should ===(2)
all.drop(1).head.txt should ===("Streaming is so hot right now!")
all.drop(2).head.uid should ===(3)
@@ -144,7 +144,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
implicit val jsonStreamingSupport: JsonEntityStreamingSupport =
EntityStreamingSupport.json()
- val input = """{"uid":1,"txt":"#Akka rocks!"}""" + "\n" +
+ val input = """{"uid":1,"txt":"#Pekko rocks!"}""" + "\n" +
"""{"uid":2,"txt":"Streaming is so hot right now!"}""" + "\n" +
"""{"uid":3,"txt":"You cannot enter the same river twice."}"""
@@ -160,7 +160,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
// tests ------------------------------------------------------------
val all = value.runWith(Sink.seq).futureValue
all.head.uid should ===(1)
- all.head.txt should ===("#Akka rocks!")
+ all.head.txt should ===("#Pekko rocks!")
all.drop(1).head.uid should ===(2)
all.drop(1).head.txt should ===("Streaming is so hot right now!")
all.drop(2).head.uid should ===(3)
@@ -190,7 +190,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
Get("/tweets").withHeaders(AcceptCsv) ~> route ~> check {
responseAs[String] shouldEqual
- "1,#Akka rocks!" + "\n" +
+ "1,#Pekko rocks!" + "\n" +
"2,Streaming is so hot right now!" + "\n" +
"3,You cannot enter the same river twice." + "\n"
}
@@ -214,7 +214,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
Get("/tweets").withHeaders(AcceptCsv) ~> route ~> check {
responseAs[String] shouldEqual
- """1,"Text: #Akka rocks!"""" + "\n" +
+ """1,"Text: #Pekko rocks!"""" + "\n" +
"""2,"Text: Streaming is so hot right now!"""" + "\n" +
"""3,"Text: You cannot enter the same river twice."""" + "\n"
}
@@ -259,7 +259,7 @@ class EntityStreamingSpec extends RoutingSpec with ScalaFutures {
Get("/tweets").withHeaders(AcceptCsv) ~> route ~> check {
responseAs[String] shouldEqual
- "1,#Akka rocks!" + "\n" +
+ "1,#Pekko rocks!" + "\n" +
"2,Streaming is so hot right now!" + "\n" +
"3,You cannot enter the same river twice." + "\n"
}
diff --git a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/TestServer.scala b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/TestServer.scala
index 4f8c87a9a..5c98fd403 100644
--- a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/TestServer.scala
+++ b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/TestServer.scala
@@ -106,7 +106,7 @@ object TestServer extends App {
lazy val index =
<html>
<body>
- <h1>Say hello to <i>akka-http-core</i>!</h1>
+ <h1>Say hello to <i>pekko-http-core</i>!</h1>
<p>Defined resources:</p>
<ul>
<li><a href="/ping">/ping</a></li>
diff --git a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala
index e033870a2..376d6fbd2 100644
--- a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala
+++ b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala
@@ -33,7 +33,7 @@ class FileUploadDirectivesSpec extends RoutingSpec with Eventually {
@volatile var file: Option[File] = None
def tempDest(fileInfo: FileInfo): File = {
- val dest = File.createTempFile("akka-http-FileUploadDirectivesSpec", ".tmp")
+ val dest = File.createTempFile("http-FileUploadDirectivesSpec", ".tmp")
file = Some(dest)
dest
}
@@ -90,7 +90,7 @@ class FileUploadDirectivesSpec extends RoutingSpec with Eventually {
@volatile var files: Seq[File] = Nil
def tempDest(fileInfo: FileInfo): File = {
- val dest = File.createTempFile("akka-http-FileUploadDirectivesSpec", ".tmp")
+ val dest = File.createTempFile("http-FileUploadDirectivesSpec", ".tmp")
files = files :+ dest
dest
}
diff --git a/http/src/main/java/org/apache/pekko/http/javadsl/server/directives/ContentTypeResolver.java b/http/src/main/java/org/apache/pekko/http/javadsl/server/directives/ContentTypeResolver.java
index 3f415d565..c95ce678e 100644
--- a/http/src/main/java/org/apache/pekko/http/javadsl/server/directives/ContentTypeResolver.java
+++ b/http/src/main/java/org/apache/pekko/http/javadsl/server/directives/ContentTypeResolver.java
@@ -7,7 +7,7 @@ package org.apache.pekko.http.javadsl.server.directives;
import org.apache.pekko.http.javadsl.model.ContentType;
/**
- * Implement this interface to provide a custom mapping from a file name to a [[akka.http.javadsl.model.ContentType]].
+ * Implement this interface to provide a custom mapping from a file name to a [[org.apache.pekko.http.javadsl.model.ContentType]].
*/
@FunctionalInterface
public interface ContentTypeResolver {
diff --git a/http2-tests/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala b/http2-tests/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala
index 8ed2b7bef..13f38aaf7 100644
--- a/http2-tests/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala
+++ b/http2-tests/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala
@@ -97,7 +97,7 @@ object Http2ServerTest extends App {
ContentTypes.`text/html(UTF-8)`,
"""|<html>
| <body>
- | <h1>Say hello to <i>akka-http-core</i>!</h1>
+ | <h1>Say hello to <i>pekko-http-core</i>!</h1>
| <p>Defined resources:</p>
| <ul>
| <li><a href="/ping">/ping</a></li>
diff --git a/scripts/commits-for-release-notes.sh b/scripts/commits-for-release-notes.sh
index af3f40e04..d9dbe3111 100755
--- a/scripts/commits-for-release-notes.sh
+++ b/scripts/commits-for-release-notes.sh
@@ -8,24 +8,24 @@ LAST_VERSION=$1
REPLACEMENT="perl -pe s|(.*?)(\(?#(\d+)\)?(\s\(#\d+\))?)?$|\*\1\[#\3\]\(https://github.com/akka/akka-http/pull/\3\)|"
-echo "#### akka-http-core"
+echo "#### pekko-http-core"
echo
-git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/akka-http-core | $REPLACEMENT
+git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/http-core | $REPLACEMENT
echo
-echo "#### akka-http"
+echo "#### pekko-http"
echo
-git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/akka-http | $REPLACEMENT
+git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/http | $REPLACEMENT
echo
-echo "#### akka-http-marshallers"
+echo "#### pekko-http-marshallers"
echo
-git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/akka-http-marshallers* | $REPLACEMENT
+git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/http-marshallers* | $REPLACEMENT
echo
-echo "#### akka-http-testkit"
+echo "#### pekko-http-testkit"
echo
-git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/akka-http-testkit | $REPLACEMENT
+git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/http-testkit | $REPLACEMENT
echo
echo "#### docs"
@@ -33,14 +33,14 @@ echo
git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/docs | $REPLACEMENT
echo
-echo "#### akka-http2-support"
+echo "#### pekko-http2-support"
echo
-git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/akka-http2-support | $REPLACEMENT
+git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/http2-support | $REPLACEMENT
echo
-echo "#### akka-http-caching"
+echo "#### pekko-http-caching"
echo
-git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/akka-http-caching | $REPLACEMENT
+git log --no-merges --reverse --oneline ${LAST_VERSION}.. -- $ROOT_DIR/http-caching | $REPLACEMENT
echo
echo "#### build"
diff --git a/scripts/release-train-issue-template.md b/scripts/release-train-issue-template.md
index e1081b611..0cacdf53d 100644
--- a/scripts/release-train-issue-template.md
+++ b/scripts/release-train-issue-template.md
@@ -47,7 +47,7 @@ Wind down PR queue. There has to be enough time after the last (non-trivial) PR
- [ ] Release the staging repository to Maven Central.
### Check availability
-- [ ] Check the release on maven central: https://repo1.maven.org/maven2/com/typesafe/akka/akka-http-core_2.13/$VERSION$/
+- [ ] Check the release on maven central: https://repo1.maven.org/maven2/org/apache/pekko/akka-http-core_2.13/$VERSION$/
### When everything is on maven central
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org