diff --git a/akka-docs-dev/rst/scala/http/client-side/connection-level.rst b/akka-docs-dev/rst/scala/http/client-side/connection-level.rst index 73312901af..a28ec2d5a4 100644 --- a/akka-docs-dev/rst/scala/http/client-side/connection-level.rst +++ b/akka-docs-dev/rst/scala/http/client-side/connection-level.rst @@ -64,3 +64,8 @@ Currently Akka HTTP doesn't implement client-side request timeout checking itsel as a more general purpose streaming infrastructure feature. However, akka-stream should soon provide such a feature. + +Stand-Alone HTTP Layer Usage +---------------------------- + +// TODO \ No newline at end of file diff --git a/akka-docs-dev/rst/scala/http/client-side/https-support.rst b/akka-docs-dev/rst/scala/http/client-side/https-support.rst index 06c18642a5..45eccee592 100644 --- a/akka-docs-dev/rst/scala/http/client-side/https-support.rst +++ b/akka-docs-dev/rst/scala/http/client-side/https-support.rst @@ -1,4 +1,40 @@ +.. _clientSideHTTPS: + Client-Side HTTPS Support ========================= -TODO \ No newline at end of file +Akka HTTP supports TLS encryption on the client-side as well as on the :ref:`server-side `. + +The central vehicle for configuring encryption is the ``HttpsContext``, which is defined as such: + +.. includecode2:: /../../akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala + :snippet: https-context-impl + +In addition to the ``outgoingConnection``, ``newHostConnectionPool`` and ``cachedHostConnectionPool`` methods the +`akka.http.scaladsl.Http`_ extension also defines ``outgoingConnectionTls``, ``newHostConnectionPoolTls`` and +``cachedHostConnectionPoolTls``. These methods work identically to their counterparts without the ``-Tls`` suffix, +with the exception that all connections will always be encrypted. + +The ``singleRequest`` and ``superPool`` methods determine the encryption state via the scheme of the incoming request, +i.e. requests to an "https" URI will be encrypted, while requests to an "http" URI won't. + +The encryption configuration for all HTTPS connections, i.e. the ``HttpsContext`` is determined according to the +following logic: + +1. If the optional ``httpContext`` method parameter is defined it contains the configuration to be used (and thus + takes precedence over any potentially set default client-side ``HttpsContext``). + +2. If the optional ``httpContext`` method parameter is undefined (which is the default) the default client-side + ``HttpsContext`` is used, which can be set via the ``setDefaultClientHttpsContext`` on the ``Http`` extension. + +3. If no default client-side ``HttpsContext`` has been set via the ``setDefaultClientHttpsContext`` on the ``Http`` + extension the default system configuration is used. + +Usually the process is, if the default system TLS configuration is not good enough for your application's needs, +that you configure a custom ``HttpsContext`` instance and set it via ``Http().setDefaultClientHttpsContext``. +Afterwards you simply use ``outgoingConnectionTls``, ``newHostConnectionPoolTls``, ``cachedHostConnectionPoolTls``, +``superPool`` or ``singleRequest`` without a specific ``httpContext`` argument, which causes encrypted connections +to rely on the configured default client-side ``HttpsContext``. + + +.. _akka.http.scaladsl.Http: @github@/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala diff --git a/akka-docs-dev/rst/scala/http/configuration.rst b/akka-docs-dev/rst/scala/http/configuration.rst index f3061585d2..727b0d13cb 100644 --- a/akka-docs-dev/rst/scala/http/configuration.rst +++ b/akka-docs-dev/rst/scala/http/configuration.rst @@ -19,7 +19,7 @@ akka-http-core akka-http-core-scala ~~~~~~~~~~~~~~~~~~~~ -.. literalinclude:: ../../../../akka-http-scala/src/main/resources/reference.conf +.. literalinclude:: ../../../../akka-http/src/main/resources/reference.conf :language: none diff --git a/akka-docs-dev/rst/scala/http/low-level-server-side-api.rst b/akka-docs-dev/rst/scala/http/low-level-server-side-api.rst index ffde88505e..380839ad14 100644 --- a/akka-docs-dev/rst/scala/http/low-level-server-side-api.rst +++ b/akka-docs-dev/rst/scala/http/low-level-server-side-api.rst @@ -132,4 +132,25 @@ connection. An often times more convenient alternative is to explicitly add a `` connection when it has been sent out. -// TODO: show an example of using the HTTP layer independently with a BidFlow join \ No newline at end of file +.. _serverSideHTTPS: + +Server-Side HTTPS Support +------------------------- + +Akka HTTP supports TLS encryption on the server-side as well as on the :ref:`client-side `. + +The central vehicle for configuring encryption is the ``HttpsContext``, which is defined as such: + +.. includecode2:: /../../akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala + :snippet: https-context-impl + +On the server-side the ``bind``, and ``bindAndHandleXXX`` methods of the `akka.http.scaladsl.Http`_ extension define an +optional ``httpsContext`` parameter, which can receive the HTTPS configuration in the form of an ``HttpsContext`` +instance. +If defined encryption is enabled on all accepted connections. Otherwise it is disabled (which is the default). + + +Stand-Alone HTTP Layer Usage +---------------------------- + +// TODO \ No newline at end of file diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/alphabetically.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/alphabetically.rst index b96d3f5bcd..72c386b8f6 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/alphabetically.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/alphabetically.rst @@ -6,133 +6,194 @@ Predefined Directives (alphabetically) =========================================== ============================================================================ Directive Description =========================================== ============================================================================ -:ref:`-authenticateBasic-` ... -:ref:`-authenticateBasicAsync-` ... -:ref:`-authenticateBasicPF-` ... -:ref:`-authenticateBasicPFAsync-` ... -:ref:`-authenticateOrRejectWithChallenge-` ... -:ref:`-authorize-` ... -:ref:`-cancelRejection-` ... -:ref:`-cancelRejections-` ... -:ref:`-complete-` ... -:ref:`-completeOrRecoverWith-` ... -:ref:`-completeWith-` ... -:ref:`-conditional-` ... -:ref:`-cookie-` ... -:ref:`-decodeRequest-` ... -:ref:`-decodeRequestWith-` ... -:ref:`-delete-` ... -:ref:`-deleteCookie-` ... -:ref:`-encodeResponse-` ... -:ref:`-encodeResponseWith-` ... -:ref:`-entity-` ... -:ref:`-extract-` ... -:ref:`-extractClientIP-` ... -:ref:`-extractCredentials-` ... -:ref:`-extractExecutionContext-` ... -:ref:`-extractFlowMaterializer-` ... -:ref:`-extractHost-` ... -:ref:`-extractLog-` ... -:ref:`-extractMethod-` ... -:ref:`-extractRequest-` ... -:ref:`-extractRequestContext-` ... -:ref:`-extractScheme-` ... -:ref:`-extractSettings-` ... -:ref:`-extractUnmatchedPath-` ... -:ref:`-extractUri-` ... -:ref:`-failWith-` ... -:ref:`-formField-` ... -:ref:`-formFields-` ... -:ref:`-get-` ... -:ref:`-getFromBrowseableDirectories-` ... -:ref:`-getFromBrowseableDirectory-` ... -:ref:`-getFromDirectory-` ... -:ref:`-getFromFile-` ... -:ref:`-getFromResource-` ... -:ref:`-getFromResourceDirectory-` ... -:ref:`-handleExceptions-` ... -:ref:`-handleRejections-` ... -:ref:`-handleWebsocketMessages-` ... -:ref:`-handleWith-` ... -:ref:`-head-` ... -:ref:`-headerValue-` ... -:ref:`-headerValueByName-` ... -:ref:`-headerValueByType-` ... -:ref:`-headerValuePF-` ... -:ref:`-host-` ... -:ref:`-listDirectoryContents-` ... -:ref:`-logRequest-` ... -:ref:`-logRequestResult-` ... -:ref:`-logResult-` ... -:ref:`-mapInnerRoute-` ... -:ref:`-mapRejections-` ... -:ref:`-mapRequest-` ... -:ref:`-mapRequestContext-` ... -:ref:`-mapResponse-` ... -:ref:`-mapResponseEntity-` ... -:ref:`-mapResponseHeaders-` ... -:ref:`-mapRouteResult-` ... -:ref:`-mapRouteResultFuture-` ... -:ref:`-mapRouteResultPF-` ... -:ref:`-mapRouteResultWith-` ... -:ref:`-mapRouteResultWithPF-` ... -:ref:`-mapSettings-` ... -:ref:`-mapUnmatchedPath-` ... -:ref:`-method-` ... -:ref:`-onComplete-` ... -:ref:`-onSuccess-` ... -:ref:`-optionalCookie-` ... -:ref:`-optionalHeaderValue-` ... -:ref:`-optionalHeaderValueByName-` ... -:ref:`-optionalHeaderValueByType-` ... -:ref:`-optionalHeaderValuePF-` ... -:ref:`-options-` ... -:ref:`-overrideMethodWithParameter-` ... -:ref:`-overrideStatusCode-` ... -:ref:`-parameter-` ... -:ref:`-parameterMap-` ... -:ref:`-parameterMultiMap-` ... -:ref:`-parameters-` ... -:ref:`-parameterSeq-` ... -:ref:`-pass-` ... -:ref:`-patch-` ... -:ref:`-path-` ... -:ref:`-pathEnd-` ... -:ref:`-pathEndOrSingleSlash-` ... -:ref:`-pathPrefix-` ... -:ref:`-pathPrefixTest-` ... -:ref:`-pathSingleSlash-` ... -:ref:`-pathSuffix-` ... -:ref:`-pathSuffixTest-` ... -:ref:`-post-` ... -:ref:`-provide-` ... -:ref:`-put-` ... -:ref:`-rawPathPrefix-` ... -:ref:`-rawPathPrefixTest-` ... -:ref:`-recoverRejections-` ... -:ref:`-recoverRejectionsWith-` ... -:ref:`-redirect-` ... -:ref:`-redirectToNoTrailingSlashIfPresent-` ... -:ref:`-redirectToTrailingSlashIfMissing-` ... -:ref:`-reject-` ... -:ref:`-rejectEmptyResponse-` ... -:ref:`-requestEncodedWith-` ... -:ref:`-requestEntityEmpty-` ... -:ref:`-requestEntityPresent-` ... -:ref:`-respondWithDefaultHeader-` ... -:ref:`-respondWithDefaultHeaders-` ... -:ref:`-respondWithHeader-` ... -:ref:`-respondWithHeaders-` ... -:ref:`-respondWithHeaders-` ... -:ref:`-responseEncodingAccepted-` ... -:ref:`-scheme-` ... -:ref:`-setCookie-` ... -:ref:`-textract-` ... -:ref:`-tprovide-` ... -:ref:`-validate-` ... -:ref:`-withExecutionContext-` ... -:ref:`-withFlowMaterializer-` ... -:ref:`-withLog-` ... -:ref:`-withRangeSupport-` ... -:ref:`-withSettings-` ... +:ref:`-authenticateBasic-` Wraps the inner route with Http Basic authentication support using a given + ``Authenticator[T]`` +:ref:`-authenticateBasicAsync-` Wraps the inner route with Http Basic authentication support using a given + ``AsyncAuthenticator[T]`` +:ref:`-authenticateBasicPF-` Wraps the inner route with Http Basic authentication support using a given + ``AuthenticatorPF[T]`` +:ref:`-authenticateBasicPFAsync-` Wraps the inner route with Http Basic authentication support using a given + ``AsyncAuthenticatorPF[T]`` +:ref:`-authenticateOrRejectWithChallenge-` Lifts an authenticator function into a directive +:ref:`-authorize-` Applies the given authorization check to the request +:ref:`-cancelRejection-` Adds a ``TransformationRejection`` cancelling all rejections equal to the + given one to the rejections potentially coming back from the inner route. +:ref:`-cancelRejections-` Adds a ``TransformationRejection`` cancelling all matching rejections + to the rejections potentially coming back from the inner route +:ref:`-complete-` Completes the request using the given arguments +:ref:`-completeOrRecoverWith-` "Unwraps" a ``Future[T]`` and runs the inner route when the future has + failed with the error as an extraction of type ``Throwable`` +:ref:`-completeWith-` Uses the marshaller for a given type to extract a completion function +:ref:`-conditional-` Wraps its inner route with support for conditional requests as defined + by http://tools.ietf.org/html/rfc7232 +:ref:`-cookie-` Extracts the ``HttpCookie`` with the given name +:ref:`-decodeRequest-` Decompresses the request if it is ``gzip`` or ``deflate`` compressed +:ref:`-decodeRequestWith-` Decodes the incoming request using one of the given decoders +:ref:`-delete-` Rejects all non-DELETE requests +:ref:`-deleteCookie-` Adds a ``Set-Cookie`` response header expiring the given cookies +:ref:`-encodeResponse-` Encodes the response with the encoding that is requested by the client + via the ``Accept-Encoding`` header (``NoCoding``, ``Gzip`` and ``Deflate``) +:ref:`-encodeResponseWith-` Encodes the response with the encoding that is requested by the client + via the ``Accept-Encoding`` header (from a user-defined set) +:ref:`-entity-` Extracts the request entity unmarshalled to a given type +:ref:`-extract-` Extracts a single value using a ``RequestContext ⇒ T`` function +:ref:`-extractClientIP-` Extracts the client's IP from either the ``X-Forwarded-``, + ``Remote-Address`` or ``X-Real-IP`` header +:ref:`-extractCredentials-` Extracts the potentially present ``HttpCredentials`` provided with the + request's ``Authorization`` header +:ref:`-extractExecutionContext-` Extracts the ``ExecutionContext`` from the ``RequestContext`` +:ref:`-extractFlowMaterializer-` Extracts the ``FlowMaterializer`` from the ``RequestContext`` +:ref:`-extractHost-` Extracts the hostname part of the Host request header value +:ref:`-extractLog-` Extracts the ``LoggingAdapter`` from the ``RequestContext`` +:ref:`-extractMethod-` Extracts the request method +:ref:`-extractRequest-` Extracts the current ``HttpRequest`` instance +:ref:`-extractRequestContext-` Extracts the ``RequestContext`` itself +:ref:`-extractScheme-` Extracts the URI scheme from the request +:ref:`-extractSettings-` Extracts the ``RoutingSettings`` from the ``RequestContext`` +:ref:`-extractUnmatchedPath-` Extracts the yet unmatched path from the ``RequestContext`` +:ref:`-extractUri-` Extracts the complete request URI +:ref:`-failWith-` Bubbles the given error up the response chain where it is dealt with by the + closest :ref:`-handleExceptions-` directive and its ``ExceptionHandler`` +:ref:`-formField-` Extracts an HTTP form field from the request +:ref:`-formFields-` Extracts a number of HTTP form field from the request +:ref:`-get-` Rejects all non-GET requests +:ref:`-getFromBrowseableDirectories-` Serves the content of the given directories as a file-system browser, i.e. + files are sent and directories served as browseable listings +:ref:`-getFromBrowseableDirectory-` Serves the content of the given directory as a file-system browser, i.e. + files are sent and directories served as browseable listings +:ref:`-getFromDirectory-` Completes GET requests with the content of a file underneath a given + file-system directory +:ref:`-getFromFile-` Completes GET requests with the content of a given file +:ref:`-getFromResource-` Completes GET requests with the content of a given class-path resource +:ref:`-getFromResourceDirectory-` Completes GET requests with the content of a file underneath a given + "class-path resource directory" +:ref:`-handleExceptions-` Transforms exceptions thrown during evaluation of the inner route using the + given ``ExceptionHandler`` +:ref:`-handleRejections-` Transforms rejections produced by the inner route using the given + ``RejectionHandler`` +:ref:`-handleWebsocketMessages-` Handles websocket requests with the given handler and rejects other requests + with a ``ExpectedWebsocketRequestRejection`` +:ref:`-handleWith-` Completes the request using a given function +:ref:`-head-` Rejects all non-HEAD requests +:ref:`-headerValue-` Extracts an HTTP header value using a given ``HttpHeader ⇒ Option[T]`` + function +:ref:`-headerValueByName-` Extracts the value of the first HTTP request header with a given name +:ref:`-headerValueByType-` Extracts the first HTTP request header of the given type +:ref:`-headerValuePF-` Extracts an HTTP header value using a given + ``PartialFunction[HttpHeader, T]`` +:ref:`-host-` Rejects all requests with a non-matching host name +:ref:`-listDirectoryContents-` Completes GET requests with a unified listing of the contents of all given + file-system directories +:ref:`-logRequest-` Produces a log entry for every incoming request +:ref:`-logRequestResult-` Produces a log entry for every incoming request and ``RouteResult`` +:ref:`-logResult-` Produces a log entry for every ``RouteResult`` +:ref:`-mapInnerRoute-` Transforms its inner ``Route`` with a ``Route => Route`` function +:ref:`-mapRejections-` Transforms rejections from a previous route with an + ``immutable.Seq[Rejection] ⇒ immutable.Seq[Rejection]`` function +:ref:`-mapRequest-` Transforms the request with an ``HttpRequest => HttpRequest`` function +:ref:`-mapRequestContext-` Transforms the ``RequestContext`` with a + ``RequestContext => RequestContext`` function +:ref:`-mapResponse-` Transforms the response with an ``HttpResponse => HttpResponse`` function +:ref:`-mapResponseEntity-` Transforms the response entity with an ``ResponseEntity ⇒ ResponseEntity`` + function +:ref:`-mapResponseHeaders-` Transforms the response headers with an + ``immutable.Seq[HttpHeader] ⇒ immutable.Seq[HttpHeader]`` function +:ref:`-mapRouteResult-` Transforms the ``RouteResult`` with a ``RouteResult ⇒ RouteResult`` + function +:ref:`-mapRouteResultFuture-` Transforms the ``RouteResult`` future with a + ``Future[RouteResult] ⇒ Future[RouteResult]`` function +:ref:`-mapRouteResultPF-` Transforms the ``RouteResult`` with a + ``PartialFunction[RouteResult, RouteResult]`` +:ref:`-mapRouteResultWith-` Transforms the ``RouteResult`` with a + ``RouteResult ⇒ Future[RouteResult]`` function +:ref:`-mapRouteResultWithPF-` Transforms the ``RouteResult`` with a + ``PartialFunction[RouteResult, Future[RouteResult]]`` +:ref:`-mapSettings-` Transforms the ``RoutingSettings`` with a + ``RoutingSettings ⇒ RoutingSettings`` function +:ref:`-mapUnmatchedPath-` Transforms the ``unmatchedPath`` of the ``RequestContext`` using a + ``Uri.Path ⇒ Uri.Path`` function +:ref:`-method-` Rejects all requests whose HTTP method does not match the given one +:ref:`-onComplete-` "Unwraps" a ``Future[T]`` and runs the inner route after future completion + with the future's value as an extraction of type ``Try[T]`` +:ref:`-onSuccess-` "Unwraps" a ``Future[T]`` and runs the inner route after future completion + with the future's value as an extraction of type ``T`` +:ref:`-optionalCookie-` Extracts the ``HttpCookiePair`` with the given name as an + ``Option[HttpCookiePair]`` +:ref:`-optionalHeaderValue-` Extracts an optional HTTP header value using a given + ``HttpHeader ⇒ Option[T]`` function +:ref:`-optionalHeaderValueByName-` Extracts the value of the first optional HTTP request header with a given + name +:ref:`-optionalHeaderValueByType-` Extracts the first optional HTTP request header of the given type +:ref:`-optionalHeaderValuePF-` Extracts an optional HTTP header value using a given + ``PartialFunction[HttpHeader, T]`` +:ref:`-options-` Rejects all non-OPTIONS requests +:ref:`-overrideMethodWithParameter-` Changes the request method to the value of the specified query parameter +:ref:`-overrideStatusCode-` Overrides the response status code with the given one +:ref:`-parameter-` Extracts a query parameter value from the request +:ref:`-parameterMap-` Extracts the request's query parameters as a ``Map[String, String]`` +:ref:`-parameterMultiMap-` Extracts the request's query parameters as a ``Map[String, List[String]]`` +:ref:`-parameters-` Extracts a number of query parameter values from the request +:ref:`-parameterSeq-` Extracts the request's query parameters as a ``Seq[(String, String)]`` +:ref:`-pass-` Always simply passes the request on to its inner route, i.e. doesn't do + anything, neither with the request nor the response +:ref:`-patch-` Rejects all non-PATCH requests +:ref:`-path-` Applies the given ``PathMatcher`` to the remaining unmatched path after + consuming a leading slash +:ref:`-pathEnd-` Only passes on the request to its inner route if the request path has been + matched completely +:ref:`-pathEndOrSingleSlash-` Only passes on the request to its inner route if the request path has been + matched completely or only consists of exactly one remaining slash +:ref:`-pathPrefix-` Applies the given ``PathMatcher`` to a prefix of the remaining unmatched + path after consuming a leading slash +:ref:`-pathPrefixTest-` Checks whether the unmatchedPath has a prefix matched by the given + ``PathMatcher`` after implicitly consuming a leading slash +:ref:`-pathSingleSlash-` Only passes on the request to its inner route if the request path + consists of exactly one remaining slash +:ref:`-pathSuffix-` Applies the given ``PathMatcher`` to a suffix of the remaining unmatched + path (Caution: check scaladoc!) +:ref:`-pathSuffixTest-` Checks whether the unmatched path has a suffix matched by the given + ``PathMatcher`` (Caution: check scaladoc!) +:ref:`-post-` Rejects all non-POST requests +:ref:`-provide-` Injects a given value into a directive +:ref:`-put-` Rejects all non-PUT requests +:ref:`-rawPathPrefix-` Applies the given matcher directly to a prefix of the unmatched path of the + ``RequestContext``, without implicitly consuming a leading slash +:ref:`-rawPathPrefixTest-` Checks whether the unmatchedPath has a prefix matched by the given + ``PathMatcher`` +:ref:`-recoverRejections-` Transforms rejections from a previous route with an + ``immutable.Seq[Rejection] ⇒ RouteResult`` function +:ref:`-recoverRejectionsWith-` Transforms rejections from a previous route with an + ``immutable.Seq[Rejection] ⇒ Future[RouteResult]`` function +:ref:`-redirect-` Completes the request with redirection response of the given type to the + given URI +:ref:`-redirectToNoTrailingSlashIfPresent-` If the request path ends with a slash, redirects to the same uri without + trailing slash in the path +:ref:`-redirectToTrailingSlashIfMissing-` If the request path doesn't end with a slash, redirects to the same uri with + trailing slash in the path +:ref:`-reject-` Rejects the request with the given rejections +:ref:`-rejectEmptyResponse-` Converts responses with an empty entity into (empty) rejections +:ref:`-requestEncodedWith-` Rejects the request with an ``UnsupportedRequestEncodingRejection`` if its + encoding doesn't match the given one +:ref:`-requestEntityEmpty-` Rejects if the request entity is non-empty +:ref:`-requestEntityPresent-` Rejects with a ``RequestEntityExpectedRejection`` if the request entity is + empty +:ref:`-respondWithDefaultHeader-` Adds a given response header if the response doesn't already contain a + header with the same name +:ref:`-respondWithDefaultHeaders-` Adds the subset of the given headers to the response which doesn't already + have a header with the respective name present in the response +:ref:`-respondWithHeader-` Unconditionally adds a given header to the outgoing response +:ref:`-respondWithHeaders-` Unconditionally adds the given headers to the outgoing response +:ref:`-responseEncodingAccepted-` Rejects the request with an ``UnacceptedResponseEncodingRejection`` if the + given response encoding is not accepted by the client +:ref:`-scheme-` Rejects all requests whose URI scheme doesn't match the given one +:ref:`-setCookie-` Adds a ``Set-Cookie`` response header with the given cookies +:ref:`-textract-` Extracts a number of values using a ``RequestContext ⇒ Tuple`` function +:ref:`-tprovide-` Injects a given tuple of values into a directive +:ref:`-validate-` Checks a given condition before running its inner route +:ref:`-withExecutionContext-` Runs its inner route with the given alternative ``ExecutionContext`` +:ref:`-withFlowMaterializer-` Runs its inner route with the given alternative ``FlowMaterializer`` +:ref:`-withLog-` Runs its inner route with the given alternative ``LoggingAdapter`` +:ref:`-withRangeSupport-` Adds ``Accept-Ranges: bytes`` to responses to GET requests, produces partial + responses if the initial request contained a valid ``Range`` header +:ref:`-withSettings-` Runs its inner route with the given alternative ``RoutingSettings`` =========================================== ============================================================================ diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejection.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejection.rst index 2a613554df..ed08995ab6 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejection.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejection.rst @@ -8,7 +8,7 @@ cancelRejection Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: cancelRejection Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejections.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejections.rst index 9722aa60ca..5fcd915e0e 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejections.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejections.rst @@ -8,7 +8,7 @@ cancelRejections Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: cancelRejections Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extract.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extract.rst index 2c92163338..8c640aa57f 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extract.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extract.rst @@ -8,7 +8,7 @@ Calculates a value from the request context and provides the value to the inner Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extract Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractExecutionContext.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractExecutionContext.rst index c6253ff6fc..2b425af583 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractExecutionContext.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractExecutionContext.rst @@ -8,7 +8,7 @@ extractExecutionContext Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractExecutionContext Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractFlowMaterializer.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractFlowMaterializer.rst index e78ee2b8cf..79e2c92837 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractFlowMaterializer.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractFlowMaterializer.rst @@ -8,7 +8,7 @@ extractFlowMaterializer Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractFlowMaterializer Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractLog.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractLog.rst index 78998b047e..8742ef5281 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractLog.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractLog.rst @@ -8,7 +8,7 @@ extractLog Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractLog Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequest.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequest.rst index c6f7241ef4..58243e5bf5 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequest.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequest.rst @@ -8,7 +8,7 @@ Extracts the complete ``HttpRequest`` instance. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractRequest Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequestContext.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequestContext.rst index 9933ba1486..50a73c6a83 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequestContext.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequestContext.rst @@ -8,7 +8,7 @@ extractRequestContext Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractRequestContext Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractSettings.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractSettings.rst index 4278bfc57b..4b7220dc1a 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractSettings.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractSettings.rst @@ -8,7 +8,7 @@ extractSettings Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractSettings Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUnmatchedPath.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUnmatchedPath.rst index f39280c3c0..e0c6e96ed1 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUnmatchedPath.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUnmatchedPath.rst @@ -8,7 +8,7 @@ Extracts the unmatched path from the request context. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractUnmatchedPath Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUri.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUri.rst index 3b8b51bd66..b1974db263 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUri.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUri.rst @@ -8,7 +8,7 @@ Access the full URI of the request. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: extractUri Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapInnerRoute.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapInnerRoute.rst index 6d3d6e458a..2341416eee 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapInnerRoute.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapInnerRoute.rst @@ -8,7 +8,7 @@ Changes the execution model of the inner route by wrapping it with arbitrary log Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapInnerRoute Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRejections.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRejections.rst index 32dffab7cd..6592c1189c 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRejections.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRejections.rst @@ -8,7 +8,7 @@ Transforms the list of rejections the inner route produced. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRejections Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequest.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequest.rst index 5baa48dacc..38e1926bfd 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequest.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequest.rst @@ -8,7 +8,7 @@ Transforms the request before it is handled by the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRequest Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequestContext.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequestContext.rst index 3bb626cafa..ed677a7243 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequestContext.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequestContext.rst @@ -8,7 +8,7 @@ Transforms the ``RequestContext`` before it is passed to the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRequestContext Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponse.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponse.rst index 6b8b97970d..6bdcbcda04 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponse.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponse.rst @@ -8,7 +8,7 @@ Changes the response that was generated by the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapResponse Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseEntity.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseEntity.rst index c5749f7d0e..f5e91bb46e 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseEntity.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseEntity.rst @@ -8,7 +8,7 @@ Changes the response entity that was generated by the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapResponseEntity Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseHeaders.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseHeaders.rst index f65feffc18..9023b70b16 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseHeaders.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseHeaders.rst @@ -8,7 +8,7 @@ Changes the list of response headers that was generated by the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapResponseHeaders Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResult.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResult.rst index 68feb84ef3..a9afcaa3fc 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResult.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResult.rst @@ -8,7 +8,7 @@ Changes the message the inner route sends to the responder. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRouteResult Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultFuture.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultFuture.rst index a5b5e514fe..c7dd1e3214 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultFuture.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultFuture.rst @@ -8,7 +8,7 @@ mapRouteResultFuture Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRouteResultFuture Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultPF.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultPF.rst index 6f28944017..6b421d1bba 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultPF.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultPF.rst @@ -8,7 +8,7 @@ Changes the message the inner route sends to the responder. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRouteResultPF Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWith.rst index 237451033f..3eea77bff5 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWith.rst @@ -8,7 +8,7 @@ mapRouteResultWith Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRouteResultWith Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWithPF.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWithPF.rst index fad0084376..4c6961579f 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWithPF.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWithPF.rst @@ -8,7 +8,7 @@ mapRouteResultWithPF Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapRouteResultWithPF Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapSettings.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapSettings.rst index 4d979a29e1..55dc21147d 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapSettings.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapSettings.rst @@ -8,7 +8,7 @@ mapSettings Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapSettings Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapUnmatchedPath.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapUnmatchedPath.rst index 0f7807baa0..a5172e8d5a 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapUnmatchedPath.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapUnmatchedPath.rst @@ -8,7 +8,7 @@ Transforms the unmatchedPath field of the request context for inner routes. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: mapUnmatchedPath Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/pass.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/pass.rst index 00a5c266d4..81c046cba7 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/pass.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/pass.rst @@ -8,7 +8,7 @@ A directive that passes the request unchanged to its inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: pass Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/provide.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/provide.rst index f2ea345e41..1163aa56af 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/provide.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/provide.rst @@ -8,7 +8,7 @@ Provides a constant value to the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: provide Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejections.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejections.rst index 8d79bc1203..e00837aaab 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejections.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejections.rst @@ -8,7 +8,7 @@ recoverRejections Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: recoverRejections Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejectionsWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejectionsWith.rst index 4fa93a3720..755f9ef595 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejectionsWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejectionsWith.rst @@ -8,7 +8,7 @@ recoverRejectionsWith Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: recoverRejectionsWith Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/textract.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/textract.rst index 4ce0a5b694..000e14f86e 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/textract.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/textract.rst @@ -8,7 +8,7 @@ Calculates a tuple of values from the request context and provides them to the i Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: textract Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/tprovide.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/tprovide.rst index e0a442f4f5..285c3b6de8 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/tprovide.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/tprovide.rst @@ -8,7 +8,7 @@ Provides a tuple of values to the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: tprovide Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withExecutionContext.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withExecutionContext.rst index a75f28223c..5f2b4f9f40 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withExecutionContext.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withExecutionContext.rst @@ -8,7 +8,7 @@ withExecutionContext Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: withExecutionContext Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withFlowMaterializer.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withFlowMaterializer.rst index 8054897939..59074bcf06 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withFlowMaterializer.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withFlowMaterializer.rst @@ -8,7 +8,7 @@ withFlowMaterializer Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: withFlowMaterializer Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withLog.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withLog.rst index d159760fab..959cbac205 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withLog.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withLog.rst @@ -8,7 +8,7 @@ withLog Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: withLog Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withSettings.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withSettings.rst index 1d0f76206f..a18e100fd6 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withSettings.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withSettings.rst @@ -8,7 +8,7 @@ withSettings Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala :snippet: withSettings Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst index 58b4aed359..65b582c9f3 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst @@ -10,7 +10,7 @@ by http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CacheConditionDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CacheConditionDirectives.scala :snippet: conditional diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequest.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequest.rst index 17b5c4fa75..f1007eedc9 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequest.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequest.rst @@ -9,7 +9,7 @@ Tries to decode the request with the specified ``Decoder`` or rejects the reques Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala :snippet: decodeRequest Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequestWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequestWith.rst index 598586aafc..a84a39dbfa 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequestWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequestWith.rst @@ -8,7 +8,7 @@ decodeRequestWith Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala :snippet: decodeRequestWith Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponse.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponse.rst index b3c3f26f48..08b4471cdc 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponse.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponse.rst @@ -9,7 +9,7 @@ Tries to encode the response with the specified ``Encoder`` or rejects the reque Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala :snippet: encodeResponse Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponseWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponseWith.rst index 5233fd5b88..06d1c185ec 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponseWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponseWith.rst @@ -8,7 +8,7 @@ encodeResponseWith Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala :snippet: encodeResponseWith Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/requestEncodedWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/requestEncodedWith.rst index ff19607ce6..471cc2ec54 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/requestEncodedWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/requestEncodedWith.rst @@ -9,7 +9,7 @@ rejects the request with an ``UnacceptedRequestEncodingRejection(encoding)``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala :snippet: requestEncodedWith Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/responseEncodingAccepted.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/responseEncodingAccepted.rst index 6a340bfffd..6d8d4a08d6 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/responseEncodingAccepted.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/responseEncodingAccepted.rst @@ -9,7 +9,7 @@ rejects the request with an ``UnacceptedResponseEncodingRejection(encoding)``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala :snippet: responseEncodingAccepted Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/cookie.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/cookie.rst index 17f6dfc77b..ceb6de5fcb 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/cookie.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/cookie.rst @@ -9,7 +9,7 @@ the cookie is missing. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala :snippet: cookie Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/deleteCookie.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/deleteCookie.rst index ec287b6873..fe43aba81d 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/deleteCookie.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/deleteCookie.rst @@ -8,7 +8,7 @@ Adds a header to the response to request the removal of the cookie with the give Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala :snippet: deleteCookie Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/optionalCookie.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/optionalCookie.rst index 614204eb35..6b10c6044a 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/optionalCookie.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/optionalCookie.rst @@ -8,7 +8,7 @@ Extracts an optional cookie with a given name from a request. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala :snippet: optionalCookie Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/setCookie.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/setCookie.rst index d4afb2856a..5647327159 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/setCookie.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/setCookie.rst @@ -8,7 +8,7 @@ Adds a header to the response to request the update of the cookie with the given Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala :snippet: setCookie Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleExceptions.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleExceptions.rst index fb90d5cd55..25f3cf4948 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleExceptions.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleExceptions.rst @@ -8,7 +8,7 @@ Catches exceptions thrown by the inner route and handles them using the specifie Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala :snippet: handleExceptions Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleRejections.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleRejections.rst index 7feb7a5ff7..4f68926642 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleRejections.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleRejections.rst @@ -8,7 +8,7 @@ Handles rejections produced by the inner route and handles them using the specif Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala :snippet: handleRejections Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.rst index 7babd5422d..77766eefc1 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.rst @@ -9,7 +9,7 @@ served as browsable listings. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala :snippet: getFromBrowseableDirectories Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.rst index 4cb815885d..215b9b4fa6 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.rst @@ -8,6 +8,6 @@ The single-directory variant of :ref:`-getFromBrowseableDirectories-`. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala :snippet: getFromBrowseableDirectory diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromDirectory.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromDirectory.rst index e75b5a7c7c..940ec4143d 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromDirectory.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromDirectory.rst @@ -8,7 +8,7 @@ Completes GET requests with the content of a file underneath the given directory Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala :snippet: getFromDirectory Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromFile.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromFile.rst index 0031d1a94d..dc505b8ed3 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromFile.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromFile.rst @@ -8,7 +8,7 @@ Completes GET requests with the content of the given file. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala :snippet: getFromFile Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResource.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResource.rst index 8be3cf95fe..745c045141 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResource.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResource.rst @@ -8,7 +8,7 @@ Completes GET requests with the content of the given classpath resource. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala :snippet: getFromResource Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.rst index 106578fe80..af77d3c030 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.rst @@ -8,7 +8,7 @@ Completes GET requests with the content of the given classpath resource director Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala :snippet: getFromResourceDirectory Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.rst index 92530c5b8c..51fbbc2dcb 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.rst @@ -9,7 +9,7 @@ directory contents is performed by the in-scope `Marshaller[DirectoryListing]`. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala :snippet: listDirectoryContents Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formField.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formField.rst index 6d4ac3ef0f..73c1d91971 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formField.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formField.rst @@ -8,7 +8,7 @@ An alias for :ref:`-formFields-`. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala :snippet: formField Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst index 61d56ff5f9..bd6d8bb049 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst @@ -44,7 +44,7 @@ as required, optional, or repeated, or to filter requests where a form field has extract multiple occurrences of field "distance" as ``Iterable[String]`` ``"distance".as[Int].*`` extract multiple occurrences of field "distance" as ``Iterable[Int]``, you need a matching implicit ``Deserializer`` in scope for that to work - (see also :ref:`unmarshalling`) + (see also :ref:`http-unmarshalling-scala`) ``"distance".as(deserializer).*`` extract multiple occurrences of field "distance" with an explicit ``Deserializer`` diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/completeOrRecoverWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/completeOrRecoverWith.rst index 76853bf4e6..d0ae968629 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/completeOrRecoverWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/completeOrRecoverWith.rst @@ -9,7 +9,7 @@ with the implicitly given ``ToResponseMarshaller[T]``. Runs the inner route if t Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala :snippet: completeOrRecoverWith Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onComplete.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onComplete.rst index f155604b73..dcddf9a285 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onComplete.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onComplete.rst @@ -9,7 +9,7 @@ result as a value of type ``Try[T]`` and passes it to the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala :snippet: onComplete Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onSuccess.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onSuccess.rst index 1ce09fe71e..1825fa6511 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onSuccess.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onSuccess.rst @@ -9,7 +9,7 @@ extracts its result as a value of type ``T`` and passes it to the inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala :snippet: onSuccess Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValue.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValue.rst index 5c03fae9ec..f25a5ed69a 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValue.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValue.rst @@ -9,7 +9,7 @@ Traverses the list of request headers with the specified function and extracts t Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala :snippet: headerValue Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByName.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByName.rst index 25bf1768d9..2e962686d4 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByName.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByName.rst @@ -8,7 +8,7 @@ Extracts the value of the HTTP request header with the given name. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala :snippet: headerValueByName Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValuePF.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValuePF.rst index f37692d04b..16fa95590f 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValuePF.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValuePF.rst @@ -9,7 +9,7 @@ result of calling the function. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala :snippet: headerValuePF Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValue.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValue.rst index dce0415dcd..94e2c7bfec 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValue.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValue.rst @@ -9,7 +9,7 @@ Traverses the list of request headers with the specified function and extracts t Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala :snippet: optionalHeaderValue Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByName.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByName.rst index 64bf605387..e029b127c6 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByName.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByName.rst @@ -8,7 +8,7 @@ Optionally extracts the value of the HTTP request header with the given name. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala :snippet: optionalHeaderValueByName Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValuePF.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValuePF.rst index 248ff86555..302439c4af 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValuePF.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValuePF.rst @@ -9,7 +9,7 @@ result of calling the function. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala :snippet: optionalHeaderValuePF Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/extractHost.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/extractHost.rst index d234e78f6c..185bdd953b 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/extractHost.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/extractHost.rst @@ -9,7 +9,7 @@ Extracts the hostname part of the Host header value in the request. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala :snippet: extractHost diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/host.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/host.rst index 6faf6355e4..0b2d3b86f0 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/host.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/host.rst @@ -10,7 +10,7 @@ in the request. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala :snippet: host diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/completeWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/completeWith.rst index b5ee86a344..6896d83abc 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/completeWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/completeWith.rst @@ -9,7 +9,7 @@ inner route. You can use it to decouple marshaller resolution from request comp Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala :snippet: completeWith[T] Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst index 15ad2704c7..d95b73b6d8 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst @@ -11,7 +11,7 @@ The ``entity`` method will either pass the ``value`` to the inner route or map t Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala :snippet: entity Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst index d2a311fd2a..e4c7bdb487 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst @@ -11,7 +11,7 @@ the in-scope marshaller. ``handleWith`` can be a convenient method combining `` Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala :snippet: handleWith Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/delete.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/delete.rst index 00f69244e7..d3aba4aeec 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/delete.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/delete.rst @@ -8,7 +8,7 @@ Matches requests with HTTP method ``DELETE``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: delete diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/extractMethod.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/extractMethod.rst index 5f9085175d..98e8614c48 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/extractMethod.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/extractMethod.rst @@ -8,7 +8,7 @@ extractMethod Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: extractMethod Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/get.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/get.rst index 0da6fcf195..1a24e9f8ef 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/get.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/get.rst @@ -8,7 +8,7 @@ Matches requests with HTTP method ``GET``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: get Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst index 18de2bbb3b..3d0414af3f 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst @@ -8,7 +8,7 @@ Matches requests with HTTP method ``HEAD``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: head Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/method.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/method.rst index b21752bf37..a21d8903ac 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/method.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/method.rst @@ -8,7 +8,7 @@ Matches HTTP requests based on their method. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: method Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/options.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/options.rst index e35ef71493..63b206d2dc 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/options.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/options.rst @@ -8,7 +8,7 @@ Matches requests with HTTP method ``OPTIONS``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: options Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/overrideMethodWithParameter.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/overrideMethodWithParameter.rst index 1c91b96b49..e21c0a0bfe 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/overrideMethodWithParameter.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/overrideMethodWithParameter.rst @@ -8,7 +8,7 @@ overrideMethodWithParameter Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: overrideMethodWithParameter Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/patch.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/patch.rst index e7abe883f1..f6f5bd824c 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/patch.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/patch.rst @@ -8,7 +8,7 @@ Matches requests with HTTP method ``PATCH``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: patch Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/post.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/post.rst index 766f5d55c0..047f0f3bd1 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/post.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/post.rst @@ -8,7 +8,7 @@ Matches requests with HTTP method ``POST``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: post Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/put.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/put.rst index b2522ec7a3..f40dec10e7 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/put.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/put.rst @@ -8,7 +8,7 @@ Matches requests with HTTP method ``PUT``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala :snippet: put Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst index 3f6d3ec6a2..d8e2db32a2 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst @@ -9,7 +9,7 @@ Provides the value of ``X-Forwarded-For``, ``Remote-Address``, or ``X-Real-IP`` Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala :snippet: extractClientIP Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/rejectEmptyResponse.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/rejectEmptyResponse.rst index 30aeb74129..b9589e7393 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/rejectEmptyResponse.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/rejectEmptyResponse.rst @@ -8,7 +8,7 @@ Replaces a response with no content with an empty rejection. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala :snippet: rejectEmptyResponse diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityEmpty.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityEmpty.rst index 2e2e0c8791..1faf57fa43 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityEmpty.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityEmpty.rst @@ -10,7 +10,7 @@ Otherwise, the request is rejected. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala :snippet: requestEntityEmpty diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityPresent.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityPresent.rst index 6fe3426999..d2b705fb5c 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityPresent.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityPresent.rst @@ -10,7 +10,7 @@ Otherwise, the request is rejected. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala :snippet: requestEntityPresent diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/validate.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/validate.rst index c3c1fa8c79..755121f591 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/validate.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/validate.rst @@ -9,7 +9,7 @@ request with a ``ValidationRejection`` containing the given error message. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala :snippet: validate diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameter.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameter.rst index 26e8b5f9f8..bcd79c8915 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameter.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameter.rst @@ -8,7 +8,7 @@ An alias for :ref:`-parameters-`. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala :snippet: parameter Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMap.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMap.rst index 89984f0beb..0e2f3890bd 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMap.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMap.rst @@ -9,7 +9,7 @@ parameter values. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala :snippet: parameterMap Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMultiMap.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMultiMap.rst index 5a1cab1b05..7c6f3e01b9 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMultiMap.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMultiMap.rst @@ -9,7 +9,7 @@ a parameter name to a list of all its values. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala :snippet: parameterMultiMap Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterSeq.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterSeq.rst index d2f5e349ad..3549e782cf 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterSeq.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterSeq.rst @@ -8,7 +8,7 @@ Extracts all parameters at once in the original order as (name, value) tuples of Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala :snippet: parameterSeq Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst index ce61d3a424..15fccb465b 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst @@ -43,7 +43,7 @@ as required, optional, or repeated, or to filter requests where a parameter has extract multiple occurrences of parameter "distance" as ``Iterable[String]`` ``"distance".as[Int].*`` extract multiple occurrences of parameter "distance" as ``Iterable[Int]``, you need a matching ``Deserializer`` in scope for that to work - (see also :ref:`unmarshalling`) + (see also :ref:`http-unmarshalling-scala`) ``"distance".as(deserializer).*`` extract multiple occurrences of parameter "distance" with an explicit ``Deserializer`` @@ -89,13 +89,13 @@ Deserialized parameter :snippet: mapped-value Repeated parameter -+++++++++++++++++++++++++++++ +++++++++++++++++++ ... includecode2:: ../../../../code/docs/http/scaladsl/server/directives/ParameterDirectivesExamplesSpec.scala :snippet: repeated Repeated, deserialized parameter -++++++++++++++++++++++ +++++++++++++++++++++++++++++++++ ... includecode2:: ../../../../code/docs/http/scaladsl/server/directives/ParameterDirectivesExamplesSpec.scala :snippet: mapped-repeated diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/path.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/path.rst index a4b4273198..ee32066289 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/path.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/path.rst @@ -10,7 +10,7 @@ one or more values (depending on the type of the argument). Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: path diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEnd.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEnd.rst index 7153a0f093..46cd3c9204 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEnd.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEnd.rst @@ -10,7 +10,7 @@ path has been fully matched by a higher-level :ref:`-path-` or :ref:`-pathPrefix Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: pathEnd diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEndOrSingleSlash.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEndOrSingleSlash.rst index 4f41b2333f..ae5fefcc7e 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEndOrSingleSlash.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEndOrSingleSlash.rst @@ -10,7 +10,7 @@ or contains only one single slash. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: pathEndOrSingleSlash diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefix.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefix.rst index 02ae94f08d..aa466d6fe2 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefix.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefix.rst @@ -10,7 +10,7 @@ potentially extracts one or more values (depending on the type of the argument). Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: pathPrefix diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefixTest.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefixTest.rst index 4167886097..b880efdebc 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefixTest.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefixTest.rst @@ -11,7 +11,7 @@ the unmatched path. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: pathPrefixTest diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSingleSlash.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSingleSlash.rst index d888bc6763..abbf6f60e9 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSingleSlash.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSingleSlash.rst @@ -10,7 +10,7 @@ contains exactly one single slash. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: pathSingleSlash diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffix.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffix.rst index 4e0f6aa9c0..ccd6f42cc7 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffix.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffix.rst @@ -10,7 +10,7 @@ potentially extracts one or more values (depending on the type of the argument). Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: pathSuffix diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffixTest.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffixTest.rst index 2df4812f02..1d78c458cd 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffixTest.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffixTest.rst @@ -11,7 +11,7 @@ the unmatched path. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: pathSuffixTest diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefix.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefix.rst index 8581a7bd66..36a81c606e 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefix.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefix.rst @@ -10,7 +10,7 @@ potentially extracts one or more values (depending on the type of the argument). Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: rawPathPrefix diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefixTest.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefixTest.rst index c567ca3aea..7d895e32dd 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefixTest.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/rawPathPrefixTest.rst @@ -11,7 +11,7 @@ the unmatched path. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: rawPathPrefixTest diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.rst index 21d54f5f3d..1c5e0a9224 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.rst @@ -8,7 +8,7 @@ redirectToNoTrailingSlashIfPresent Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: redirectToNoTrailingSlashIfPresent Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.rst index 1eb0740a10..529681c190 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.rst @@ -8,7 +8,7 @@ redirectToTrailingSlashIfMissing Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala :snippet: redirectToTrailingSlashIfMissing Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/overrideStatusCode.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/overrideStatusCode.rst index 29cd2cc18b..acd5705475 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/overrideStatusCode.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/overrideStatusCode.rst @@ -9,7 +9,7 @@ Overrides the status code of all responses coming back from its inner route with Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala :snippet: overrideStatusCode diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.rst index 3bc922a51d..1dd146f6fa 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.rst @@ -10,7 +10,7 @@ exist yet in the response. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala :snippet: respondWithDefaultHeader diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.rst index 67619516a7..a661dc1947 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.rst @@ -10,7 +10,7 @@ name doesn't exist yet in the response. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala :snippet: respondWithDefaultHeaders diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeader.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeader.rst index 4c0f893ae6..a9ffbe3346 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeader.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeader.rst @@ -9,7 +9,7 @@ Adds a given HTTP header to all responses coming back from its inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala :snippet: respondWithHeader diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeaders.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeaders.rst index b1673a0e2a..cd82efea22 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeaders.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/respond-with-directives/respondWithHeaders.rst @@ -9,7 +9,7 @@ Adds the given HTTP headers to all responses coming back from its inner route. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala :snippet: respondWithHeaders diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/failWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/failWith.rst index 80e7923ac2..ebd6e89167 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/failWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/failWith.rst @@ -10,7 +10,7 @@ directive and its ``ExceptionHandler``. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala :snippet: failWith diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/redirect.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/redirect.rst index af8e475c98..35bab822e3 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/redirect.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/redirect.rst @@ -9,7 +9,7 @@ Completes the request with a redirection response to a given targer URI and of a Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala :snippet: redirect @@ -19,7 +19,7 @@ Description ``redirect`` is a convenience helper for completing the request with a redirection response. It is equivalent to this snippet relying on the ``complete`` directive: -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala :snippet: red-impl diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/reject.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/reject.rst index ba1150c1f4..88db0568ae 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/reject.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/reject.rst @@ -9,7 +9,7 @@ Explicitly rejects the request optionally using the given rejection(s). Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala :snippet: reject diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/extractScheme.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/extractScheme.rst index 3258174a5f..e4ba2350c3 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/extractScheme.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/extractScheme.rst @@ -8,7 +8,7 @@ Extracts the value of the request Uri scheme. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SchemeDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SchemeDirectives.scala :snippet: extractScheme Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/scheme.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/scheme.rst index 62ce57693c..e93d3ca276 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/scheme.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/scheme-directives/scheme.rst @@ -8,7 +8,7 @@ Rejects a request if its Uri scheme does not match a given one. Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SchemeDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SchemeDirectives.scala :snippet: scheme Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasic.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasic.rst index 927ea6aca4..7de45edcbc 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasic.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasic.rst @@ -8,7 +8,7 @@ authenticateBasic Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala :snippet: authenticateBasic Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicAsync.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicAsync.rst index 7548ec8758..9f94352d9b 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicAsync.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicAsync.rst @@ -8,7 +8,7 @@ authenticateBasicAsync Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala :snippet: authenticateBasicAsync Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPF.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPF.rst index ca353b70d9..41943b892f 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPF.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPF.rst @@ -8,7 +8,7 @@ authenticateBasicPF Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala :snippet: authenticateBasicPF Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPFAsync.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPFAsync.rst index 8d1eab0a0d..d23c111484 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPFAsync.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateBasicPFAsync.rst @@ -8,7 +8,7 @@ authenticateBasicPFAsync Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala :snippet: authenticateBasicPFAsync Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.rst index 890998c024..576396baf5 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.rst @@ -8,7 +8,7 @@ authenticateOrRejectWithChallenge Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala :snippet: authenticateOrRejectWithChallenge Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authorize.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authorize.rst index 4ac5890969..6ae2f95234 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authorize.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/authorize.rst @@ -8,7 +8,7 @@ authorize Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala :snippet: authorize Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/extractCredentials.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/extractCredentials.rst index a073fbf863..35ef247c24 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/extractCredentials.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/security-directives/extractCredentials.rst @@ -8,7 +8,7 @@ extractCredentials Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala :snippet: extractCredentials Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/websocket-directives/handleWebsocketMessages.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/websocket-directives/handleWebsocketMessages.rst index 291fb0415e..8995998829 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/websocket-directives/handleWebsocketMessages.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/websocket-directives/handleWebsocketMessages.rst @@ -8,7 +8,7 @@ handleWebsocketMessages Signature --------- -.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/WebsocketDirectives.scala +.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/WebsocketDirectives.scala :snippet: handleWebsocketMessages Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/exception-handling.rst b/akka-docs-dev/rst/scala/http/routing-dsl/exception-handling.rst index 6aefc1ffa3..c59280c8cd 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/exception-handling.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/exception-handling.rst @@ -11,7 +11,7 @@ of converting an exception to its argument, an ExceptionHandler__, which is defi trait ExceptionHandler extends PartialFunction[Throwable, Route] -__ @github@/akka-http-scala/src/main/scala/akka/http/scaladsl/server/ExceptionHandler.scala +__ @github@/akka-http/src/main/scala/akka/http/scaladsl/server/ExceptionHandler.scala Since an ``ExceptionHandler`` is a partial function it can choose, which exceptions it would like to handle and which not. Unhandled exceptions will simply continue to bubble up in the route structure. diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/https-support.rst b/akka-docs-dev/rst/scala/http/routing-dsl/https-support.rst deleted file mode 100644 index ad9883d95b..0000000000 --- a/akka-docs-dev/rst/scala/http/routing-dsl/https-support.rst +++ /dev/null @@ -1,4 +0,0 @@ -Server-Side HTTPS Support -========================= - -TODO \ No newline at end of file diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/index.rst b/akka-docs-dev/rst/scala/http/routing-dsl/index.rst index 72801b7f78..fbfb495268 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/index.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/index.rst @@ -19,7 +19,6 @@ static content serving. path-matchers case-class-extraction testkit - https-support websocket-support diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/rejections.rst b/akka-docs-dev/rst/scala/http/routing-dsl/rejections.rst index e0be338634..ab99dc24fd 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/rejections.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/rejections.rst @@ -33,7 +33,7 @@ type ``Rejection``. Akka HTTP comes with a set of `predefined rejections`__, whi Rejections are gathered up over the course of a Route evaluation and finally converted to ``HttpResponse`` replies by the :ref:`-handleRejections-` directive if there was no way for the request to be completed. -__ @github@/akka-http-scala/src/main/scala/akka/http/scaladsl/server/Rejection.scala +__ @github@/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala .. _The RejectionHandler: @@ -46,7 +46,7 @@ RejectionHandler__, which is defined like this:: trait RejectionHandler extends (immutable.Seq[Rejection] ⇒ Option[Route]) -__ @github@/akka-http-scala/src/main/scala/akka/http/scaladsl/server/RejectionHandler.scala +__ @github@/akka-http/src/main/scala/akka/http/scaladsl/server/RejectionHandler.scala Since a ``RejectionHandler`` returns an ``Option[Route]`` it can choose whether it would like to handle the current set of rejections or not. If it returns ``None`` the rejections will simply continue to flow through the route structure. diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala index ae78d87341..08851017e0 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala @@ -569,11 +569,14 @@ object Http extends ExtensionId[HttpExt] with ExtensionIdProvider { import JavaConverters._ +//# https-context-impl case class HttpsContext(sslContext: SSLContext, enabledCipherSuites: Option[immutable.Seq[String]] = None, enabledProtocols: Option[immutable.Seq[String]] = None, clientAuth: Option[ClientAuth] = None, - sslParameters: Option[SSLParameters] = None) extends akka.http.javadsl.HttpsContext { + sslParameters: Option[SSLParameters] = None) +//# + extends akka.http.javadsl.HttpsContext { def firstSession = NegotiateNewSession(enabledCipherSuites, enabledProtocols, clientAuth, sslParameters) /** Java API */ diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala index ec8c58597b..27d3aa1f2b 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala @@ -115,12 +115,12 @@ trait BasicDirectives { mapRequestContext(_ mapUnmatchedPath f) /** - * Extracts the unmatched path from the RequestContext. + * Extracts the yet unmatched path from the RequestContext. */ def extractUnmatchedPath: Directive1[Uri.Path] = BasicDirectives._extractUnmatchedPath /** - * Extracts the complete request. + * Extracts the current [[HttpRequest]] instance. */ def extractRequest: Directive1[HttpRequest] = BasicDirectives._extractRequest diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala index e7a937fc2e..5a5c46c9a5 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala @@ -23,14 +23,14 @@ trait CodingDirectives { /** * Rejects the request with an UnacceptedResponseEncodingRejection - * if the given encoding is not accepted for the response. + * if the given response encoding is not accepted by the client. */ def responseEncodingAccepted(encoding: HttpEncoding): Directive0 = extract(_.request.isEncodingAccepted(encoding)) .flatMap(if (_) pass else reject(UnacceptedResponseEncodingRejection(Set(encoding)))) /** - * Encodes the response with the encoding that is requested by the client with the `Accept- + * Encodes the response with the encoding that is requested by the client via the `Accept- * Encoding` header. The response encoding is determined by the rules specified in * http://tools.ietf.org/html/rfc7231#section-5.3.4. * @@ -41,7 +41,7 @@ trait CodingDirectives { encodeResponseWith(NoCoding, Gzip, Deflate) /** - * Encodes the response with the encoding that is requested by the client with the `Accept- + * Encodes the response with the encoding that is requested by the client via the `Accept- * Encoding` header. The response encoding is determined by the rules specified in * http://tools.ietf.org/html/rfc7231#section-5.3.4. * diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala index 2bcb530ed1..893a9976fb 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala @@ -6,7 +6,7 @@ package akka.http.scaladsl.server package directives import akka.http.scaladsl.model._ -import headers._ +import akka.http.scaladsl.model.headers._ import akka.http.impl.util._ trait CookieDirectives { @@ -15,14 +15,14 @@ trait CookieDirectives { import RouteDirectives._ /** - * Extracts an HttpCookie with the given name. If the cookie is not present the + * Extracts the [[HttpCookiePair]] with the given name. If the cookie is not present the * request is rejected with a respective [[MissingCookieRejection]]. */ def cookie(name: String): Directive1[HttpCookiePair] = headerValue(findCookie(name)) | reject(MissingCookieRejection(name)) /** - * Extracts an HttpCookie with the given name. + * Extracts the [[HttpCookiePair]] with the given name as an ``Option[HttpCookiePair]``. * If the cookie is not present a value of `None` is extracted. */ def optionalCookie(name: String): Directive1[Option[HttpCookiePair]] = @@ -34,13 +34,13 @@ trait CookieDirectives { } /** - * Adds a Set-Cookie header with the given cookies to all responses of its inner route. + * Adds a [[Set-Cookie]] response header with the given cookies. */ def setCookie(first: HttpCookie, more: HttpCookie*): Directive0 = respondWithHeaders((first :: more.toList).map(`Set-Cookie`(_))) /** - * Adds a Set-Cookie header expiring the given cookies to all responses of its inner route. + * Adds a [[Set-Cookie]] response header expiring the given cookies. */ def deleteCookie(first: HttpCookie, more: HttpCookie*): Directive0 = respondWithHeaders((first :: more.toList).map { c ⇒ @@ -48,7 +48,7 @@ trait CookieDirectives { }) /** - * Adds a Set-Cookie header expiring the given cookie to all responses of its inner route. + * Adds a [[Set-Cookie]] response header expiring the cookie with the given properties. */ def deleteCookie(name: String, domain: String = "", path: String = ""): Directive0 = deleteCookie(HttpCookie(name, "", domain = domain.toOption, path = path.toOption)) diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/DebuggingDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/DebuggingDirectives.scala index a7fe5d6809..3652795f3c 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/DebuggingDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/DebuggingDirectives.scala @@ -12,12 +12,18 @@ import akka.http.scaladsl.model._ trait DebuggingDirectives { import BasicDirectives._ + /** + * Produces a log entry for every incoming request. + */ def logRequest(magnet: LoggingMagnet[HttpRequest ⇒ Unit]): Directive0 = extractRequestContext.flatMap { ctx ⇒ magnet.f(ctx.log)(ctx.request) pass } + /** + * Produces a log entry for every [[RouteResult]]. + */ def logResult(magnet: LoggingMagnet[RouteResult ⇒ Unit]): Directive0 = extractRequestContext.flatMap { ctx ⇒ mapRouteResult { result ⇒ @@ -26,6 +32,9 @@ trait DebuggingDirectives { } } + /** + * Produces a log entry for every incoming request and [[RouteResult]]. + */ def logRequestResult(magnet: LoggingMagnet[HttpRequest ⇒ RouteResult ⇒ Unit]): Directive0 = extractRequestContext.flatMap { ctx ⇒ val logResult = magnet.f(ctx.log)(ctx.request) diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala index cbe4efeae0..3405295164 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala @@ -26,25 +26,22 @@ trait FileAndResourceDirectives { import RangeDirectives._ /** - * Completes GET requests with the content of the given file. The actual I/O operation is - * running detached in a `Future`, so it doesn't block the current thread (but potentially - * some other thread !). If the file cannot be found or read the request is rejected. + * Completes GET requests with the content of the given file. + * If the file cannot be found or read the request is rejected. */ def getFromFile(fileName: String)(implicit resolver: ContentTypeResolver): Route = getFromFile(new File(fileName)) /** - * Completes GET requests with the content of the given file. The actual I/O operation is - * running detached in a `Future`, so it doesn't block the current thread (but potentially - * some other thread !). If the file cannot be found or read the request is rejected. + * Completes GET requests with the content of the given file. + * If the file cannot be found or read the request is rejected. */ def getFromFile(file: File)(implicit resolver: ContentTypeResolver): Route = getFromFile(file, resolver(file.getName)) /** - * Completes GET requests with the content of the given file. The actual I/O operation is - * running detached in a `Future`, so it doesn't block the current thread (but potentially - * some other thread !). If the file cannot be found or read the request is rejected. + * Completes GET requests with the content of the given file. + * If the file cannot be found or read the request is rejected. */ def getFromFile(file: File, contentType: ContentType): Route = get { @@ -71,18 +68,14 @@ trait FileAndResourceDirectives { } else pass) /** - * Completes GET requests with the content of the given resource. The actual I/O operation is - * running detached in a `Future`, so it doesn't block the current thread (but potentially - * some other thread !). + * Completes GET requests with the content of the given class-path resource. * If the resource cannot be found or read the Route rejects the request. */ def getFromResource(resourceName: String)(implicit resolver: ContentTypeResolver): Route = getFromResource(resourceName, resolver(resourceName)) /** - * Completes GET requests with the content of the given resource. The actual I/O operation is - * running detached in a `Future`, so it doesn't block the current thread (but potentially - * some other thread !). + * Completes GET requests with the content of the given resource. * If the resource is a directory or cannot be found or read the Route rejects the request. */ def getFromResource(resourceName: String, contentType: ContentType, classLoader: ClassLoader = defaultClassLoader): Route = diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala index 991366a874..174e39ecf2 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala @@ -16,14 +16,14 @@ trait FormFieldDirectives extends ToNameReceptacleEnhancements { import FormFieldDirectives._ /** + * Extracts an HTTP form field from the request. * Rejects the request if the defined form field matcher(s) don't match. - * Otherwise the form field value(s) are extracted and passed to the inner route. */ def formField(pdm: FieldMagnet): pdm.Out = pdm() /** + * Extracts a number of HTTP form field from the request. * Rejects the request if the defined form field matcher(s) don't match. - * Otherwise the form field value(s) are extracted and passed to the inner route. */ def formFields(pdm: FieldMagnet): pdm.Out = pdm() diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala index 5bd4b10569..d5084bfe00 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala @@ -16,7 +16,7 @@ import akka.http.scaladsl.util.FastFuture._ trait FutureDirectives { /** - * "Unwraps" a ``Future[T]`` and runs its inner route after future + * "Unwraps" a ``Future[T]`` and runs the inner route after future * completion with the future's value as an extraction of type ``Try[T]``. */ def onComplete[T](future: ⇒ Future[T]): Directive1[Try[T]] = @@ -26,7 +26,7 @@ trait FutureDirectives { } /** - * "Unwraps" a ``Future[T]`` and runs its inner route after future + * "Unwraps" a ``Future[T]`` and runs the inner route after future * completion with the future's value as an extraction of type ``T``. * If the future fails its failure Throwable is bubbled up to the nearest * ExceptionHandler. @@ -36,7 +36,7 @@ trait FutureDirectives { def onSuccess(magnet: OnSuccessMagnet): Directive[magnet.Out] = magnet.directive /** - * "Unwraps" a ``Future[T]`` and runs its inner route when the future has failed + * "Unwraps" a ``Future[T]`` and runs the inner route when the future has failed * with the future's failure exception as an extraction of type ``Throwable``. * If the future succeeds the request is completed using the values marshaller * (This directive therefore requires a marshaller for the futures type to be diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala index 5c670dd4d3..42be1e0ebd 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala @@ -40,7 +40,7 @@ trait HeaderDirectives { def headerValuePF[T](pf: PartialFunction[HttpHeader, T]): Directive1[T] = headerValue(pf.lift) /** - * Extracts the value of the HTTP request header with the given name. + * Extracts the value of the first HTTP request header with the given name. * If no header with a matching name is found the request is rejected with a [[spray.routing.MissingHeaderRejection]]. */ def headerValueByName(headerName: Symbol): Directive1[String] = headerValueByName(headerName.toString) @@ -53,7 +53,7 @@ trait HeaderDirectives { headerValue(optionalValue(headerName.toLowerCase)) | reject(MissingHeaderRejection(headerName)) /** - * Extracts the HTTP request header of the given type. + * Extracts the first HTTP request header of the given type. * If no header with a matching type is found the request is rejected with a [[spray.routing.MissingHeaderRejection]]. */ def headerValueByType[T <: HttpHeader](magnet: ClassMagnet[T]): Directive1[T] = diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala index de52962b6d..977978ba74 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala @@ -13,7 +13,7 @@ trait HostDirectives { import RouteDirectives._ /** - * Extracts the hostname part of the Host header value in the request. + * Extracts the hostname part of the Host request header value. */ def extractHost: Directive1[String] = HostDirectives._extractHost diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala index 08f6f98491..820cb0cd62 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala @@ -15,37 +15,37 @@ trait MethodDirectives { import MethodDirectives._ /** - * A route filter that rejects all non-DELETE requests. + * Rejects all non-DELETE requests. */ def delete: Directive0 = _delete /** - * A route filter that rejects all non-GET requests. + * Rejects all non-GET requests. */ def get: Directive0 = _get /** - * A route filter that rejects all non-HEAD requests. + * Rejects all non-HEAD requests. */ def head: Directive0 = _head /** - * A route filter that rejects all non-OPTIONS requests. + * Rejects all non-OPTIONS requests. */ def options: Directive0 = _options /** - * A route filter that rejects all non-PATCH requests. + * Rejects all non-PATCH requests. */ def patch: Directive0 = _patch /** - * A route filter that rejects all non-POST requests. + * Rejects all non-POST requests. */ def post: Directive0 = _post /** - * A route filter that rejects all non-PUT requests. + * Rejects all non-PUT requests. */ def put: Directive0 = _put diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala index 42d531e816..3262d34b08 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala @@ -12,33 +12,33 @@ trait MiscDirectives { import RouteDirectives._ /** - * Returns a Directive which checks the given condition before passing on the [[spray.routing.RequestContext]] to - * its inner Route. If the condition fails the route is rejected with a [[spray.routing.ValidationRejection]]. + * Checks the given condition before running its inner route. + * If the condition fails the route is rejected with a [[ValidationRejection]]. */ def validate(check: ⇒ Boolean, errorMsg: String): Directive0 = Directive { inner ⇒ if (check) inner() else reject(ValidationRejection(errorMsg)) } /** - * Directive extracting the IP of the client from either the X-Forwarded-For, Remote-Address or X-Real-IP header + * Extracts the client's IP from either the X-Forwarded-For, Remote-Address or X-Real-IP header * (in that order of priority). */ def extractClientIP: Directive1[RemoteAddress] = MiscDirectives._extractClientIP /** - * Rejects the request if its entity is not empty. + * Rejects if the request entity is non-empty. */ def requestEntityEmpty: Directive0 = MiscDirectives._requestEntityEmpty /** - * Rejects empty requests with a RequestEntityExpectedRejection. + * Rejects with a [[RequestEntityExpectedRejection]] if the request entity is empty. * Non-empty requests are passed on unchanged to the inner route. */ def requestEntityPresent: Directive0 = MiscDirectives._requestEntityPresent /** * Converts responses with an empty entity into (empty) rejections. - * This way you can, for example, have the marshalling of a ''None'' option be treated as if the request could - * not be matched. + * This way you can, for example, have the marshalling of a ''None'' option + * be treated as if the request could not be matched. */ def rejectEmptyResponse: Directive0 = MiscDirectives._rejectEmptyResponse } diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala index 90b0dfb6fb..1a7a63ce94 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala @@ -15,29 +15,29 @@ trait ParameterDirectives extends ToNameReceptacleEnhancements { import ParameterDirectives._ /** - * Extracts the requests query parameters as a Map[String, String]. + * Extracts the request's query parameters as a ``Map[String, String]``. */ def parameterMap: Directive1[Map[String, String]] = _parameterMap /** - * Extracts the requests query parameters as a Map[String, List[String]]. + * Extracts the request's query parameters as a ``Map[String, List[String]]``. */ def parameterMultiMap: Directive1[Map[String, List[String]]] = _parameterMultiMap /** - * Extracts the requests query parameters as a Seq[(String, String)]. + * Extracts the request's query parameters as a ``Seq[(String, String)]``. */ def parameterSeq: Directive1[immutable.Seq[(String, String)]] = _parameterSeq /** + * Extracts a query parameter value from the request. * Rejects the request if the defined query parameter matcher(s) don't match. - * Otherwise the parameter value(s) are extracted and passed to the inner route. */ def parameter(pdm: ParamMagnet): pdm.Out = pdm() /** + * Extracts a number of query parameter values from the request. * Rejects the request if the defined query parameter matcher(s) don't match. - * Otherwise the parameter value(s) are extracted and passed to the inner route. */ def parameters(pdm: ParamMagnet): pdm.Out = pdm() diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala index 3c2896056e..3ada67aecd 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala @@ -15,23 +15,22 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w import PathMatcher._ /** - * Consumes a leading slash from the unmatched path of the [[akka.http.scaladsl.server.RequestContext]] - * before applying the given matcher. The matcher has to match the remaining path completely - * or leave only a single trailing slash. - * If matched the value extracted by the PathMatcher is extracted on the directive level. + * Applies the given [[PathMatcher]] to the remaining unmatched path after consuming a leading slash. + * The matcher has to match the remaining path completely. + * If matched the value extracted by the [[PathMatcher]] is extracted on the directive level. */ def path[L](pm: PathMatcher[L]): Directive[L] = pathPrefix(pm ~ PathEnd) /** - * Consumes a leading slash from the unmatched path of the [[akka.http.scaladsl.server.RequestContext]] - * before applying the given matcher. The matcher has to match a prefix of the remaining path. + * Applies the given [[PathMatcher]] to a prefix of the remaining unmatched path after consuming a leading slash. + * The matcher has to match a prefix of the remaining path. * If matched the value extracted by the PathMatcher is extracted on the directive level. */ def pathPrefix[L](pm: PathMatcher[L]): Directive[L] = rawPathPrefix(Slash ~ pm) /** - * Applies the given matcher directly to the unmatched path of the [[akka.http.scaladsl.server.RequestContext]] - * (i.e. without implicitly consuming a leading slash). + * Applies the given matcher directly to a prefix of the unmatched path of the + * [[RequestContext]] (i.e. without implicitly consuming a leading slash). * The matcher has to match a prefix of the remaining path. * If matched the value extracted by the PathMatcher is extracted on the directive level. */ @@ -44,13 +43,13 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w } /** - * Checks whether the unmatchedPath of the [[akka.http.scaladsl.server.RequestContext]] has a prefix matched by the + * Checks whether the unmatchedPath of the [[RequestContext]] has a prefix matched by the * given PathMatcher. In analogy to the `pathPrefix` directive a leading slash is implied. */ def pathPrefixTest[L](pm: PathMatcher[L]): Directive[L] = rawPathPrefixTest(Slash ~ pm) /** - * Checks whether the unmatchedPath of the [[akka.http.scaladsl.server.RequestContext]] has a prefix matched by the + * Checks whether the unmatchedPath of the [[RequestContext]] has a prefix matched by the * given PathMatcher. However, as opposed to the `pathPrefix` directive the matched path is not * actually "consumed". */ @@ -63,10 +62,9 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w } /** - * Rejects the request if the unmatchedPath of the [[akka.http.scaladsl.server.RequestContext]] does not have a suffix - * matched the given PathMatcher. If matched the value extracted by the PathMatcher is extracted - * and the matched parts of the path are consumed. - * Note that, for efficiency reasons, the given PathMatcher must match the desired suffix in reversed-segment + * Applies the given [[PathMatcher]] to a suffix of the remaining unmatchedPath of the [[RequestContext]]. + * If matched the value extracted by the [[PathMatcher]] is extracted and the matched parts of the path are consumed. + * Note that, for efficiency reasons, the given [[PathMatcher]] must match the desired suffix in reversed-segment * order, i.e. `pathSuffix("baz" / "bar")` would match `/foo/bar/baz`! */ def pathSuffix[L](pm: PathMatcher[L]): Directive[L] = { @@ -78,7 +76,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w } /** - * Checks whether the unmatchedPath of the [[akka.http.scaladsl.server.RequestContext]] has a suffix matched by the + * Checks whether the unmatchedPath of the [[RequestContext]] has a suffix matched by the * given PathMatcher. However, as opposed to the pathSuffix directive the matched path is not * actually "consumed". * Note that, for efficiency reasons, the given PathMatcher must match the desired suffix in reversed-segment @@ -93,7 +91,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w } /** - * Rejects the request if the unmatchedPath of the [[akka.http.scaladsl.server.RequestContext]] is non-empty, + * Rejects the request if the unmatchedPath of the [[RequestContext]] is non-empty, * or said differently: only passes on the request to its inner route if the request path * has been matched completely. */ diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala index 12557ad8fd..b9cf0050ab 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala @@ -8,7 +8,7 @@ trait RespondWithDirectives { import BasicDirectives._ /** - * Overrides the given response status on all HTTP responses of its inner Route. + * Overrides the response status code with the given one. */ def overrideStatusCode(responseStatus: StatusCode): Directive0 = mapResponse(_.copy(status = responseStatus)) diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala index a15fa095b8..ab3b625e66 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala @@ -41,7 +41,7 @@ trait SecurityDirectives { optionalHeaderValueByType[Authorization]().map(_.map(_.credentials)) /** - * A directive that wraps the inner route with Http Basic authentication support. + * Wraps the inner route with Http Basic authentication support using a given ``Authenticator[T]``. * The given authenticator determines whether the credentials in the request are valid * and, if so, which user object to supply to the inner route. */ @@ -49,7 +49,7 @@ trait SecurityDirectives { authenticateBasicAsync(realm, cred ⇒ FastFuture.successful(authenticator(cred))) /** - * A directive that wraps the inner route with Http Basic authentication support. + * Wraps the inner route with Http Basic authentication support. * The given authenticator determines whether the credentials in the request are valid * and, if so, which user object to supply to the inner route. */ diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/WebsocketDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/WebsocketDirectives.scala index 7ea1bd6ab6..6117947b44 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/WebsocketDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/WebsocketDirectives.scala @@ -9,7 +9,6 @@ import akka.http.scaladsl.model.ws.{ UpgradeToWebsocket, Message } import akka.stream.scaladsl.Flow trait WebsocketDirectives { - import BasicDirectives._ import RouteDirectives._ import HeaderDirectives._