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

Merge pull request #18691 from spray/w/small-java-http-api-fixes

Browse source 
+htc add missing javadsl.Http.outgoingConnectionTls overload + remove extra params
This commit is contained in:
Konrad Malawski 2015-10-09 17:50:44 +02:00
commit 83ec1f2b0b
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-http-core/src/main/scala/akka/http/javadsl/Http.scala
View file

@ -4,7 +4,6 @@
package akka.http.javadsl
import java.lang.{ Iterable ⇒ JIterable }
import java.net.InetSocketAddress
import akka.http.impl.util.JavaMapping
import akka.stream.io.{ SslTlsInbound, SslTlsOutbound }
@ -16,7 +15,6 @@ import akka.stream.scaladsl.Keep
import akka.japi.{ Pair, Option, Function }
import akka.actor.{ ExtendedActorSystem, ActorSystem, ExtensionIdProvider, ExtensionId }
import akka.event.LoggingAdapter
import akka.io.Inet
import akka.stream.Materializer
import akka.stream.javadsl.{ BidiFlow, Flow, Source }
@ -227,6 +225,12 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension {
def outgoingConnection(host: String): Flow[HttpRequest, HttpResponse, Future[OutgoingConnection]] =
outgoingConnection(host, 80)
/**
* Same as [[outgoingConnection]] but with HTTPS encryption.
*/
def outgoingConnectionTls(host: String): Flow[HttpRequest, HttpResponse, Future[OutgoingConnection]] =
outgoingConnectionTls(host, 443)
/**
* Creates a [[Flow]] representing a prospective HTTP client connection to the given endpoint.
* Every materialization of the produced flow will attempt to establish a new outgoing connection.
@ -318,7 +322,6 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension {
* object of type ``T`` from the application which is emitted together with the corresponding response.
*/
def newHostConnectionPool[T](host: String, port: Int,
options: JIterable[Inet.SocketOption],
settings: ConnectionPoolSettings,
log: LoggingAdapter, materializer: Materializer): Flow[Pair[HttpRequest, T], Pair[Try[HttpResponse], T], HostConnectionPool] =
adaptTupleFlow(delegate.newHostConnectionPool[T](host, port, settings, log)(materializer))
@ -330,7 +333,6 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension {
* for encryption on the connection.
*/
def newHostConnectionPoolTls[T](host: String, port: Int,
options: JIterable[Inet.SocketOption],
settings: ConnectionPoolSettings,
httpsContext: Option[HttpsContext],
log: LoggingAdapter, materializer: Materializer): Flow[Pair[HttpRequest, T], Pair[Try[HttpResponse], T], HostConnectionPool] =