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

Merge pull request #17988 from ktoso/wip-javadsl-handleWith-ktoso

Browse source 
!htp #17965 more consistent and 22-ified javadsl handleWith
This commit is contained in:
Konrad Malawski 2015-07-15 12:22:46 +02:00
commit 77d3e693c5
27 changed files with 339 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

37
akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala
View file

@ -7,25 +7,27 @@ package akka.http.scaladsl
import java.net.InetSocketAddress
import java.util.concurrent.ConcurrentHashMap
import java.util.{ Collection ⇒ JCollection }
import javax.net.ssl.{ SSLParameters, SSLContext }
import com.typesafe.config.Config
import scala.util.Try
import scala.util.control.NonFatal
import scala.collection.{ JavaConverters, immutable }
import scala.concurrent.{ ExecutionContext, Promise, Future }
import akka.japi
import javax.net.ssl.{ SSLContext, SSLParameters }
import akka.actor._
import akka.event.LoggingAdapter
import akka.http._
import akka.http.impl.engine.client._
import akka.http.impl.engine.server._
import akka.http.impl.util.StreamUtils
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.Host
import akka.http.scaladsl.util.FastFuture
import akka.japi
import akka.stream.Materializer
import akka.stream.io._
import akka.stream.scaladsl._
import akka.http.impl.util.StreamUtils
import akka.http.impl.engine.client._
import akka.http.impl.engine.server._
import akka.http.scaladsl.util.FastFuture
import akka.http.scaladsl.model.headers.Host
import akka.http.scaladsl.model._
import akka.http._
import akka.actor._
import com.typesafe.config.Config
import scala.collection.immutable
import scala.concurrent.{ ExecutionContext, Future, Promise }
import scala.util.Try
import scala.util.control.NonFatal
class HttpExt(config: Config)(implicit system: ActorSystem) extends akka.actor.Extension {
@ -397,8 +399,9 @@ class HttpExt(config: Config)(implicit system: ActorSystem) extends akka.actor.E
* method call the respective connection pools will be restarted and not contribute to the returned future.
*/
def shutdownAllConnectionPools(): Future[Unit] = {
import scala.collection.JavaConverters._
import system.dispatcher
import scala.collection.JavaConverters._
val gateways = hostPoolCache.values().asScala
system.log.info("Initiating orderly shutdown of all active host connections pools...")
Future.sequence(gateways.map(_.flatMap(_.shutdown()))).map(_ ⇒ ())
@ -575,7 +578,7 @@ object Http extends ExtensionId[HttpExt] with ExtensionIdProvider {
new HttpExt(system.settings.config getConfig "akka.http")(system)
}
import JavaConverters._
import scala.collection.JavaConverters._
//# https-context-impl
case class HttpsContext(sslContext: SSLContext,