From d3ea9e49dbf1ded613d9eb082115c1a9daaed9eb Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Wed, 20 Jul 2016 12:18:52 +0200 Subject: [PATCH] =htp cache default RejectionHandler instance, it's safe to share (#20996) --- .../src/test/scala/akka/util/ByteStringSpec.scala | 2 +- .../scala/akka/http/scaladsl/server/RejectionHandler.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala index 57dac8c482..55751aa816 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala @@ -322,7 +322,7 @@ class ByteStringSpec extends WordSpec with Matchers with Checkers { check { (a: ByteString) ⇒ a.asByteBuffers.foldLeft(ByteString.empty) { (bs, bb) ⇒ bs ++ ByteString(bb) } == a } check { (a: ByteString) ⇒ a.asByteBuffers.forall(_.isReadOnly) } check { (a: ByteString) ⇒ - import scala.collection.JavaConverters.iterableAsScalaIterableConverter; + import scala.collection.JavaConverters.iterableAsScalaIterableConverter a.asByteBuffers.zip(a.getByteBuffers().asScala).forall(x ⇒ x._1 == x._2) } } diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/RejectionHandler.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/RejectionHandler.scala index e076c73a52..bc6c6a451f 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/RejectionHandler.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/RejectionHandler.scala @@ -122,9 +122,9 @@ object RejectionHandler { import Directives._ /** - * Creates a new default [[RejectionHandler]] instance. + * Default [[RejectionHandler]] instance. */ - def default = + final val default = newBuilder() .handleAll[SchemeRejection] { rejections ⇒ val schemes = rejections.map(_.supported).mkString(", ")