Skip to content

Commit cd22f7d

Browse files
phderomerkuhn
phderome
authored andcommitted
rename chapter04 to chapter11 as per book structure (#10)
* Moved RateLimiter.scala (without any CircuitBreaker mind you) back to Chapter12 as per book 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) * moved contents of chapter04 to chapter11 to reflect published physical book contents * moved contents of chapter04 to chapter11 to reflect published physical book contents * undid the previous commits to ensure we rebase properly * moving chapter04 to chapter11 as per book
1 parent 7f5fcb6 commit cd22f7d

File tree

9 files changed

+16
-18
lines changed

9 files changed

+16
-18
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ lazy val common = project
66

77
lazy val chapter02 = project dependsOn (common)
88

9-
lazy val chapter04 = project dependsOn (common)
10-
119
lazy val chapter07 = project dependsOn (common)
1210

11+
lazy val chapter11 = project dependsOn (common)
12+
1313
lazy val chapter12 = project dependsOn (common)
1414

1515
lazy val chapter13 = project dependsOn (common)
File renamed without changes.

chapter04/src/main/scala/com/reactivedesignpatterns/chapter4/EchoService.scala renamed to chapter11/src/main/scala/com/reactivedesignpatterns/chapter11/EchoService.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.reactivedesignpatterns.chapter4
1+
package com.reactivedesignpatterns.chapter11
22

3-
import akka.actor.Actor
4-
import akka.actor.ActorRef
3+
import akka.actor.{Actor, ActorRef}
54

65
object EchoService {
76
case class Request(tag: String, client: ActorRef)

chapter04/src/main/scala/com/reactivedesignpatterns/chapter4/TranslationService.scala renamed to chapter11/src/main/scala/com/reactivedesignpatterns/chapter11/TranslationService.scala

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package com.reactivedesignpatterns.chapter4
1+
package com.reactivedesignpatterns.chapter11
22

3-
import scala.concurrent.ExecutionContext
4-
import scala.concurrent.Future
5-
import scala.concurrent.duration._
6-
import akka.actor.ActorRef
7-
import akka.actor.Actor
3+
import java.util.concurrent.TimeoutException
4+
5+
import akka.actor.{Actor, ActorRef, Props}
86
import akka.util.Timeout
97
import com.reactivedesignpatterns.Defaults._
10-
import java.util.concurrent.TimeoutException
11-
import akka.actor.Props
8+
9+
import scala.concurrent.duration._
10+
import scala.concurrent.{ExecutionContext, Future}
1211

1312
class TranslationService {
1413
import ExecutionContext.Implicits.global

chapter04/src/test/scala/com/reactivedesignpatterns/chapter4/EchoServiceSpec.scala renamed to chapter11/src/test/scala/com/reactivedesignpatterns/chapter11/EchoServiceSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactivedesignpatterns.chapter4
1+
package com.reactivedesignpatterns.chapter11
22

33
import scala.concurrent.duration.{ DurationInt, FiniteDuration }
44
import scala.util.Try

chapter04/src/test/scala/com/reactivedesignpatterns/chapter4/FailureParentSpec.scala renamed to chapter11/src/test/scala/com/reactivedesignpatterns/chapter11/FailureParentSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactivedesignpatterns.chapter4
1+
package com.reactivedesignpatterns.chapter11
22

33
import org.scalatest._
44
import akka.actor._

chapter04/src/test/scala/com/reactivedesignpatterns/chapter4/LatencyTestSupport.scala renamed to chapter11/src/test/scala/com/reactivedesignpatterns/chapter11/LatencyTestSupport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactivedesignpatterns.chapter4
1+
package com.reactivedesignpatterns.chapter11
22

33
import scala.collection.immutable
44
import scala.concurrent.{ ExecutionContext, Future }

chapter04/src/test/scala/com/reactivedesignpatterns/chapter4/StepParentSpec.scala renamed to chapter11/src/test/scala/com/reactivedesignpatterns/chapter11/StepParentSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactivedesignpatterns.chapter4
1+
package com.reactivedesignpatterns.chapter11
22

33
import org.scalatest._
44
import akka.actor._

chapter04/src/test/scala/com/reactivedesignpatterns/chapter4/TranslationServiceSpec.scala renamed to chapter11/src/test/scala/com/reactivedesignpatterns/chapter11/TranslationServiceSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactivedesignpatterns.chapter4
1+
package com.reactivedesignpatterns.chapter11
22

33
import org.scalatest.WordSpec
44
import org.scalatest.Matchers

0 commit comments

Comments
 (0)