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 b75ff765c2..546579d1ad 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 @@ -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; 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 2d86622fc3..3ba307ca1f 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 @@ -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; diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java index 69c0e11239..bb8b685150 100644 --- a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java +++ b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java @@ -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; diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/testkit/MyAppService.java b/akka-docs/rst/java/code/docs/http/javadsl/server/testkit/MyAppService.java index 88a82ee69b..bc9836fac8 100644 --- a/akka-docs/rst/java/code/docs/http/javadsl/server/testkit/MyAppService.java +++ b/akka-docs/rst/java/code/docs/http/javadsl/server/testkit/MyAppService.java @@ -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; diff --git a/akka-docs/rst/scala/http/migration-guide-2.4.x-experimental.rst b/akka-docs/rst/scala/http/migration-guide-2.4.x-experimental.rst index 23f9e5eeae..12eee4a1de 100644 --- a/akka-docs/rst/scala/http/migration-guide-2.4.x-experimental.rst +++ b/akka-docs/rst/scala/http/migration-guide-2.4.x-experimental.rst @@ -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` diff --git a/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java b/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java index 58a10527b1..05877a8f91 100644 --- a/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java +++ b/akka-http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java @@ -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 { 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 a57a9a5d17..8153d2328f 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 @@ -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; diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/CompleteTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/CompleteTest.java index 4e6b873cdc..fb16b3cf64 100644 --- a/akka-http-tests/src/test/java/akka/http/javadsl/server/CompleteTest.java +++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/CompleteTest.java @@ -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; diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java index 3c8c60eef2..d6dc7abeeb 100644 --- a/akka-http-tests/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java +++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java @@ -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; 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 e1b8b48d3b..e447f90eb5 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 @@ -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; 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 cbef7d04da..cdfcbab480 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 @@ -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; diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/CodingDirectivesTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/CodingDirectivesTest.java index 73c13b7dfe..dacee6cc78 100644 --- a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/CodingDirectivesTest.java +++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/CodingDirectivesTest.java @@ -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; diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ExecutionDirectivesTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ExecutionDirectivesTest.java index 2eeee3ad95..2bc1c7dcc9 100644 --- a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ExecutionDirectivesTest.java +++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ExecutionDirectivesTest.java @@ -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; diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ParameterDirectivesTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ParameterDirectivesTest.java index 7fa8a7f7f4..1084bee84e 100644 --- a/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ParameterDirectivesTest.java +++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ParameterDirectivesTest.java @@ -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; diff --git a/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java b/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java index a13eb5cc61..df296552f2 100644 --- a/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java +++ b/akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java @@ -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; diff --git a/akka-http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java b/akka-http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java index cf6fea705d..219c33007b 100644 --- a/akka-http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java +++ b/akka-http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java @@ -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; diff --git a/akka-http/src/main/java/akka/http/javadsl/server/Coder.java b/akka-http/src/main/java/akka/http/javadsl/coding/Coder.java similarity index 96% rename from akka-http/src/main/java/akka/http/javadsl/server/Coder.java rename to akka-http/src/main/java/akka/http/javadsl/coding/Coder.java index f3f45e32aa..7d2196a305 100644 --- a/akka-http/src/main/java/akka/http/javadsl/server/Coder.java +++ b/akka-http/src/main/java/akka/http/javadsl/coding/Coder.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2016 Lightbend Inc. */ -package akka.http.javadsl.server; +package akka.http.javadsl.coding; import java.util.concurrent.CompletionStage; diff --git a/akka-http/src/main/java/akka/http/javadsl/server/RegexConverters.java b/akka-http/src/main/java/akka/http/javadsl/common/RegexConverters.java similarity index 74% rename from akka-http/src/main/java/akka/http/javadsl/server/RegexConverters.java rename to akka-http/src/main/java/akka/http/javadsl/common/RegexConverters.java index 6d0ff6c5b2..51bd2a24e5 100644 --- a/akka-http/src/main/java/akka/http/javadsl/server/RegexConverters.java +++ b/akka-http/src/main/java/akka/http/javadsl/common/RegexConverters.java @@ -1,4 +1,7 @@ -package akka.http.javadsl.server; +/* + * Copyright (C) 2009-2016 Lightbend Inc. + */ +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 empty = new VectorBuilder().result(); /** diff --git a/akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java b/akka-http/src/main/java/akka/http/javadsl/unmarshalling/StringUnmarshallers.java similarity index 92% rename from akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java rename to akka-http/src/main/java/akka/http/javadsl/unmarshalling/StringUnmarshallers.java index b07cb5ce75..4cd74b89d8 100644 --- a/akka-http/src/main/java/akka/http/javadsl/server/StringUnmarshallers.java +++ b/akka-http/src/main/java/akka/http/javadsl/unmarshalling/StringUnmarshallers.java @@ -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. + */ +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. */ diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala b/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala index de29561079..ec3d933799 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala @@ -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 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 3765e22233..86236c7647 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 @@ -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 } diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala index 6ae18a6d57..f8671551ac 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala @@ -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 { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala index 1cd224c488..88e3f511f8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala @@ -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.") } }