raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

!htp Move classes from javadsl to javadsl.server to keep in release jars #20556 (#20558)

Browse source
This commit is contained in:
Johan Andrén 2016-05-19 11:30:59 +02:00 • committed by Konrad Malawski
parent e2c1638171
commit acb71ac4e5
17 changed files with 43 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala
View file

@ -16,9 +16,10 @@ import akka.http.scaladsl.unmarshalling.Unmarshal
import akka.http.scaladsl.model.HttpResponse
import akka.http.impl.util._
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import akka.http.javadsl.server.{Rejection, Unmarshaller}
import akka.http.javadsl.server.{Rejection, RoutingJavaMapping, Unmarshaller}
import RoutingJavaMapping._
import akka.http.javadsl.model._
import scala.collection.JavaConverters._
import scala.annotation.varargs

2
akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala
View file

@ -16,7 +16,7 @@ abstract class AllDirectives extends TimeoutDirectives
*/
object Directives extends AllDirectives {
import JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
// These are repeated here since sometimes (?) the Scala compiler won't actually generate java-compatible
// signatures for varargs methods, making them show up as Seq<Object> instead of T... in Java.

2
akka-http/src/main/scala/akka/http/javadsl/server/ExceptionHandler.scala
View file

@ -8,7 +8,7 @@ import akka.http.scaladsl.server
import akka.japi.pf.PFBuilder
import akka.http.javadsl.settings.RoutingSettings
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
object ExceptionHandler {
/**

2
akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala
View file

@ -4,7 +4,7 @@
package akka.http.javadsl.server
import akka.http.impl.util.JavaMapping
import akka.http.javadsl.RoutingJavaMapping
import akka.http.javadsl.server.RoutingJavaMapping
import akka.http.javadsl.model.ContentTypeRange
import akka.http.scaladsl.model
import akka.http.scaladsl.server.ContentNegotiator.Alternative

2
akka-http/src/main/scala/akka/http/javadsl/server/RequestContext.scala
View file

@ -23,7 +23,7 @@ import akka.http.scaladsl.model.Uri.Path
class RequestContext private (val delegate: scaladsl.server.RequestContext) {
import RequestContext._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
def getRequest: HttpRequest = delegate.request
def getUnmatchedPath: String = delegate.unmatchedPath.toString()

16
akka-http/src/main/scala/akka/http/javadsl/RoutingJavaMapping.scala → akka-http/src/main/scala/akka/http/javadsl/server/RoutingJavaMapping.scala
View file

@ -2,17 +2,15 @@
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.http.javadsl
package akka.http.javadsl.server
import java.util.concurrent.CompletionStage
import akka.http.impl.util._
import akka.http.impl.util.JavaMapping._
import akka.http.javadsl
import akka.http.scaladsl
import javadsl.server.{ directives ⇒ jdirectives }
import akka.http.scaladsl.server.{ directives ⇒ sdirectives, RequestContext }
import akka.http.impl.util._
import akka.http.{ javadsl, scaladsl }
import akka.http.scaladsl.server.{ directives ⇒ sdirectives }
import akka.http.javadsl.server.{ directives ⇒ jdirectives }
import scala.collection.immutable
/**
@ -40,8 +38,8 @@ private[http] object RoutingJavaMapping {
implicit object RequestContext extends JavaMapping[javadsl.server.RequestContext, scaladsl.server.RequestContext] {
// TODO make it inhierit
// extends Inherited[javadsl.server.RequestContext, scaladsl.server.RequestContext]
override def toScala(javaObject: javadsl.server.RequestContext): RequestContext = javaObject.delegate
override def toJava(scalaObject: RequestContext): server.RequestContext = javadsl.server.RequestContext.wrap(scalaObject)
override def toScala(javaObject: javadsl.server.RequestContext): scaladsl.server.RequestContext = javaObject.delegate
override def toJava(scalaObject: scaladsl.server.RequestContext): javadsl.server.RequestContext = javadsl.server.RequestContext.wrap(scalaObject)
}
implicit object convertRouteResult extends Inherited[javadsl.server.RouteResult, scaladsl.server.RouteResult]

5
akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala
View file

@ -5,7 +5,7 @@
package akka.http.javadsl.server
import akka.http.impl.util.JavaMapping
import akka.http.javadsl.RoutingJavaMapping
import akka.http.javadsl.server.RoutingJavaMapping
import akka.http.scaladsl.marshalling._
import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, FromRequestUnmarshaller }
import akka.http.scaladsl.unmarshalling.Unmarshaller.{ EnhancedFromEntityUnmarshaller, EnhancedUnmarshaller, UnsupportedContentTypeException }
@ -27,7 +27,7 @@ import java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters._
import scala.collection.JavaConverters._
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
import akka.http.scaladsl.util.FastFuture
import akka.stream.Materializer
@ -125,6 +125,7 @@ abstract class Unmarshaller[-A, B] extends UnmarshallerBase[A, B] {
/**
* Transform the result `B` of this unmarshaller to a `C` producing a marshaller that turns `A`s into `C`s
*
* @return A new marshaller that can unmarshall instances of `A` into instances of `C`
*/
def thenApply[C](f: java.util.function.Function[B, C]): Unmarshaller[A, C] = asScala.map(f.apply)

7
akka-http/src/main/scala/akka/http/javadsl/server/directives/BasicDirectives.scala
View file

@ -33,12 +33,13 @@ import java.util.function.Predicate
import akka.dispatch.ExecutionContexts
import akka.event.LoggingAdapter
import akka.http.javadsl.server
import scala.compat.java8.FutureConverters._
abstract class BasicDirectives {
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
def mapRequest(f: JFunction[HttpRequest, HttpRequest], inner: Supplier[Route]): Route = RouteAdapter {
D.mapRequest(rq ⇒ f.apply(rq.asJava).asScala) { inner.get.delegate }
@ -197,7 +198,7 @@ abstract class BasicDirectives {
* Extracts a single value using the given function.
*/
def extract[T](extract: JFunction[RequestContext, T], inner: JFunction[T, Route]): Route = RouteAdapter {
D.extract(sc ⇒ extract.apply(JavaMapping.toJava(sc)(akka.http.javadsl.RoutingJavaMapping.RequestContext))) { c ⇒ inner.apply(c).delegate }
D.extract(sc ⇒ extract.apply(JavaMapping.toJava(sc)(server.RoutingJavaMapping.RequestContext))) { c ⇒ inner.apply(c).delegate }
}
/**
@ -250,7 +251,7 @@ abstract class BasicDirectives {
* Extracts the [[akka.http.javadsl.server.RequestContext]] itself.
*/
def extractRequestContext(inner: JFunction[RequestContext, Route]) = RouteAdapter {
D.extractRequestContext { ctx ⇒ inner.apply(JavaMapping.toJava(ctx)(akka.http.javadsl.RoutingJavaMapping.RequestContext)).delegate }
D.extractRequestContext { ctx ⇒ inner.apply(JavaMapping.toJava(ctx)(server.RoutingJavaMapping.RequestContext)).delegate }
}
}

2
akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala
View file

@ -9,7 +9,7 @@ import java.util.function.Supplier
import scala.collection.JavaConverters._
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
import akka.http.javadsl.model.headers.HttpEncoding
import akka.http.javadsl.server.Route
import akka.http.scaladsl.server.{ Directives ⇒ D }

9
akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala
View file

@ -4,17 +4,16 @@
package akka.http.javadsl.server.directives
import java.lang.{ Iterable ⇒ JIterable }
import java.util.function.{ BiFunction, Function ⇒ JFunction, Supplier }
import java.util.{ List ⇒ JList, Optional }
import java.util.function.{ BiFunction, Supplier, Function ⇒ JFunction }
import java.util.{ Optional, List ⇒ JList }
import akka.event.Logging
import akka.event.Logging.LogLevel
import akka.http.javadsl.RoutingJavaMapping
import akka.http.javadsl.model.{ HttpRequest, HttpResponse }
import akka.http.javadsl.server.Route
import akka.http.javadsl.server.{ Route, RoutingJavaMapping }
import akka.http.scaladsl
import akka.http.scaladsl.server.directives.LoggingMagnet
import akka.http.scaladsl.server.{ Directives ⇒ D, Rejection, RouteResult }
import akka.http.scaladsl.server.{ Rejection, RouteResult, Directives ⇒ D }
import scala.collection.JavaConverters._

5
akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala
View file

@ -8,10 +8,9 @@ import java.io.File
import scala.annotation.varargs
import scala.collection.JavaConverters._
import akka.http.javadsl.model.ContentType
import akka.http.javadsl.model.RequestEntity
import akka.http.javadsl.server.Route
import akka.http.javadsl.server.{ Route, RoutingJavaMapping }
import akka.http.scaladsl.server.{ Directives ⇒ D }
/**
@ -39,7 +38,7 @@ trait DirectoryRenderer {
*/
abstract class FileAndResourceDirectives extends ExecutionDirectives {
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
/**
* Completes GET requests with the content of the given resource loaded from the default ClassLoader,

5
akka-http/src/main/scala/akka/http/javadsl/server/directives/MethodDirectives.scala
View file

@ -7,10 +7,9 @@ package akka.http.javadsl.server.directives
import java.util.function
import akka.http.javadsl.model.HttpMethod
import akka.http.javadsl.server.Route
import akka.http.javadsl.server.{ Route, RoutingJavaMapping }
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
import akka.http.scaladsl.server.directives.{ MethodDirectives ⇒ D }
abstract class MethodDirectives extends MarshallingDirectives {

2
akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala
View file

@ -15,7 +15,7 @@ import scala.collection.JavaConverters._
import akka.http.javadsl.model.RemoteAddress
import akka.http.javadsl.model.headers.Language
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import RoutingJavaMapping._
import akka.http.scaladsl.server.{ Directives ⇒ D }

4
akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteAdapter.scala
View file

@ -8,8 +8,8 @@ import akka.actor.ActorSystem
import akka.http.javadsl.model.HttpRequest
import akka.http.javadsl.model.HttpResponse
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import akka.http.javadsl.server.{ ExceptionHandler, RejectionHandler, Route }
import akka.http.javadsl.server.{ ExceptionHandler, RejectionHandler, Route, RoutingJavaMapping }
import RoutingJavaMapping._
import akka.http.javadsl.settings.{ ParserSettings, RoutingSettings }
import akka.http.scaladsl
import akka.http.scaladsl.server.RouteConcatenation._

8
akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteDirectives.scala
View file

@ -6,29 +6,25 @@ package akka.http.javadsl.server.directives
import java.util.concurrent.CompletionStage
import akka.dispatch.ExecutionContexts
import akka.http.javadsl.RoutingJavaMapping
import akka.http.scaladsl.server._
import akka.japi.Util
import scala.collection.immutable.Seq
import scala.annotation.varargs
import scala.collection.JavaConverters._
import akka.http.impl.model.JavaUri
import akka.http.javadsl.model.HttpHeader
import akka.http.javadsl.model.HttpResponse
import akka.http.javadsl.model.RequestEntity
import akka.http.javadsl.model.StatusCode
import akka.http.javadsl.model.Uri
import akka.http.javadsl.server.{ Rejection, Marshaller, Route }
import akka.http.javadsl.server.{ RoutingJavaMapping, Rejection, Marshaller, Route }
import akka.http.scaladsl
import akka.http.scaladsl.marshalling.Marshaller._
import akka.http.scaladsl.marshalling.ToResponseMarshallable
import akka.http.scaladsl.model.StatusCodes.Redirection
import akka.http.javadsl.RoutingJavaMapping._
import akka.http.javadsl.server.RoutingJavaMapping._
import akka.http.scaladsl.server.directives.{ RouteDirectives ⇒ D }
import akka.http.javadsl.server.Rejection
import akka.http.scaladsl.util.FastFuture._
abstract class RouteDirectives extends RespondWithDirectives {

7
akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala
View file

@ -13,12 +13,13 @@ import akka.japi.Util
import scala.collection.immutable
import akka.http.scaladsl.model._
import akka.http.javadsl
import akka.http.javadsl.{ server ⇒ jserver, model }
import akka.http.javadsl.{ model, server ⇒ jserver }
import headers._
import akka.http.impl.util.JavaMapping._
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import akka.http.javadsl.server.RoutingJavaMapping
import RoutingJavaMapping._
import scala.collection.JavaConverters._
import scala.compat.java8.OptionConverters

7
akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
View file

@ -8,7 +8,7 @@ package directives
import java.io.File
import java.net.{ URI, URL }
import akka.http.javadsl.{ RoutingJavaMapping, model }
import akka.http.javadsl.model
import akka.http.javadsl.model.RequestEntity
import akka.stream.ActorAttributes
import akka.stream.scaladsl.{ FileIO, StreamConverters }
@ -16,14 +16,15 @@ import akka.stream.scaladsl.{ FileIO, StreamConverters }
import scala.annotation.tailrec
import akka.actor.ActorSystem
import akka.event.LoggingAdapter
import akka.http.scaladsl.marshalling.{ Marshalling, Marshaller, ToEntityMarshaller }
import akka.http.scaladsl.marshalling.{ Marshaller, Marshalling, ToEntityMarshaller }
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers._
import akka.http.impl.util._
import akka.http.javadsl
import scala.collection.JavaConverters._
import JavaMapping.Implicits._
import akka.http.javadsl.RoutingJavaMapping._
import akka.http.javadsl.server.RoutingJavaMapping
/**
* @groupname fileandresource File and resource directives