Merge pull request #85 from hseeberger/84-akka-http-1.0-RC1

Upgrade to akka-http 1.0-RC1 (closes #84)
typesafehub · Apr 27, 2015 · 6cd1894 · 6cd1894
2 parents d4ee1a5 + 40e6626
commit 6cd1894
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,8 +3,8 @@ import sbt.Resolver.bintrayRepo
 
 object Version {
   val akka             = "2.3.10"
-  val akkaContribExtra = "1.13.1"
-  val akkaHttp         = "1.0-M5"
+  val akkaContribExtra = "1.14.0"
+  val akkaHttp         = "1.0-RC1"
   val jansi            = "1.11"
   val jline            = "2.12"
   val play             = "2.4.0-M1"
@@ -14,15 +14,15 @@ object Version {
 }
 
 object Library {
-  val akkaContribExtra = "com.typesafe.akka"    %% "akka-contrib-extra"     % Version.akkaContribExtra
-  val akkaHttp         = "com.typesafe.akka"    %% "akka-http-experimental" % Version.akkaHttp
-  val akkaTestkit      = "com.typesafe.akka"    %% "akka-testkit"           % Version.akka
-  val jansi            = "org.fusesource.jansi" %  "jansi"                  % Version.jansi
-  val jline            = "jline"                %  "jline"                  % Version.jline
-  val playJson         = "com.typesafe.play"    %% "play-json"              % Version.play
-  val sbtBundle        = "com.typesafe.sbt"     %  "sbt-bundle"             % Version.sbtBundle
-  val scalaTest        = "org.scalatest"        %% "scalatest"              % Version.scalaTest
-  val scalactic        = "org.scalactic"        %% "scalactic"              % Version.scalactic
+  val akkaContribExtra = "com.typesafe.akka"    %% "akka-contrib-extra"           % Version.akkaContribExtra
+  val akkaHttp         = "com.typesafe.akka"    %% "akka-http-scala-experimental" % Version.akkaHttp
+  val akkaTestkit      = "com.typesafe.akka"    %% "akka-testkit"                 % Version.akka
+  val jansi            = "org.fusesource.jansi" %  "jansi"                        % Version.jansi
+  val jline            = "jline"                %  "jline"                        % Version.jline
+  val playJson         = "com.typesafe.play"    %% "play-json"                    % Version.play
+  val sbtBundle        = "com.typesafe.sbt"     %  "sbt-bundle"                   % Version.sbtBundle
+  val scalaTest        = "org.scalatest"        %% "scalatest"                    % Version.scalaTest
+  val scalactic        = "org.scalactic"        %% "scalactic"                    % Version.scalactic
 }
 
 object Resolver {

diff --git a/src/main/scala/com/typesafe/conductr/client/ConductRController.scala b/src/main/scala/com/typesafe/conductr/client/ConductRController.scala
@@ -7,13 +7,13 @@ package com.typesafe.conductr.client
 import akka.actor.{ Actor, ActorRef, ActorRefFactory, ActorSystem, Cancellable, Props }
 import akka.cluster.UniqueAddress
 import akka.contrib.stream.InputStreamPublisher
-import akka.http.Http
-import akka.http.marshalling.Marshal
-import akka.http.model.HttpEntity.IndefiniteLength
-import akka.http.model.HttpMethods._
-import akka.http.model.Multipart.FormData
-import akka.http.model.{ HttpRequest, HttpResponse, MediaTypes, RequestEntity, Uri }
-import akka.http.unmarshalling.Unmarshal
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.marshalling.Marshal
+import akka.http.scaladsl.model.HttpEntity.IndefiniteLength
+import akka.http.scaladsl.model.HttpMethods._
+import akka.http.scaladsl.model.Multipart.FormData
+import akka.http.scaladsl.model.{ HttpRequest, HttpResponse, MediaTypes, RequestEntity, Uri }
+import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.pattern.pipe
 import akka.stream.actor.ActorPublisher
 import akka.stream.scaladsl.{ Flow, ImplicitFlowMaterializer, Sink, Source }
@@ -235,7 +235,7 @@ class ConductRController(uri: Uri, connectTimeout: Timeout)
   private def fetchBundleFlow(originalSender: ActorRef): Unit = {
     import scala.concurrent.duration._
     // TODO this needs to be driven by SSE and not by the timer
-    val source = Source(100.millis, 2.seconds, () => ()).mapAsync(_ => getBundles)
+    val source = Source(100.millis, 2.seconds, () => ()).mapAsync(1, _ => getBundles)
     originalSender ! BundleInfosSource(source)
   }
 

diff --git a/src/main/scala/com/typesafe/conductr/sbt/ConductR.scala b/src/main/scala/com/typesafe/conductr/sbt/ConductR.scala
@@ -7,7 +7,7 @@ package com.typesafe.conductr.sbt
 import java.net.URL
 
 import akka.actor.{ ActorRef, ActorSystem }
-import akka.http.model.{ Uri => HttpUri }
+import akka.http.scaladsl.model.{ Uri => HttpUri }
 import akka.pattern.ask
 import akka.util.Timeout
 import com.typesafe.conductr.client.ConductRController

diff --git a/src/test/scala/com/typesafe/conductr/client/ConductRControllerSpec.scala b/src/test/scala/com/typesafe/conductr/client/ConductRControllerSpec.scala
@@ -5,8 +5,8 @@
 package com.typesafe.conductr.client
 
 import akka.actor.{ ActorRef, ActorSystem }
-import akka.http.Http
-import akka.http.model.{ HttpMethods, HttpRequest, HttpResponse, StatusCodes, Uri }
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.model.{ HttpMethods, HttpRequest, HttpResponse, StatusCodes, Uri }
 import akka.stream.scaladsl.Flow
 import akka.testkit.{ TestActorRef, TestProbe }
 import org.scalatest.{ BeforeAndAfterAll, Matchers, PrivateMethodTester, WordSpec }