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

align package structure in http javadsl

Browse source
This commit is contained in:
Hawstein 2016-07-16 02:00:36 +08:00 • committed by Konrad Malawski
parent bb701d1725
commit 3cfb6f9d91
30 changed files with 67 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,8 +11,8 @@ import akka.http.javadsl.model.FormData;
import akka.http.javadsl.model.HttpRequest; import akka.http.javadsl.model.HttpRequest;
import akka.http.javadsl.server.Route; import akka.http.javadsl.server.Route;
import akka.http.javadsl.server.StringUnmarshallers; import akka.http.javadsl.server.StringUnmarshallers;
import akka.http.javadsl.server.StringUnmarshaller; import akka.http.javadsl.unmarshalling.StringUnmarshaller;
import akka.http.javadsl.server.Unmarshaller; import akka.http.javadsl.unmarshalling.Unmarshaller;
import akka.http.javadsl.testkit.JUnitRouteTest; import akka.http.javadsl.testkit.JUnitRouteTest;
import akka.japi.Pair; import akka.japi.Pair;
@ -72,4 +72,4 @@ public class FormFieldRequestValsExampleTest extends JUnitRouteTest {
} }
} }

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

@ -15,7 +15,7 @@ import akka.http.javadsl.marshallers.jackson.Jackson;
import akka.http.javadsl.model.*; import akka.http.javadsl.model.*;
import akka.http.javadsl.model.headers.Connection; import akka.http.javadsl.model.headers.Connection;
import akka.http.javadsl.server.Route; 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.japi.function.Function;
import akka.stream.ActorMaterializer; import akka.stream.ActorMaterializer;
import akka.stream.IOResult; import akka.stream.IOResult;

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

@ -16,7 +16,7 @@ import org.junit.Test;
import java.util.Collections; 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 { public class CodingDirectivesExamplesTest extends JUnitRouteTest {

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

@ -6,7 +6,7 @@ package docs.http.javadsl.server.directives;
import akka.http.impl.engine.rendering.BodyPartRenderer; import akka.http.impl.engine.rendering.BodyPartRenderer;
import akka.http.javadsl.model.*; import akka.http.javadsl.model.*;
import akka.http.javadsl.server.Route; 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.server.directives.FileInfo;
import akka.http.javadsl.testkit.JUnitRouteTest; import akka.http.javadsl.testkit.JUnitRouteTest;
import akka.stream.javadsl.Framing; import akka.stream.javadsl.Framing;
@ -14,8 +14,6 @@ import akka.stream.javadsl.Source;
import akka.util.ByteString; import akka.util.ByteString;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
import java.io.File; import java.io.File;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -24,7 +22,6 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
import java.util.function.BiFunction; import java.util.function.BiFunction;
public class FileUploadDirectivesExamplesTest extends JUnitRouteTest { public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {

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

@ -8,7 +8,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import akka.http.javadsl.model.HttpRequest; 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.server.Route;
import akka.http.javadsl.testkit.JUnitRouteTest; import akka.http.javadsl.testkit.JUnitRouteTest;
import akka.http.scaladsl.model.StatusCodes; import akka.http.scaladsl.model.StatusCodes;

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

@ -6,7 +6,7 @@ package docs.http.javadsl.server.directives;
import akka.http.javadsl.model.HttpRequest; import akka.http.javadsl.model.HttpRequest;
import akka.http.javadsl.model.StatusCodes; import akka.http.javadsl.model.StatusCodes;
import akka.http.javadsl.server.Route; 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.JUnitRouteTest;
import org.junit.Test; import org.junit.Test;

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

@ -11,7 +11,7 @@ import akka.http.javadsl.model.headers.ContentRange;
import akka.http.javadsl.model.headers.Range; import akka.http.javadsl.model.headers.Range;
import akka.http.javadsl.model.headers.RangeUnits; import akka.http.javadsl.model.headers.RangeUnits;
import akka.http.javadsl.server.Route; 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.JUnitRouteTest;
import akka.http.javadsl.testkit.TestRouteResult; import akka.http.javadsl.testkit.TestRouteResult;
import akka.stream.ActorMaterializer; import akka.stream.ActorMaterializer;

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

@ -8,8 +8,8 @@ import java.io.IOException;
import akka.http.javadsl.model.HttpEntity; import akka.http.javadsl.model.HttpEntity;
import akka.http.javadsl.model.MediaTypes; import akka.http.javadsl.model.MediaTypes;
import akka.http.javadsl.model.RequestEntity; import akka.http.javadsl.model.RequestEntity;
import akka.http.javadsl.server.Marshaller; import akka.http.javadsl.marshalling.Marshaller;
import akka.http.javadsl.server.Unmarshaller; import akka.http.javadsl.unmarshalling.Unmarshaller;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.MapperFeature;

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

@ -5,10 +5,10 @@
package akka.http.javadsl.testkit package akka.http.javadsl.testkit
import akka.http.javadsl.server.RouteResult import akka.http.javadsl.server.RouteResult
import akka.http.javadsl.unmarshalling.Unmarshaller
import scala.reflect.ClassTag import scala.reflect.ClassTag
import scala.concurrent.ExecutionContext import scala.concurrent.ExecutionContext
import scala.concurrent.Await
import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration.FiniteDuration
import akka.util.ByteString import akka.util.ByteString
import akka.stream.Materializer import akka.stream.Materializer
@ -17,7 +17,7 @@ import akka.http.scaladsl.unmarshalling.Unmarshal
import akka.http.scaladsl.model.HttpResponse import akka.http.scaladsl.model.HttpResponse
import akka.http.impl.util._ import akka.http.impl.util._
import akka.http.impl.util.JavaMapping.Implicits._ 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 RoutingJavaMapping._
import akka.http.javadsl.model._ import akka.http.javadsl.model._
@ -172,7 +172,7 @@ abstract class TestRouteResult(_result: RouteResult, awaitAtMost: FiniteDuration
assertEqualsKind(expected, entityBytes, "entity") 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 = def assertEntityAs[T <: AnyRef](unmarshaller: Unmarshaller[HttpEntity, T], expected: T): TestRouteResult =
assertEqualsKind(expected, entity(unmarshaller), "entity") assertEqualsKind(expected, entity(unmarshaller), "entity")

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

@ -34,7 +34,7 @@ import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import static akka.http.javadsl.server.PathMatchers.integerSegment; 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.* public class SimpleServerApp extends AllDirectives { // or import Directives.*

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

@ -14,9 +14,11 @@ import java.util.function.Function;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import akka.http.javadsl.marshalling.Marshaller;
import akka.http.javadsl.model.*; import akka.http.javadsl.model.*;
import akka.http.javadsl.model.headers.Accept; import akka.http.javadsl.model.headers.Accept;
import akka.http.javadsl.model.headers.RawHeader; import akka.http.javadsl.model.headers.RawHeader;
import akka.http.javadsl.unmarshalling.Unmarshaller;
import org.junit.Test; import org.junit.Test;
import akka.http.javadsl.testkit.JUnitRouteTest; import akka.http.javadsl.testkit.JUnitRouteTest;
@ -332,4 +334,4 @@ public class JavaRouteTest extends JUnitRouteTest {
) )
); );
} }
} }

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

@ -7,6 +7,7 @@ package akka.http.javadsl.server;
import java.util.function.Function; import java.util.function.Function;
import akka.http.javadsl.marshalling.Marshaller;
import akka.http.javadsl.model.*; import akka.http.javadsl.model.*;
import akka.http.javadsl.model.headers.*; import akka.http.javadsl.model.headers.*;
import org.junit.Test; import org.junit.Test;

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

@ -5,6 +5,7 @@ package akka.http.javadsl.server;
import akka.http.javadsl.model.*; import akka.http.javadsl.model.*;
import akka.http.javadsl.testkit.JUnitRouteTest; import akka.http.javadsl.testkit.JUnitRouteTest;
import akka.http.javadsl.unmarshalling.Unmarshaller;
import org.junit.Test; import org.junit.Test;
import java.util.Arrays; import java.util.Arrays;

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

@ -14,7 +14,7 @@ import akka.http.javadsl.testkit.JUnitRouteTest;
import akka.http.javadsl.testkit.TestRoute; import akka.http.javadsl.testkit.TestRoute;
import org.junit.Test; import org.junit.Test;
import akka.http.javadsl.server.Unmarshaller; import akka.http.javadsl.unmarshalling.Unmarshaller;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;

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

@ -11,7 +11,7 @@ import akka.http.javadsl.model.Uri;
import akka.http.javadsl.model.headers.RawHeader; import akka.http.javadsl.model.headers.RawHeader;
import akka.http.javadsl.model.headers.XForwardedFor; import akka.http.javadsl.model.headers.XForwardedFor;
import akka.http.javadsl.model.headers.XRealIp; 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.JUnitRouteTest;
import akka.http.javadsl.testkit.TestRoute; import akka.http.javadsl.testkit.TestRoute;
import org.junit.Test; import org.junit.Test;

4
akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java
View file

@ -1,5 +1,9 @@
package akka.http.javadsl.server; 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; import java.util.function.Function;
public class StringUnmarshallers { public class StringUnmarshallers {

23
akka-http/src/main/scala/akka/http/javadsl/server/Marshaller.scala → akka-http/src/main/scala/akka/http/javadsl/marshalling/Marshaller.scala
View file

@ -2,31 +2,20 @@
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com> * 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 java.util.function
import akka.http.impl.util.JavaMapping 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.marshalling._
import akka.http.scaladsl.model.{ FormData, HttpCharset }
import akka.japi.Util import akka.japi.Util
import akka.util.ByteString
import scala.concurrent.ExecutionContext 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 import scala.language.implicitConversions
object Marshaller { object Marshaller {

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

@ -4,9 +4,6 @@
package akka.http.javadsl.server package akka.http.javadsl.server
import akka.http.impl.util.JavaMapping 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.ContentNegotiator.Alternative
import akka.http.scaladsl.server._ import akka.http.scaladsl.server._
import akka.http.javadsl.model._ import akka.http.javadsl.model._

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

@ -4,6 +4,7 @@
package akka.http.javadsl.server package akka.http.javadsl.server
import akka.http.javadsl.marshalling.Marshaller
import akka.http.javadsl.model.HttpRequest import akka.http.javadsl.model.HttpRequest
import akka.http.scaladsl.util.FastFuture._ import akka.http.scaladsl.util.FastFuture._
import scala.concurrent.ExecutionContextExecutor import scala.concurrent.ExecutionContextExecutor

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

@ -6,6 +6,8 @@ package akka.http.javadsl.server.directives
import java.io.File import java.io.File
import akka.http.javadsl.marshalling.Marshaller
import scala.annotation.varargs import scala.annotation.varargs
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import akka.http.javadsl.model.ContentType import akka.http.javadsl.model.ContentType
@ -27,7 +29,7 @@ abstract class DirectoryListing {
} }
trait DirectoryRenderer { trait DirectoryRenderer {
def directoryMarshaller(renderVanityFooter: Boolean): akka.http.javadsl.server.Marshaller[DirectoryListing, RequestEntity] def directoryMarshaller(renderVanityFooter: Boolean): Marshaller[DirectoryListing, RequestEntity]
} }
/** /**

6
akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala
View file

@ -8,10 +8,12 @@ import java.util.AbstractMap.SimpleImmutableEntry
import java.util.Optional import java.util.Optional
import java.util.function.{ Function ⇒ JFunction } import java.util.function.{ Function ⇒ JFunction }
import akka.http.javadsl.unmarshalling.Unmarshaller
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import akka.http.impl.util.JavaMapping.Implicits._ 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 ⇒ D }
import akka.http.scaladsl.server.directives.ParameterDirectives._ import akka.http.scaladsl.server.directives.ParameterDirectives._
@ -88,4 +90,4 @@ abstract class FormFieldDirectives extends FileUploadDirectives {
} }
} }
} }

3
akka-http/src/main/scala/akka/http/javadsl/server/directives/FutureDirectives.scala
View file

@ -8,12 +8,13 @@ import java.util.concurrent.CompletionStage
import java.util.function.{ Function ⇒ JFunction } import java.util.function.{ Function ⇒ JFunction }
import java.util.function.Supplier import java.util.function.Supplier
import akka.http.javadsl.marshalling.Marshaller
import akka.http.javadsl.model.RequestEntity import akka.http.javadsl.model.RequestEntity
import scala.compat.java8.FutureConverters._ import scala.compat.java8.FutureConverters._
import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.ExecutionContext.Implicits.global
import scala.util.Try 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.http.scaladsl.server.directives.{ CompleteOrRecoverWithMagnet, FutureDirectives ⇒ D }
import akka.pattern.CircuitBreaker import akka.pattern.CircuitBreaker

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

@ -6,7 +6,7 @@ package akka.http.javadsl.server.directives
import akka.http.javadsl.model.HttpRequest import akka.http.javadsl.model.HttpRequest
import akka.http.javadsl.model.HttpEntity import akka.http.javadsl.model.HttpEntity
import akka.http.javadsl.server.Route 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 } import akka.http.scaladsl.server.directives.{ MarshallingDirectives ⇒ D }

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

@ -8,10 +8,12 @@ import java.util.AbstractMap.SimpleImmutableEntry
import java.util.Optional import java.util.Optional
import java.util.function.{ Function ⇒ JFunction } import java.util.function.{ Function ⇒ JFunction }
import akka.http.javadsl.unmarshalling.Unmarshaller
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import scala.compat.java8.OptionConverters._ 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 ⇒ D }
import akka.http.scaladsl.server.directives.ParameterDirectives._ import akka.http.scaladsl.server.directives.ParameterDirectives._
import akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers._ import akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers._

3
akka-http/src/main/scala/akka/http/javadsl/server/directives/PathDirectives.scala
View file

@ -7,6 +7,8 @@ import java.util.function.BiFunction
import java.util.function.{ Function ⇒ JFunction } import java.util.function.{ Function ⇒ JFunction }
import java.util.function.Supplier import java.util.function.Supplier
import akka.http.javadsl.unmarshalling.Unmarshaller
import scala.util.Failure import scala.util.Failure
import scala.util.Success 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.PathMatcher1
import akka.http.javadsl.server.PathMatcher2 import akka.http.javadsl.server.PathMatcher2
import akka.http.javadsl.server.Route import akka.http.javadsl.server.Route
import akka.http.javadsl.server.Unmarshaller
import akka.http.scaladsl.model.StatusCodes.Redirection import akka.http.scaladsl.model.StatusCodes.Redirection
import akka.http.scaladsl.server.{ Directives ⇒ D } import akka.http.scaladsl.server.{ Directives ⇒ D }

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

@ -6,6 +6,7 @@ package akka.http.javadsl.server.directives
import java.util.concurrent.CompletionStage import java.util.concurrent.CompletionStage
import akka.dispatch.ExecutionContexts import akka.dispatch.ExecutionContexts
import akka.http.javadsl.marshalling.Marshaller
import akka.http.scaladsl.server._ import akka.http.scaladsl.server._
import akka.japi.Util 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.RequestEntity
import akka.http.javadsl.model.StatusCode import akka.http.javadsl.model.StatusCode
import akka.http.javadsl.model.Uri 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
import akka.http.scaladsl.marshalling.Marshaller._ import akka.http.scaladsl.marshalling.Marshaller._
import akka.http.scaladsl.marshalling.ToResponseMarshallable import akka.http.scaladsl.marshalling.ToResponseMarshallable

4
akka-http/src/main/scala/akka/http/javadsl/server/StringUnmarshaller.scala → akka-http/src/main/scala/akka/http/javadsl/unmarshalling/StringUnmarshaller.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com> * 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 import java.util.concurrent.CompletionStage
@ -21,7 +21,7 @@ object StringUnmarshaller {
/** /**
* INTERNAL API * INTERNAL API
*/ */
private[server] object StringUnmarshallerPredef extends akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers { private[unmarshalling] object StringUnmarshallerPredef extends akka.http.scaladsl.unmarshalling.PredefinedFromStringUnmarshallers {
} }

34
akka-http/src/main/scala/akka/http/javadsl/server/Unmarshaller.scala → akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala
View file

@ -2,36 +2,24 @@
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com> * 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 java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters._ import akka.http.impl.util.JavaMapping
import scala.collection.JavaConverters._
import akka.http.impl.util.JavaMapping.Implicits._ 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.http.scaladsl.util.FastFuture
import akka.stream.Materializer 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 import scala.language.implicitConversions
object Unmarshaller { object Unmarshaller {

6
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.io.File
import java.net.{ URI, URL } import java.net.{ URI, URL }
import akka.http.javadsl.model import akka.http.javadsl.{ marshalling, model }
import akka.stream.ActorAttributes import akka.stream.ActorAttributes
import akka.stream.scaladsl.{ FileIO, StreamConverters } import akka.stream.scaladsl.{ FileIO, StreamConverters }
@ -272,10 +272,10 @@ object FileAndResourceDirectives extends FileAndResourceDirectives {
def marshaller(renderVanityFooter: Boolean): ToEntityMarshaller[DirectoryListing] 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)) val combined = Marshaller.combined[JDL, SDL, SRE](x ⇒ JavaMapping.toScala(x)(RoutingJavaMapping.convertDirectoryListing))(marshaller(renderVanityFooter))
.map(_.asJava) .map(_.asJava)
akka.http.javadsl.server.Marshaller.fromScala(combined) marshalling.Marshaller.fromScala(combined)
} }
} }

2
akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/Unmarshaller.scala
View file

@ -13,7 +13,7 @@ import akka.http.scaladsl.util.FastFuture
import akka.http.scaladsl.util.FastFuture._ import akka.http.scaladsl.util.FastFuture._
import akka.http.scaladsl.model._ 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 implicit final def asScala: Unmarshaller[A, B] = this