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

!htc use correct rejection in http javadsl (#21179)

Browse source
This commit is contained in:
Hawstein 2016-08-15 23:32:01 +08:00 • committed by Konrad Malawski
parent d0eca7ef5d
commit 07c6332a22
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ import akka.http.javadsl.server.directives.LogEntry;
import java.util.List;
import akka.http.scaladsl.server.Rejection;
import akka.http.javadsl.server.Rejection;
import static akka.event.Logging.InfoLevel;

13
akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala
View file

@ -3,17 +3,16 @@
*/
package akka.http.javadsl.server.directives
import java.lang.{ Iterable ⇒ JIterable }
import java.util.function.{ BiFunction, Supplier, Function ⇒ JFunction }
import java.util.{ Optional, List ⇒ JList }
import akka.event.Logging
import akka.event.Logging.LogLevel
import akka.http.javadsl.model.{ HttpRequest, HttpResponse }
import akka.http.javadsl.server.{ Route, RoutingJavaMapping }
import akka.http.javadsl.server.{ Rejection, Route, RoutingJavaMapping }
import akka.http.scaladsl
import akka.http.scaladsl.server.directives.LoggingMagnet
import akka.http.scaladsl.server.{ Rejection, RouteResult, Directives ⇒ D }
import akka.http.scaladsl.server.{ RouteResult, Directives ⇒ D }
import scala.collection.JavaConverters._
@ -72,7 +71,7 @@ abstract class DebuggingDirectives extends CookieDirectives {
inner: Supplier[Route]) = RouteAdapter {
D.logResult(LoggingMagnet.forMessageFromFullShow {
case RouteResult.Complete(response) ⇒ showSuccess.apply(response).asScala
case RouteResult.Rejected(rejections) ⇒ showRejection.apply(rejections.asJava).asScala
case RouteResult.Rejected(rejections) ⇒ showRejection.apply(rejections.map(_.asJava).asJava).asScala
}) {
inner.get.delegate
}
@ -90,7 +89,7 @@ abstract class DebuggingDirectives extends CookieDirectives {
inner: Supplier[Route]) = RouteAdapter {
D.logRequestResult(LoggingMagnet.forRequestResponseFromFullShow(request ⇒ {
case RouteResult.Complete(response) ⇒ Some(showSuccess.apply(request, response).asScala)
case RouteResult.Rejected(rejections) ⇒ Some(showRejection.apply(request, rejections.asJava).asScala)
case RouteResult.Rejected(rejections) ⇒ Some(showRejection.apply(request, rejections.map(_.asJava).asJava).asScala)
})) {
inner.get.delegate
}
@ -109,7 +108,7 @@ abstract class DebuggingDirectives extends CookieDirectives {
inner: Supplier[Route]) = RouteAdapter {
D.logRequestResult(LoggingMagnet.forRequestResponseFromFullShow(request ⇒ {
case RouteResult.Complete(response) ⇒ showSuccess.apply(request, response).asScala
case RouteResult.Rejected(rejections) ⇒ showRejection.apply(request, rejections.asJava).asScala
case RouteResult.Rejected(rejections) ⇒ showRejection.apply(request, rejections.map(_.asJava).asJava).asScala
})) {
inner.get.delegate
}
@ -127,4 +126,4 @@ object LogEntry {
def info(obj: Any): LogEntry = scaladsl.server.directives.LogEntry(obj, Logging.InfoLevel)
def warning(obj: Any): LogEntry = scaladsl.server.directives.LogEntry(obj, Logging.WarningLevel)
def error(obj: Any): LogEntry = scaladsl.server.directives.LogEntry(obj, Logging.ErrorLevel)
}
}