Additional JavaDSL package structure and docs #20945
This commit is contained in:
Johan Andrén
Konrad Malawski
parent
3cfb6f9d91
commit
74243a28f8
23 changed files with 47 additions and 30 deletions
|
|
@ -10,7 +10,7 @@ import org.junit.Test;
|
|||
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.unmarshalling.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshaller;
|
||||
import akka.http.javadsl.unmarshalling.Unmarshaller;
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import akka.http.javadsl.model.HttpRequest;
|
|||
import akka.http.javadsl.model.headers.AcceptEncoding;
|
||||
import akka.http.javadsl.model.headers.ContentEncoding;
|
||||
import akka.http.javadsl.model.headers.HttpEncodings;
|
||||
import akka.http.javadsl.server.Coder;
|
||||
import akka.http.javadsl.coding.Coder;
|
||||
import akka.http.javadsl.server.Rejections;
|
||||
import akka.http.javadsl.server.Route;
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import akka.http.javadsl.model.FormData;
|
|||
import akka.http.javadsl.model.HttpRequest;
|
||||
import akka.http.javadsl.model.StatusCodes;
|
||||
import akka.http.javadsl.server.Route;
|
||||
import akka.http.javadsl.server.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
import akka.japi.Pair;
|
||||
import org.junit.Test;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import akka.http.javadsl.ConnectHttp;
|
|||
import akka.http.javadsl.Http;
|
||||
import akka.http.javadsl.server.AllDirectives;
|
||||
import akka.http.javadsl.server.Route;
|
||||
import akka.http.javadsl.server.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import akka.http.javadsl.server.examples.simple.SimpleServerApp;
|
||||
import akka.stream.ActorMaterializer;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,3 +24,19 @@ Akka HTTP 2.4.7 -> 2.4.8
|
|||
The `challengeFor` directive was actually more like a factory for `HttpChallenge`,
|
||||
thus it was moved to become such. It is now available as `akka.http.javadsl.model.headers.HttpChallenge#create[Basic|OAuth2]`
|
||||
for JavaDSL and `akka.http.scaladsl.model.headers.HttpChallenges#[basic|oAuth2]` for ScalaDSL.
|
||||
|
||||
Akka HTTP 2.4.8 -> 2.4.9
|
||||
------------------------
|
||||
|
||||
Java DSL Package structure changes
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
We have aligned the package structure of the Java based DSL with the Scala based DSL
|
||||
and moved classes that was in the wrong or unexpected places around a bit. This means
|
||||
that Java DSL users must update their imports as follows:
|
||||
|
||||
Classes dealing with unmarshalling and unmarshalling used to reside in `akka.http.javadsl.server`
|
||||
but are now available from the packages `akka.http.javadsl.unmarshalling` and `akka.http.javadsl.marshalling`.
|
||||
|
||||
`akka.http.javadsl.server.Coder` is now `akka.http.javadsl.coding.Coder`
|
||||
|
||||
`akka.http.javadsl.server.RegexConverters` is now `akka.http.javadsl.common.RegexConverters`
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||
import java.util.function.Function;
|
||||
|
||||
import static akka.http.javadsl.server.Directives.*;
|
||||
import static akka.http.javadsl.server.StringUnmarshallers.INTEGER;
|
||||
import static akka.http.javadsl.unmarshalling.StringUnmarshallers.INTEGER;
|
||||
|
||||
public class PetStoreExample {
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import akka.http.javadsl.HttpsConnectionContext;
|
|||
import akka.http.javadsl.model.HttpRequest;
|
||||
import akka.http.javadsl.model.HttpResponse;
|
||||
import akka.http.javadsl.server.*;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import akka.stream.ActorMaterializer;
|
||||
import akka.stream.javadsl.Flow;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
package akka.http.javadsl.server;
|
||||
|
||||
import static akka.http.javadsl.server.StringUnmarshallers.INTEGER;
|
||||
import static akka.http.javadsl.unmarshalling.StringUnmarshallers.INTEGER;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.CompletionStage;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
package akka.http.javadsl.server;
|
||||
|
||||
import static akka.http.javadsl.server.StringUnmarshallers.INTEGER;
|
||||
import static akka.http.javadsl.unmarshalling.StringUnmarshallers.INTEGER;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ 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.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.Unmarshaller;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import java.util.function.Function;
|
|||
import akka.http.javadsl.marshalling.Marshaller;
|
||||
import akka.http.javadsl.model.*;
|
||||
import akka.http.javadsl.model.headers.*;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import org.junit.Test;
|
||||
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
|
|
|
|||
|
|
@ -4,23 +4,18 @@
|
|||
|
||||
package akka.http.javadsl.server.directives;
|
||||
|
||||
import akka.actor.ActorSystem;
|
||||
import akka.http.javadsl.coding.Coder;
|
||||
import akka.http.javadsl.model.HttpRequest;
|
||||
import akka.http.javadsl.model.headers.AcceptEncoding;
|
||||
import akka.http.javadsl.model.headers.ContentEncoding;
|
||||
import akka.http.javadsl.model.headers.HttpEncodings;
|
||||
import akka.stream.ActorMaterializer;
|
||||
import akka.http.javadsl.server.*;
|
||||
import akka.util.ByteString;
|
||||
|
||||
import org.junit.*;
|
||||
|
||||
import scala.concurrent.Await;
|
||||
import scala.concurrent.duration.Duration;
|
||||
import akka.http.javadsl.testkit.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import akka.http.javadsl.model.StatusCodes;
|
|||
import akka.http.javadsl.server.ExceptionHandler;
|
||||
import akka.http.javadsl.server.RejectionHandler;
|
||||
import akka.http.javadsl.server.Route;
|
||||
import akka.http.javadsl.server.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
import akka.http.javadsl.testkit.TestRoute;
|
||||
import akka.http.scaladsl.server.MethodRejection;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import java.util.Map;
|
|||
import org.junit.Test;
|
||||
|
||||
import akka.http.javadsl.model.HttpRequest;
|
||||
import akka.http.javadsl.server.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
import akka.http.javadsl.testkit.TestRoute;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import org.junit.Test;
|
|||
import akka.http.javadsl.model.HttpCharsets;
|
||||
import akka.http.javadsl.model.HttpRequest;
|
||||
import akka.http.javadsl.model.MediaTypes;
|
||||
import akka.http.javadsl.server.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
import akka.http.javadsl.testkit.TestRoute;
|
||||
import akka.japi.Pair;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import akka.http.javadsl.model.HttpRequest;
|
|||
import akka.http.javadsl.model.HttpResponse;
|
||||
import akka.http.javadsl.model.StatusCodes;
|
||||
import akka.http.javadsl.server.Route;
|
||||
import akka.http.javadsl.server.StringUnmarshallers;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallers;
|
||||
import akka.http.javadsl.testkit.JUnitRouteTest;
|
||||
import akka.http.javadsl.testkit.TestRoute;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
|
||||
*/
|
||||
|
||||
package akka.http.javadsl.server;
|
||||
package akka.http.javadsl.coding;
|
||||
|
||||
import java.util.concurrent.CompletionStage;
|
||||
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
package akka.http.javadsl.server;
|
||||
/*
|
||||
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
|
||||
*/
|
||||
package akka.http.javadsl.common;
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
|
|
@ -6,7 +9,7 @@ import scala.collection.Seq;
|
|||
import scala.collection.immutable.VectorBuilder;
|
||||
import scala.util.matching.Regex;
|
||||
|
||||
public class RegexConverters {
|
||||
public final class RegexConverters {
|
||||
private static final Seq<String> empty = new VectorBuilder<String>().result();
|
||||
|
||||
/**
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
package akka.http.javadsl.server;
|
||||
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshaller;
|
||||
import akka.http.javadsl.unmarshalling.StringUnmarshallerPredef;
|
||||
import akka.http.javadsl.unmarshalling.Unmarshaller;
|
||||
/*
|
||||
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
|
||||
*/
|
||||
package akka.http.javadsl.unmarshalling;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
public class StringUnmarshallers {
|
||||
public final class StringUnmarshallers {
|
||||
/**
|
||||
* An unmarshaller that returns the input String unchanged.
|
||||
*/
|
||||
|
|
@ -12,7 +12,7 @@ import scala.collection.JavaConverters._
|
|||
|
||||
import akka.http.scaladsl.server.{ PathMatcher ⇒ SPathMatcher }
|
||||
import akka.http.scaladsl.server.{ PathMatchers ⇒ SPathMatchers }
|
||||
import akka.http.javadsl.server.RegexConverters.toScala
|
||||
import akka.http.javadsl.common.RegexConverters.toScala
|
||||
|
||||
final class PathMatchers
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import java.util.function.Supplier
|
|||
import scala.collection.JavaConverters._
|
||||
import akka.http.impl.util.JavaMapping.Implicits._
|
||||
import RoutingJavaMapping._
|
||||
import akka.http.javadsl.coding.Coder
|
||||
import akka.http.javadsl.model.headers.HttpEncoding
|
||||
import akka.http.javadsl.server.Route
|
||||
import akka.http.scaladsl.server.{ Directives ⇒ D }
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import java.util.regex.Pattern
|
|||
|
||||
import scala.collection.JavaConverters._
|
||||
|
||||
import akka.http.javadsl.server.RegexConverters.toScala
|
||||
import akka.http.javadsl.common.RegexConverters.toScala
|
||||
import akka.http.scaladsl.server.{ Directives ⇒ D }
|
||||
|
||||
abstract class HostDirectives extends HeaderDirectives {
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ class TcpSpec extends StreamSpec("akka.stream.materializer.subscription-timeout.
|
|||
.toMat(Sink.ignore)(Keep.left)
|
||||
.run()
|
||||
|
||||
whenReady(future.failed) { ex =>
|
||||
ex.getMessage should === ("Connection failed.")
|
||||
whenReady(future.failed) { ex ⇒
|
||||
ex.getMessage should ===("Connection failed.")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue