Skip to content

Commit 7f5fcb6

Browse files
phderomerkuhn
phderome
authored andcommitted
Moved RateLimiter.scala (without any CircuitBreaker mind you) back to Chapter12 as per book (#7)
Fixed sbt.IO dependency in build.scala and chapter13 (must have been in .ivy cache for RKuhn), removed some unused imports directory change for MultiMasterCRDTSpec.scala (now chapter13)
1 parent fa337b8 commit 7f5fcb6

File tree

5 files changed

+4
-9
lines changed

5 files changed

+4
-9
lines changed

chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/RateLimiter.scala chapter12/src/main/scala/com/reactivedesignpatterns/chapter12/RateLimiter.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.reactivedesignpatterns.chapter13
1+
package com.reactivedesignpatterns.chapter12
22

3-
import scala.concurrent.duration.FiniteDuration
4-
import scala.concurrent.duration.Deadline
53
import scala.concurrent.Future
4+
import scala.concurrent.duration.{Deadline, FiniteDuration}
65

76
case object RateLimitExceeded extends RuntimeException
87

chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActivePassive.scala

-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
*/
44
package com.reactivedesignpatterns.chapter13
55

6-
import sbt.IO
76
import play.api.libs.json._
8-
import java.io.File
97
import akka.actor._
108
import scala.collection.mutable.Queue
119
import akka.cluster.Cluster
1210
import scala.concurrent.duration._
1311
import scala.collection.immutable.TreeMap
14-
import scala.concurrent.forkjoin.ThreadLocalRandom
1512
import scala.util.Random
16-
import scala.annotation.tailrec
1713
import akka.cluster.singleton.ClusterSingletonManager
1814
import akka.cluster.singleton.ClusterSingletonProxy
1915
import akka.cluster.singleton.ClusterSingletonManagerSettings

chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/KVStoreUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package com.reactivedesignpatterns.chapter13
55

66
import play.api.libs.json.JsValue
77
import java.io.File
8-
import sbt.IO
8+
import sbt.io.IO
99
import play.api.libs.json.Json
1010
import akka.actor.ActorRef
1111

project/Build.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object Build {
1717

1818
val amazonAWS = "com.amazonaws" % "aws-java-sdk" % "1.11.109"
1919

20-
val sbtIO = "org.scala-sbt" %% "io" % "0.13.8"
20+
val sbtIO = "org.scala-sbt" %% "io" % "1.0.0-M9"
2121

2222
val scalaAsync = "org.scala-lang.modules" %% "scala-async" % "0.9.2"
2323
val scalaJava8 = "org.scala-lang.modules" %% "scala-java8-compat" % "0.7.0"

0 commit comments

Comments
 (0)