From 3cfb6f9d9194ca60dbe6465166712ed5b34cf926 Mon Sep 17 00:00:00 2001
From: Hawstein <tomhawstein@gmail.com>
Date: Sat, 16 Jul 2016 02:00:36 +0800
Subject: [PATCH] align package structure in http javadsl

---
 .../FormFieldRequestValsExampleTest.java      |  6 ++--
 .../server/HttpServerExampleDocTest.java      |  2 +-
 .../CodingDirectivesExamplesTest.java         |  2 +-
 .../FileUploadDirectivesExamplesTest.java     |  5 +--
 .../FutureDirectivesExamplesTest.java         |  2 +-
 .../MiscDirectivesExamplesTest.java           |  2 +-
 .../RangeDirectivesExamplesTest.java          |  2 +-
 .../javadsl/marshallers/jackson/Jackson.java  |  4 +--
 .../javadsl/testkit/TestRouteResult.scala     |  6 ++--
 .../examples/simple/SimpleServerApp.java      |  2 +-
 .../http/javadsl/server/JavaRouteTest.java    |  4 ++-
 .../http/javadsl/server/MarshallerTest.java   |  1 +
 .../http/javadsl/server/UnmarshallerTest.java |  1 +
 .../directives/MarshallingDirectivesTest.java |  2 +-
 .../server/directives/MiscDirectivesTest.java |  2 +-
 .../javadsl/server/StringUnmarshallers.java   |  4 +++
 .../{server => marshalling}/Marshaller.scala  | 23 ++++---------
 .../akka/http/javadsl/server/Rejections.scala |  3 --
 .../http/javadsl/server/RequestContext.scala  |  1 +
 .../FileAndResourceDirectives.scala           |  4 ++-
 .../directives/FormFieldDirectives.scala      |  6 ++--
 .../server/directives/FutureDirectives.scala  |  3 +-
 .../directives/MarshallingDirectives.scala    |  2 +-
 .../directives/ParameterDirectives.scala      |  4 ++-
 .../server/directives/PathDirectives.scala    |  3 +-
 .../server/directives/RouteDirectives.scala   |  3 +-
 .../StringUnmarshaller.scala                  |  4 +--
 .../Unmarshaller.scala                        | 34 ++++++-------------
 .../FileAndResourceDirectives.scala           |  6 ++--
 .../scaladsl/unmarshalling/Unmarshaller.scala |  2 +-
 30 files changed, 67 insertions(+), 78 deletions(-)
 rename akka-http/src/main/scala/akka/http/javadsl/{server => marshalling}/Marshaller.scala (94%)
 rename akka-http/src/main/scala/akka/http/javadsl/{server => unmarshalling}/StringUnmarshaller.scala (77%)
 rename akka-http/src/main/scala/akka/http/javadsl/{server => unmarshalling}/Unmarshaller.scala (88%)

diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
index fc5ae71c28..b75ff765c2 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
@@ -11,8 +11,8 @@ import akka.http.javadsl.model.FormData;
 import akka.http.javadsl.model.HttpRequest;
 import akka.http.javadsl.server.Route;
 import akka.http.javadsl.server.StringUnmarshallers;
-import akka.http.javadsl.server.StringUnmarshaller;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.unmarshalling.StringUnmarshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import akka.http.javadsl.testkit.JUnitRouteTest;
 import akka.japi.Pair;
 
@@ -72,4 +72,4 @@ public class FormFieldRequestValsExampleTest extends JUnitRouteTest {
   }
 
 
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/HttpServerExampleDocTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/HttpServerExampleDocTest.java
index d06236fd5b..1d6e7c9078 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/HttpServerExampleDocTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/HttpServerExampleDocTest.java
@@ -15,7 +15,7 @@ import akka.http.javadsl.marshallers.jackson.Jackson;
 import akka.http.javadsl.model.*;
 import akka.http.javadsl.model.headers.Connection;
 import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import akka.japi.function.Function;
 import akka.stream.ActorMaterializer;
 import akka.stream.IOResult;
diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
index 0fde3f7599..2d86622fc3 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
@@ -16,7 +16,7 @@ import org.junit.Test;
 
 import java.util.Collections;
 
-import static akka.http.javadsl.server.Unmarshaller.entityToString;
+import static akka.http.javadsl.unmarshalling.Unmarshaller.entityToString;
 
 public class CodingDirectivesExamplesTest extends JUnitRouteTest {
 
diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
index 61a65f06e9..2af6f8362e 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
@@ -6,7 +6,7 @@ package docs.http.javadsl.server.directives;
 import akka.http.impl.engine.rendering.BodyPartRenderer;
 import akka.http.javadsl.model.*;
 import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import akka.http.javadsl.server.directives.FileInfo;
 import akka.http.javadsl.testkit.JUnitRouteTest;
 import akka.stream.javadsl.Framing;
@@ -14,8 +14,6 @@ import akka.stream.javadsl.Source;
 import akka.util.ByteString;
 import org.junit.Ignore;
 import org.junit.Test;
-import scala.concurrent.duration.Duration;
-import scala.concurrent.duration.FiniteDuration;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -24,7 +22,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 
 public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
index f40753ec13..23a4d58fdf 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
@@ -8,7 +8,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.server.Marshaller;
+import akka.http.javadsl.marshalling.Marshaller;
 import akka.http.javadsl.server.Route;
 import akka.http.javadsl.testkit.JUnitRouteTest;
 import akka.http.scaladsl.model.StatusCodes;
diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
index 0f36352b76..df44b9114b 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
@@ -6,7 +6,7 @@ package docs.http.javadsl.server.directives;
 import akka.http.javadsl.model.HttpRequest;
 import akka.http.javadsl.model.StatusCodes;
 import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import akka.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
index 69c1358d9c..14d3bbf146 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
@@ -11,7 +11,7 @@ import akka.http.javadsl.model.headers.ContentRange;
 import akka.http.javadsl.model.headers.Range;
 import akka.http.javadsl.model.headers.RangeUnits;
 import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import akka.http.javadsl.testkit.JUnitRouteTest;
 import akka.http.javadsl.testkit.TestRouteResult;
 import akka.stream.ActorMaterializer;
diff --git a/akka-http-marshallers-java/akka-http-jackson/src/main/java/akka/http/javadsl/marshallers/jackson/Jackson.java b/akka-http-marshallers-java/akka-http-jackson/src/main/java/akka/http/javadsl/marshallers/jackson/Jackson.java
index eb1bb70cea..eb9e8ec78d 100644
--- a/akka-http-marshallers-java/akka-http-jackson/src/main/java/akka/http/javadsl/marshallers/jackson/Jackson.java
+++ b/akka-http-marshallers-java/akka-http-jackson/src/main/java/akka/http/javadsl/marshallers/jackson/Jackson.java
@@ -8,8 +8,8 @@ import java.io.IOException;
 import akka.http.javadsl.model.HttpEntity;
 import akka.http.javadsl.model.MediaTypes;
 import akka.http.javadsl.model.RequestEntity;
-import akka.http.javadsl.server.Marshaller;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.marshalling.Marshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
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 1f27424f61..54859d3de7 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
@@ -5,10 +5,10 @@
 package akka.http.javadsl.testkit
 
 import akka.http.javadsl.server.RouteResult
+import akka.http.javadsl.unmarshalling.Unmarshaller
 
 import scala.reflect.ClassTag
 import scala.concurrent.ExecutionContext
-import scala.concurrent.Await
 import scala.concurrent.duration.FiniteDuration
 import akka.util.ByteString
 import akka.stream.Materializer
@@ -17,7 +17,7 @@ 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.server.{ Rejection, RoutingJavaMapping, Unmarshaller }
+import akka.http.javadsl.server.{ Rejection, RoutingJavaMapping }
 import RoutingJavaMapping._
 import akka.http.javadsl.model._
 
@@ -172,7 +172,7 @@ abstract class TestRouteResult(_result: RouteResult, awaitAtMost: FiniteDuration
     assertEqualsKind(expected, entityBytes, "entity")
 
   /**
-   * Assert on the response entity to equal the given object after applying an [[akka.http.javadsl.server.Unmarshaller]].
+   * Assert on the response entity to equal the given object after applying an [[akka.http.javadsl.unmarshalling.Unmarshaller]].
    */
   def assertEntityAs[T <: AnyRef](unmarshaller: Unmarshaller[HttpEntity, T], expected: T): TestRouteResult =
     assertEqualsKind(expected, entity(unmarshaller), "entity")
diff --git a/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp.java b/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp.java
index dd5a60aa9c..a57a9a5d17 100644
--- a/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp.java
+++ b/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp.java
@@ -34,7 +34,7 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import static akka.http.javadsl.server.PathMatchers.integerSegment;
-import static akka.http.javadsl.server.Unmarshaller.entityToString;
+import static akka.http.javadsl.unmarshalling.Unmarshaller.entityToString;
 
 public class SimpleServerApp extends AllDirectives { // or import Directives.*
 
diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/JavaRouteTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/JavaRouteTest.java
index 74473124c3..e1b8b48d3b 100644
--- a/akka-http-tests/src/test/java/akka/http/javadsl/server/JavaRouteTest.java
+++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/JavaRouteTest.java
@@ -14,9 +14,11 @@ import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import akka.http.javadsl.marshalling.Marshaller;
 import akka.http.javadsl.model.*;
 import akka.http.javadsl.model.headers.Accept;
 import akka.http.javadsl.model.headers.RawHeader;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import org.junit.Test;
 
 import akka.http.javadsl.testkit.JUnitRouteTest;
@@ -332,4 +334,4 @@ public class JavaRouteTest extends JUnitRouteTest {
       )
     );
   }
-}
\ No newline at end of file
+}
diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/MarshallerTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/MarshallerTest.java
index 6cdbd522bc..cbef7d04da 100644
--- a/akka-http-tests/src/test/java/akka/http/javadsl/server/MarshallerTest.java
+++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/MarshallerTest.java
@@ -7,6 +7,7 @@ package akka.http.javadsl.server;
 
 import java.util.function.Function;
 
+import akka.http.javadsl.marshalling.Marshaller;
 import akka.http.javadsl.model.*;
 import akka.http.javadsl.model.headers.*;
 import org.junit.Test;
diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/UnmarshallerTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/UnmarshallerTest.java
index 7b23e53cf0..d7692cdee5 100644
--- a/akka-http-tests/src/test/java/akka/http/javadsl/server/UnmarshallerTest.java
+++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/UnmarshallerTest.java
@@ -5,6 +5,7 @@ package akka.http.javadsl.server;
 
 import akka.http.javadsl.model.*;
 import akka.http.javadsl.testkit.JUnitRouteTest;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import org.junit.Test;
 
 import java.util.Arrays;
diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MarshallingDirectivesTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MarshallingDirectivesTest.java
index 9c291439a6..e1475aa402 100644
--- a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MarshallingDirectivesTest.java
+++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MarshallingDirectivesTest.java
@@ -14,7 +14,7 @@ import akka.http.javadsl.testkit.JUnitRouteTest;
 import akka.http.javadsl.testkit.TestRoute;
 
 import org.junit.Test;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MiscDirectivesTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MiscDirectivesTest.java
index 12002d791c..91dd5a8399 100644
--- a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MiscDirectivesTest.java
+++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MiscDirectivesTest.java
@@ -11,7 +11,7 @@ import akka.http.javadsl.model.Uri;
 import akka.http.javadsl.model.headers.RawHeader;
 import akka.http.javadsl.model.headers.XForwardedFor;
 import akka.http.javadsl.model.headers.XRealIp;
-import akka.http.javadsl.server.Unmarshaller;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
 import akka.http.javadsl.testkit.JUnitRouteTest;
 import akka.http.javadsl.testkit.TestRoute;
 import org.junit.Test;
diff --git a/akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java b/akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java
index af9f905cc6..b07cb5ce75 100644
--- a/akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java
+++ b/akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java
@@ -1,5 +1,9 @@
 package akka.http.javadsl.server;
 
+import akka.http.javadsl.unmarshalling.StringUnmarshaller;
+import akka.http.javadsl.unmarshalling.StringUnmarshallerPredef;
+import akka.http.javadsl.unmarshalling.Unmarshaller;
+
 import java.util.function.Function;
 
 public class StringUnmarshallers {
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Marshaller.scala b/akka-http/src/main/scala/akka/http/javadsl/marshalling/Marshaller.scala
similarity index 94%
rename from akka-http/src/main/scala/akka/http/javadsl/server/Marshaller.scala
rename to akka-http/src/main/scala/akka/http/javadsl/marshalling/Marshaller.scala
index ee53d5890d..c1dc4ab681 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/Marshaller.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/marshalling/Marshaller.scala
@@ -2,31 +2,20 @@
  * Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
  */
 
-package akka.http.javadsl.server
+package akka.http.javadsl.marshalling
 
 import java.util.function
 
 import akka.http.impl.util.JavaMapping
+import akka.http.javadsl.model.{ ContentType, HttpHeader, HttpResponse, MediaType, RequestEntity, StatusCode }
+import akka.http.scaladsl
 import akka.http.scaladsl.marshalling
+import akka.http.scaladsl.marshalling._
+import akka.http.scaladsl.model.{ FormData, HttpCharset }
 import akka.japi.Util
+import akka.util.ByteString
 
 import scala.concurrent.ExecutionContext
-import akka.http.javadsl.model.ContentType
-import akka.http.javadsl.model.MediaType
-import akka.http.scaladsl
-import akka.http.javadsl.model.HttpEntity
-import akka.http.scaladsl.marshalling._
-import akka.http.javadsl.model.HttpResponse
-import akka.http.javadsl.model.HttpRequest
-import akka.http.javadsl.model.RequestEntity
-import akka.util.ByteString
-import akka.http.scaladsl.model.{ FormData, HttpCharset }
-import akka.http.javadsl.model.StatusCode
-import akka.http.javadsl.model.HttpHeader
-
-import scala.collection.JavaConverters._
-import akka.http.impl.util.JavaMapping.Implicits._
-
 import scala.language.implicitConversions
 
 object Marshaller {
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 5dc4b11c6a..089aa25a31 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,9 +4,6 @@
 package akka.http.javadsl.server
 
 import akka.http.impl.util.JavaMapping
-import akka.http.javadsl.server.RoutingJavaMapping
-import akka.http.javadsl.model.ContentTypeRange
-import akka.http.scaladsl.model
 import akka.http.scaladsl.server.ContentNegotiator.Alternative
 import akka.http.scaladsl.server._
 import akka.http.javadsl.model._
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 26c474f11b..1dc9408c7d 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
@@ -4,6 +4,7 @@
 
 package akka.http.javadsl.server
 
+import akka.http.javadsl.marshalling.Marshaller
 import akka.http.javadsl.model.HttpRequest
 import akka.http.scaladsl.util.FastFuture._
 import scala.concurrent.ExecutionContextExecutor
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 c2a4c8d548..4427da1db7 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
@@ -6,6 +6,8 @@ package akka.http.javadsl.server.directives
 
 import java.io.File
 
+import akka.http.javadsl.marshalling.Marshaller
+
 import scala.annotation.varargs
 import scala.collection.JavaConverters._
 import akka.http.javadsl.model.ContentType
@@ -27,7 +29,7 @@ abstract class DirectoryListing {
 }
 
 trait DirectoryRenderer {
-  def directoryMarshaller(renderVanityFooter: Boolean): akka.http.javadsl.server.Marshaller[DirectoryListing, RequestEntity]
+  def directoryMarshaller(renderVanityFooter: Boolean): Marshaller[DirectoryListing, RequestEntity]
 }
 
 /**
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala
index 214f191c58..9fa0506950 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala
@@ -8,10 +8,12 @@ import java.util.AbstractMap.SimpleImmutableEntry
 import java.util.Optional
 import java.util.function.{ Function ⇒ JFunction }
 
+import akka.http.javadsl.unmarshalling.Unmarshaller
+
 import scala.collection.JavaConverters._
 import akka.http.impl.util.JavaMapping.Implicits._
 
-import akka.http.javadsl.server.{ Route, Unmarshaller }
+import akka.http.javadsl.server.Route
 
 import akka.http.scaladsl.server.{ Directives ⇒ D }
 import akka.http.scaladsl.server.directives.ParameterDirectives._
@@ -88,4 +90,4 @@ abstract class FormFieldDirectives extends FileUploadDirectives {
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FutureDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FutureDirectives.scala
index 8b10bba0af..7a73f294ef 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FutureDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FutureDirectives.scala
@@ -8,12 +8,13 @@ import java.util.concurrent.CompletionStage
 import java.util.function.{ Function ⇒ JFunction }
 import java.util.function.Supplier
 
+import akka.http.javadsl.marshalling.Marshaller
 import akka.http.javadsl.model.RequestEntity
 
 import scala.compat.java8.FutureConverters._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.Try
-import akka.http.javadsl.server.{ Marshaller, Route }
+import akka.http.javadsl.server.Route
 import akka.http.scaladsl.server.directives.{ CompleteOrRecoverWithMagnet, FutureDirectives ⇒ D }
 import akka.pattern.CircuitBreaker
 
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MarshallingDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MarshallingDirectives.scala
index 8bad98b2d3..9abbf3c8e4 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MarshallingDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MarshallingDirectives.scala
@@ -6,7 +6,7 @@ package akka.http.javadsl.server.directives
 import akka.http.javadsl.model.HttpRequest
 import akka.http.javadsl.model.HttpEntity
 import akka.http.javadsl.server.Route
-import akka.http.javadsl.server.Unmarshaller
+import akka.http.javadsl.unmarshalling.Unmarshaller
 
 import akka.http.scaladsl.server.directives.{ MarshallingDirectives ⇒ D }
 
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala
index 25e16859c2..0833c14034 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala
@@ -8,10 +8,12 @@ import java.util.AbstractMap.SimpleImmutableEntry
 import java.util.Optional
 import java.util.function.{ Function ⇒ JFunction }
 
+import akka.http.javadsl.unmarshalling.Unmarshaller
+
 import scala.collection.JavaConverters._
 import scala.compat.java8.OptionConverters._
 
-import akka.http.javadsl.server.{ Route, Unmarshaller }
+import akka.http.javadsl.server.Route
 import akka.http.scaladsl.server.directives.{ ParameterDirectives ⇒ D }
 import akka.http.scaladsl.server.directives.ParameterDirectives._
 import akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers._
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/PathDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/PathDirectives.scala
index 695833a593..c391148815 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/PathDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/PathDirectives.scala
@@ -7,6 +7,8 @@ import java.util.function.BiFunction
 import java.util.function.{ Function ⇒ JFunction }
 import java.util.function.Supplier
 
+import akka.http.javadsl.unmarshalling.Unmarshaller
+
 import scala.util.Failure
 import scala.util.Success
 
@@ -15,7 +17,6 @@ import akka.http.javadsl.server.PathMatcher0
 import akka.http.javadsl.server.PathMatcher1
 import akka.http.javadsl.server.PathMatcher2
 import akka.http.javadsl.server.Route
-import akka.http.javadsl.server.Unmarshaller
 import akka.http.scaladsl.model.StatusCodes.Redirection
 import akka.http.scaladsl.server.{ Directives ⇒ D }
 
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 91f4a8b4dc..68eef49db8 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,6 +6,7 @@ package akka.http.javadsl.server.directives
 import java.util.concurrent.CompletionStage
 
 import akka.dispatch.ExecutionContexts
+import akka.http.javadsl.marshalling.Marshaller
 import akka.http.scaladsl.server._
 import akka.japi.Util
 
@@ -18,7 +19,7 @@ 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.{ RoutingJavaMapping, Rejection, Marshaller, Route }
+import akka.http.javadsl.server.{ RoutingJavaMapping, Rejection, Route }
 import akka.http.scaladsl
 import akka.http.scaladsl.marshalling.Marshaller._
 import akka.http.scaladsl.marshalling.ToResponseMarshallable
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/StringUnmarshaller.scala b/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/StringUnmarshaller.scala
similarity index 77%
rename from akka-http/src/main/scala/akka/http/javadsl/server/StringUnmarshaller.scala
rename to akka-http/src/main/scala/akka/http/javadsl/unmarshalling/StringUnmarshaller.scala
index c64fef0b6f..1a85b25697 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/StringUnmarshaller.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/StringUnmarshaller.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
  */
 
-package akka.http.javadsl.server
+package akka.http.javadsl.unmarshalling
 
 import java.util.concurrent.CompletionStage
 
@@ -21,7 +21,7 @@ object StringUnmarshaller {
 /**
  * INTERNAL API
  */
-private[server] object StringUnmarshallerPredef extends akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers {
+private[unmarshalling] object StringUnmarshallerPredef extends akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers {
 
 }
 
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala b/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala
similarity index 88%
rename from akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala
rename to akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala
index 82dcc5ab7b..8a7a0a7659 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala
@@ -2,36 +2,24 @@
  * Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
  */
 
-package akka.http.javadsl.server
+package akka.http.javadsl.unmarshalling
 
-import akka.http.impl.util.JavaMapping
-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 }
-import akka.http.scaladsl.{ marshalling, model, unmarshalling }
-import akka.util.ByteString
-import akka.http.scaladsl.util.FastFuture
-import akka.http.scaladsl.util.FastFuture._
-
-import scala.concurrent.ExecutionContext
-import scala.annotation.varargs
-import akka.http.javadsl.model.HttpEntity
-import akka.http.scaladsl.model.{ ContentTypeRange, ContentTypes, FormData, Multipart }
-import akka.http.scaladsl
-import akka.http.javadsl.model.ContentType
-import akka.http.javadsl.model.HttpRequest
-import akka.http.javadsl.model.RequestEntity
-import akka.http.javadsl.model.MediaType
 import java.util.concurrent.CompletionStage
 
-import scala.compat.java8.FutureConverters._
-import scala.collection.JavaConverters._
+import akka.http.impl.util.JavaMapping
 import akka.http.impl.util.JavaMapping.Implicits._
-import RoutingJavaMapping._
+import akka.http.javadsl.model.{ HttpEntity, HttpRequest, MediaType, RequestEntity }
+import akka.http.scaladsl.model.{ ContentTypeRange, ContentTypes, FormData, Multipart }
+import akka.http.scaladsl.unmarshalling
+import akka.http.scaladsl.unmarshalling.FromEntityUnmarshaller
+import akka.http.scaladsl.unmarshalling.Unmarshaller.{ EnhancedFromEntityUnmarshaller, UnsupportedContentTypeException }
 import akka.http.scaladsl.util.FastFuture
 import akka.stream.Materializer
+import akka.util.ByteString
 
+import scala.collection.JavaConverters._
+import scala.compat.java8.FutureConverters._
+import scala.concurrent.ExecutionContext
 import scala.language.implicitConversions
 
 object Unmarshaller {
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 a7e802aeb0..e5f4fe4655 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.model
+import akka.http.javadsl.{ marshalling, model }
 import akka.stream.ActorAttributes
 import akka.stream.scaladsl.{ FileIO, StreamConverters }
 
@@ -272,10 +272,10 @@ object FileAndResourceDirectives extends FileAndResourceDirectives {
 
     def marshaller(renderVanityFooter: Boolean): ToEntityMarshaller[DirectoryListing]
 
-    final override def directoryMarshaller(renderVanityFooter: Boolean): akka.http.javadsl.server.Marshaller[JDL, JRE] = {
+    final override def directoryMarshaller(renderVanityFooter: Boolean): marshalling.Marshaller[JDL, JRE] = {
       val combined = Marshaller.combined[JDL, SDL, SRE](x ⇒ JavaMapping.toScala(x)(RoutingJavaMapping.convertDirectoryListing))(marshaller(renderVanityFooter))
         .map(_.asJava)
-      akka.http.javadsl.server.Marshaller.fromScala(combined)
+      marshalling.Marshaller.fromScala(combined)
     }
 
   }
diff --git a/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/Unmarshaller.scala b/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/Unmarshaller.scala
index d295b4bb38..ae372b3162 100644
--- a/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/Unmarshaller.scala
+++ b/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/Unmarshaller.scala
@@ -13,7 +13,7 @@ import akka.http.scaladsl.util.FastFuture
 import akka.http.scaladsl.util.FastFuture._
 import akka.http.scaladsl.model._
 
-trait Unmarshaller[-A, B] extends akka.http.javadsl.server.Unmarshaller[A, B] {
+trait Unmarshaller[-A, B] extends akka.http.javadsl.unmarshalling.Unmarshaller[A, B] {
 
   implicit final def asScala: Unmarshaller[A, B] = this