#572 Akka HTTP 10.1.0 & Akka 2.5.11 (#611)

paypal · Mar 12, 2018 · 0a33510 · 0a33510
1 parent 2f6b5a0
commit 0a33510
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/project/Versions.scala b/project/Versions.scala
@@ -15,8 +15,8 @@
  */
 
 object Versions {
-  val akkaV = "2.5.9"
-  val akkaHttpV = "10.1.0-RC2"
+  val akkaV = "2.5.11"
+  val akkaHttpV = "10.1.0"
   val scalatestV = "3.0.5"
   val scalaLoggingV = "3.7.2"
   val jacksonV = "2.9.4"

diff --git a/squbs-ext/src/main/scala/akka/http/org/squbs/util/JavaConverters.scala b/squbs-ext/src/main/scala/akka/http/org/squbs/util/JavaConverters.scala
@@ -73,4 +73,6 @@ object JavaConverters {
   js.Flow[Pair[jm.HttpRequest, T], Pair[Try[jm.HttpResponse], T], jd.HostConnectionPool] = {
     adaptTupleFlow[T](flow)
   }
+
+  def toScala(uri: akka.http.javadsl.model.Uri) = JavaMapping.toScala(uri)
 }
diff --git a/squbs-httpclient/src/main/scala/org/squbs/httpclient/HttpEndpoint.scala b/squbs-httpclient/src/main/scala/org/squbs/httpclient/HttpEndpoint.scala
@@ -15,12 +15,12 @@
  */
 package org.squbs.httpclient
 import java.util.Optional
-import javax.net.ssl.SSLContext
 
-import akka.http.impl.model.JavaUri
 import akka.http.javadsl
+import akka.http.org.squbs.util.JavaConverters
 import akka.http.scaladsl.model.Uri
 import com.typesafe.config.Config
+import javax.net.ssl.SSLContext
 
 import scala.compat.java8.OptionConverters._
 
@@ -54,10 +54,6 @@ object HttpEndpoint {
   /**
    * Java API
    */
-  def create(uri: javadsl.model.Uri, sslContext: Optional[SSLContext], config: Optional[Config]): HttpEndpoint = {
-    uri match {
-      case JavaUri(sUri) => HttpEndpoint(sUri, sslContext.asScala, config.asScala)
-      case _ => throw new IllegalArgumentException("Illegitimately created uri.")
-    }
-  }
+  def create(uri: javadsl.model.Uri, sslContext: Optional[SSLContext], config: Optional[Config]): HttpEndpoint =
+    HttpEndpoint(JavaConverters.toScala(uri), sslContext.asScala, config.asScala)
 }
diff --git a/squbs-unicomplex/src/test/scala/org/squbs/unicomplex/MaterializerSpec.scala b/squbs-unicomplex/src/test/scala/org/squbs/unicomplex/MaterializerSpec.scala
@@ -106,6 +106,12 @@ object MaterializerSpec {
       |io.tcp {
       |  write-buffer-size = 16 KiB
       |}
+      |stream-ref {
+      |  buffer-capacity = 32
+      |  demand-redelivery-interval = 1 second
+      |  subscription-timeout = 30 seconds
+      |}
+      |blocking-io-dispatcher = "akka.stream.default-blocking-io-dispatcher"
     """.stripMargin)
 
   val boot = UnicomplexBoot(config)