align package structure in http javadsl

akka-docs/rst/java/code/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java

@@ -11,8 +11,8 @@
 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 @@ static class SampleId {
   }
 
 
-}
+}

akka-docs/rst/java/code/docs/http/javadsl/server/HttpServerExampleDocTest.java

@@ -15,7 +15,7 @@
 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;

akka-docs/rst/java/code/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java

@@ -16,7 +16,7 @@
 
 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 {
 

akka-docs/rst/java/code/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java

@@ -6,16 +6,14 @@
 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;
 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.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 {

akka-docs/rst/java/code/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java

@@ -8,7 +8,7 @@
 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;

akka-docs/rst/java/code/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java

@@ -6,7 +6,7 @@
 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;
 

akka-docs/rst/java/code/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java

@@ -11,7 +11,7 @@
 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;

akka-http-marshallers-java/akka-http-jackson/src/main/java/akka/http/javadsl/marshallers/jackson/Jackson.java

@@ -8,8 +8,8 @@
 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;

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")

akka-http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp.java

@@ -34,7 +34,7 @@
 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.*
 

akka-http-tests/src/test/java/akka/http/javadsl/server/JavaRouteTest.java

@@ -14,9 +14,11 @@
 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 Route getRoute() {
       )
     );
   }
-}
+}

akka-http-tests/src/test/java/akka/http/javadsl/server/MarshallerTest.java

@@ -7,6 +7,7 @@
 
 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;

akka-http-tests/src/test/java/akka/http/javadsl/server/UnmarshallerTest.java

@@ -5,6 +5,7 @@
 
 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;

akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MarshallingDirectivesTest.java

@@ -14,7 +14,7 @@
 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;

akka-http-tests/src/test/java/akka/http/javadsl/server/directives/MiscDirectivesTest.java

@@ -11,7 +11,7 @@
 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;

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 {

akka-http/src/main/scala/akka/http/javadsl/server/Marshaller.scala → 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.scaladsl.marshalling
-import akka.japi.Util
-
-import scala.concurrent.ExecutionContext
-import akka.http.javadsl.model.ContentType
-import akka.http.javadsl.model.MediaType
+import akka.http.javadsl.model.{ ContentType, HttpHeader, HttpResponse, MediaType, RequestEntity, StatusCode }
 import akka.http.scaladsl
-import akka.http.javadsl.model.HttpEntity
+import akka.http.scaladsl.marshalling
 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 akka.japi.Util
+import akka.util.ByteString
 
+import scala.concurrent.ExecutionContext
 import scala.language.implicitConversions
 
 object Marshaller {

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._

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

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]
 }
 
 /**

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 {
     }
   }
 
-}
+}

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
 

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 }
 

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._

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 }
 

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

akka-http/src/main/scala/akka/http/javadsl/server/StringUnmarshaller.scala → 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 {
 
 }