Merge pull request #1 from patriknw/wip-improvements1

Some improvements

.gitignore

@@ -13,6 +13,7 @@
 .project
 .settings
 .cache
+.target
 
 # sbt specific
 dist/*

GREEN_BELT_AKKA.md

@@ -2,7 +2,7 @@
 
 This doucment will briefly introduce some important parts of Akka _specific for the implementation of this kata_. 
 
-The official Akka documentation is really good (if we may say so ourselves): [Akka Docs](http://doc.akka.io/docs/akka/2.0.3/)  
+The official Akka documentation is really good (if we may say so ourselves): [Akka Docs](http://doc.akka.io/docs/akka/2.1.2/)  
 
 _Please note_ that this document describes parts of Akka very briefly and we refer to the original documentation for an in-depth description of Akka.
 
@@ -14,7 +14,7 @@ Below is a brief introduction of some concepts you will need for this kata with
 
 An actor system is, among other things, the context in which actors operate. You can have multiple actor systems within the same JVM.
 
-See [Actor Systems](http://doc.akka.io/docs/akka/2.0.3/general/actor-systems.html)
+See [Actor Systems](http://doc.akka.io/docs/akka/2.1.2/general/actor-systems.html)
 
 **Creating ActorSystems**
 
@@ -24,7 +24,7 @@ val system = ActorSystem("MyActorSystem")
 
 ### Working with Actors
 
-See [Actors](http://doc.akka.io/docs/akka/2.0.3/scala/actors.html)
+See [Actors](http://doc.akka.io/docs/akka/2.1.2/scala/actors.html)
 
 
 **Creating actors**
@@ -83,9 +83,18 @@ class MyActor extends Actor {
 }
 ```
 
+**Replying**
+
+class MyActor extends Actor {
+  def receive = {
+	case "A message" => sender ! "Got it"
+  }
+}
+```
+
 **Supervising actors**
 
-See [Fault Tolerance](http://doc.akka.io/docs/akka/2.0.3/scala/fault-tolerance.html)
+See [Fault Tolerance](http://doc.akka.io/docs/akka/2.1.2/scala/fault-tolerance.html)
 
 ```
 override val supervisorStrategy = OneForOneStrategy() {
@@ -100,9 +109,11 @@ override val supervisorStrategy = OneForOneStrategy() {
 
 To schedule a message to be sent sometime in the future, once or repeatedly use the scheduler.
 
-See [Scheduler](http://doc.akka.io/docs/akka/2.0.3/scala/scheduler.html)
+See [Scheduler](http://doc.akka.io/docs/akka/2.1.2/scala/scheduler.html)
 
 ```
+//Use the system's default dispatcher as ExecutionContext
+import system.dispatcher
 system.scheduler.schedule(2 seconds, 2 seconds, actor, "every other second message")
 ```
 

README.md

@@ -93,19 +93,30 @@ This will create bash scripts in `service/target/start`, `processor/target/start
 
 If you're on Windows without access to a bash shell then you will have to copy the command line and arguments into a script of your own, and rewrite the paths to windows style paths.
 
-**Do not place the scripts in a target directory since they will be deleted if you do:**
+**Note that the scripts are by default placed in target directory and they will be deleted if you do:**
 
 ```
 > sbt clean
 ```
 
-To start testing your application you can issue the command:
+Start the service
+
+```
+> service/target/start
+```
+
+The next step is to start the processor
+```
+> processor/target/start
+```
+
+Finally you should run the client. Start off by sending bets to the service
 
 ```
 > client/target/start send
 ```
 
-And to check the results you issue the command:
+The final step is to retrieve the bets from the service
 
 ```
 > client/target/start

client/src/main/scala/com/typesafe/akkademo/client/BetClient.scala

@@ -43,7 +43,8 @@ object BetClient extends App {
     } else {
       implicit val timeout = Timeout(2 seconds)
       val fBets = ask(service, RetrieveBets).mapTo[List[Bet]]
-      assert(Await.result(fBets, 5 seconds).sorted == bets.sorted)
+      val result = Await.result(fBets, 5 seconds).sorted
+      assert(result == bets.sorted, s"expected ${bets.sorted}, got $result")
       println("*** TESTING OK")
     }
   } finally {

common/src/main/scala/com/typesafe/akkademo/common/Message.scala

@@ -16,15 +16,14 @@ case object RegisterProcessor
 object Bet {
   implicit object BetOrdering extends Ordering[Bet] {
     def compare(a: Bet, b: Bet): Int = {
-      val p = a.player compare b.player
-      if (p == 0) {
-        val g = a.game compare b.game
-        if (g == 0) {
-          a.amount compare b.amount
-        } else
-          g
-      } else
-        p
+      (a.player compare b.player) match {
+        case 0 ⇒
+          (a.game compare b.game) match {
+            case 0 ⇒ a.amount compare b.amount
+            case g ⇒ g
+          }
+        case p ⇒ p
+      }
     }
   }
 }

processor/src/main/resources/application.conf

@@ -1,7 +1,4 @@
 akka {
-  event-handlers = ["akka.event.Logging$DefaultLogger"]
-  loglevel = "INFO"
-
   actor {
     provider = "akka.remote.RemoteActorRefProvider"
   }
@@ -11,7 +8,6 @@ akka {
       hostname = "127.0.0.1"
       port = 2553
     }
-    log-remote-lifecycle-events = on
   }
 }
 

processor/src/main/scala/com/typesafe/akkademo/processor/BettingProcessorApplication.scala

@@ -8,9 +8,7 @@ import com.typesafe.config._
 import com.typesafe.akkademo.processor.service.BettingProcessor
 
 object BettingProcessorApplication extends App {
-  val config = ConfigFactory.load()
-
-  val system = ActorSystem("BettingProcessorActorSystem", config)
+  val system = ActorSystem("BettingProcessorActorSystem", ConfigFactory.load())
 
   val bettingProcessor = system.actorOf(Props[BettingProcessor], "bettingProcessor")
 }

processor/src/main/scala/com/typesafe/akkademo/processor/repository/UnstableResource.scala

@@ -6,20 +6,21 @@ package com.typesafe.akkademo.processor.repository
 import com.typesafe.akkademo.common._
 import java.io.{ FileWriter, File }
 import scala.io.Source
+import scala.concurrent.forkjoin.ThreadLocalRandom
 
 trait UnstableResource {
   def save(idempotentId: Int, player: String, game: Int, amount: Int): Unit
   def findAll: Seq[Bet]
 }
 
 class ReallyUnstableResource extends UnstableResource {
-  val bets = scala.collection.mutable.Map[Int, Bet]()
-  val randomizer = new scala.util.Random
-  val store = new File("persistent_store")
+  private var bets = Map[Int, Bet]()
+  private def randomizer = ThreadLocalRandom.current()
+  private val store = new File("persistent_store")
 
   try {
     Source.fromFile(store).getLines().foreach(s ⇒ deserialize(s).foreach {
-      case (id, player, game, amount) ⇒ if (!bets.contains(id)) bets.put(id, Bet(player, game, amount))
+      case (id, player, game, amount) ⇒ if (!bets.contains(id)) bets += (id -> Bet(player, game, amount))
     })
   } catch {
     case _: Exception ⇒

processor/src/main/scala/com/typesafe/akkademo/processor/service/BettingProcessor.scala

@@ -11,7 +11,7 @@ class BettingProcessor extends Actor with ActorLogging {
   /**
    * TASKS :
    * Send remote registration message to service
-   * Create worker for dangerous task (using UnstableRepository actor)
+   * Create worker for dangerous task (using UnstableRepository actor with ReallyUnstableResource)
    * Supervise worker -> handle errors
    * Send confirmation message back to Betting service
    */

project/Build.scala

@@ -58,8 +58,6 @@ object AkkaDemoBuild extends Build {
   )
 
   lazy val defaultSettings = Defaults.defaultSettings ++ formatSettings ++ buildSettings ++ Seq(
-    resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/",
-
     // compile options
     scalacOptions ++= Seq("-encoding", "UTF-8", "-optimise", "-deprecation", "-unchecked"),
     javacOptions  ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
@@ -90,8 +88,8 @@ object Dependencies {
 object Dependency {
   object Version {
     val Akka      = "2.1.2"
-    val Scalatest = "1.6.1"
-    val JUnit     = "4.5"
+    val Scalatest = "1.9.1"
+    val JUnit     = "4.10"
   }
 
   // ---- Application dependencies ----
@@ -101,6 +99,6 @@ object Dependency {
 
   // ---- Test dependencies ----
 
-  val scalaTest   = "org.scalatest"       % "scalatest_2.9.0"          % Version.Scalatest  % "test"
+  val scalaTest   = "org.scalatest"       %% "scalatest"               % Version.Scalatest  % "test"
   val jUnit       = "junit"               % "junit"                    % Version.JUnit      % "test"
 }

service/src/main/resources/application.conf

@@ -1,7 +1,4 @@
 akka {
-  event-handlers = ["akka.event.Logging$DefaultLogger"]
-  loglevel = "INFO"
-
   actor {
     provider = "akka.remote.RemoteActorRefProvider"
   }
@@ -11,6 +8,5 @@ akka {
       hostname = "127.0.0.1"
       port = 2552
     }
-    log-remote-lifecycle-events = on
   }
 }

service/src/main/scala/com/typesafe/akkademo/service/BettingServiceApplication.scala

@@ -7,9 +7,7 @@ import akka.actor.{ Props, ActorSystem }
 import com.typesafe.config._
 
 object BettingServiceApplication extends App {
-  val config = ConfigFactory.load()
-
-  val system = ActorSystem("BettingServiceActorSystem", config)
+  val system = ActorSystem("BettingServiceActorSystem", ConfigFactory.load())
 
   val service = system.actorOf(Props[BettingService], "bettingService")
 }