From acb71ac4e53d536fcba0ffe0fb0a48c09a63b108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Thu, 19 May 2016 11:30:59 +0200
Subject: [PATCH] !htp Move classes from javadsl to javadsl.server to keep in
 release jars #20556 (#20558)

---
 .../http/javadsl/testkit/TestRouteResult.scala   |  5 +++--
 .../akka/http/javadsl/server/Directives.scala    |  2 +-
 .../http/javadsl/server/ExceptionHandler.scala   |  2 +-
 .../akka/http/javadsl/server/Rejections.scala    |  2 +-
 .../http/javadsl/server/RequestContext.scala     |  2 +-
 .../{ => server}/RoutingJavaMapping.scala        | 16 +++++++---------
 .../akka/http/javadsl/server/Unmarshaller.scala  |  5 +++--
 .../server/directives/BasicDirectives.scala      |  7 ++++---
 .../server/directives/CodingDirectives.scala     |  2 +-
 .../server/directives/DebuggingDirectives.scala  |  9 ++++-----
 .../directives/FileAndResourceDirectives.scala   |  5 ++---
 .../server/directives/MethodDirectives.scala     |  5 ++---
 .../server/directives/MiscDirectives.scala       |  2 +-
 .../javadsl/server/directives/RouteAdapter.scala |  4 ++--
 .../server/directives/RouteDirectives.scala      |  8 ++------
 .../akka/http/scaladsl/server/Rejection.scala    |  7 ++++---
 .../directives/FileAndResourceDirectives.scala   |  7 ++++---
 17 files changed, 43 insertions(+), 47 deletions(-)
 rename akka-http/src/main/scala/akka/http/javadsl/{ => server}/RoutingJavaMapping.scala (92%)

diff --git a/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala b/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala
index 876707e98c..8733211453 100644
--- a/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala
+++ b/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala
@@ -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
 
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala
index 4fc6fe5e1b..7bc2100a2d 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala
@@ -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.
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/ExceptionHandler.scala b/akka-http/src/main/scala/akka/http/javadsl/server/ExceptionHandler.scala
index 555faeaffb..105bcaf226 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/ExceptionHandler.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/ExceptionHandler.scala
@@ -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 {
   /**
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala b/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala
index 6480fed2b1..48a1e09b39 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala
@@ -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
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/RequestContext.scala b/akka-http/src/main/scala/akka/http/javadsl/server/RequestContext.scala
index 10186a087f..0d60b59447 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/RequestContext.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/RequestContext.scala
@@ -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()
diff --git a/akka-http/src/main/scala/akka/http/javadsl/RoutingJavaMapping.scala b/akka-http/src/main/scala/akka/http/javadsl/server/RoutingJavaMapping.scala
similarity index 92%
rename from akka-http/src/main/scala/akka/http/javadsl/RoutingJavaMapping.scala
rename to akka-http/src/main/scala/akka/http/javadsl/server/RoutingJavaMapping.scala
index f63fcd6e3c..1cb892cfd8 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/RoutingJavaMapping.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/RoutingJavaMapping.scala
@@ -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]
 
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala b/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala
index b44d380cdb..b6a012c30a 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala
@@ -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)
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/BasicDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/BasicDirectives.scala
index c1d17e98dc..2fc58edd0d 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/BasicDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/BasicDirectives.scala
@@ -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 }
   }
 
 }
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala
index 339b956154..3765e22233 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala
@@ -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 }
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala
index 762c1bc3c8..e8bab166df 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala
@@ -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._
 
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala
index 9ba922d479..c2a4c8d548 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala
@@ -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,
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MethodDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MethodDirectives.scala
index adabe62f74..4c4f821c9b 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MethodDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MethodDirectives.scala
@@ -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 {
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala
index 22620214c7..f7a35637fc 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala
@@ -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 }
 
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteAdapter.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteAdapter.scala
index 7bcb7ccf2e..1d36f41f9b 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteAdapter.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteAdapter.scala
@@ -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._
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteDirectives.scala
index 2a0af6144f..6e8f5ae227 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/RouteDirectives.scala
@@ -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 {
diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala
index ea2b883fad..25ce11bf7b 100644
--- a/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala
+++ b/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala
@@ -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
 
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 ef954566dd..d084736f3f 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
@@ -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