Merge pull request #234 from 100km/style

style(implicits): add explicit types

loader/src/main/scala/Loader.scala

@@ -14,7 +14,7 @@ import org.apache.commons.dbutils.handlers.MapListHandler
 import play.api.libs.json._
 import scopt.OptionParser
 
-import scala.concurrent.Await
+import scala.concurrent.{Await, ExecutionContext}
 import scala.concurrent.duration._
 import scala.jdk.CollectionConverters._
 import scala.language.{implicitConversions, postfixOps, reflectiveCalls}
@@ -50,8 +50,8 @@ object Loader extends App {
     def get(i: Int) = cal.get(i)
   }
 
-  implicit val system = ActorSystem()
-  implicit val dispatcher = system.dispatcher
+  implicit val system: ActorSystem = ActorSystem()
+  implicit val dispatcher: ExecutionContext = system.dispatcher
   val config = steenwerck.steenwerckRootConfig.as[Config]("loader").withFallback(ConfigFactory.load())
   val db = steenwerck.localCouch(config).db(steenwerck.localDbName)
 

replicate/src/main/scala/replicate/alerts/PingAlert.scala

@@ -19,14 +19,14 @@ import replicate.utils.Types.SiteId
 import replicate.utils._
 import scalaz.@@
 
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.duration._
 
 object PingAlert {
 
   private lazy val checkpoints = Global.infos.get.checkpoints
 
-  private implicit val dispatcher = Global.system.dispatcher
+  private implicit val dispatcher: ExecutionContext = Global.system.dispatcher
 
   private case object RecheckTimer
 

replicate/src/main/scala/replicate/messaging/sms/NexmoSMS.scala

@@ -21,15 +21,15 @@ import replicate.utils.Types.PhoneNumber
 import replicate.utils.{FormatUtils, Glyphs, Networks}
 import scalaz.@@
 
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success}
 
 class NexmoSMS(context: ActorContext[SMSProtocol], senderId: String, apiKey: String, apiSecret: String) extends AbstractBehavior[SMSProtocol](context) with BalanceTracker {
 
   import NexmoSMS.{Message => _, _}
 
-  private[this] implicit val executionContext = context.executionContext
-  private[this] implicit val materializer = Materializer(context)
+  private[this] implicit val executionContext: ExecutionContext = context.executionContext
+  private[this] implicit val materializer: Materializer = Materializer(context)
   val messageTitle = "Nexmo"
   val log = context.log
 

replicate/src/main/scala/replicate/messaging/sms/OctopushSMS.scala

@@ -11,13 +11,14 @@ import replicate.messaging.Message.{Severity, TextMessage}
 import replicate.utils.Types.PhoneNumber
 import replicate.utils.{FormatUtils, Glyphs}
 
+import scala.concurrent.ExecutionContext
 import scala.util.{Failure, Success}
 
 class OctopushSMS(context: ActorContext[SMSProtocol], userLogin: String, apiKey: String, sender: Option[String]) extends AbstractBehavior[SMSProtocol](context) with BalanceTracker {
 
   import OctopushSMS._
 
-  private[this] implicit val executionContext = context.executionContext
+  private[this] implicit val executionContext: ExecutionContext = context.executionContext
   private[this] val octopush = new Octopush(userLogin, apiKey)(context.system.toClassic)
   val messageTitle = "Octopush"
   val log = context.log

replicate/src/main/scala/replicate/state/RankingState.scala

@@ -16,7 +16,7 @@ object RankingState {
 
   type Ranks = Vector[Rank]
 
-  private implicit val rankOrdering = new Ordering[Rank] {
+  private implicit val rankOrdering: Ordering[Rank] = new Ordering[Rank] {
     override def compare(x: Rank, y: Rank) = (x.bestPoint.lap, y.bestPoint.lap) match {
       // Bigger lap is best
       case (xl, yl) if Lap.unwrap(xl) < Lap.unwrap(yl) => 1

replicate/src/main/scala/replicate/utils/Agent.scala

@@ -11,7 +11,7 @@ import scala.concurrent.duration._
 
 case class Agent[T](initialValue: T) {
   private[this] val system = Global.system
-  private[this] implicit val scheduler = system.toTyped.scheduler
+  private[this] implicit val scheduler: Scheduler = system.toTyped.scheduler
   private[this] implicit val timeout: Timeout = 1.minute // This is virtually infinite
 
   private[this] sealed trait Command
@@ -37,4 +37,4 @@ case class Agent[T](initialValue: T) {
   def future(): Future[T] = actor ? Get
   def alter(f: T => T): Future[T] = actor ? (a => Alter(f, a))
   def alter(v: T): Future[T] = alter(_ => v)
-}
+}

replicate/src/main/scala/replicate/utils/Global.scala

@@ -9,14 +9,15 @@ import net.ceedubs.ficus.Ficus._
 import replicate.scrutineer.Analyzer.ContestantAnalysis
 
 import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.ExecutionContext
 
 object Global {
   private val config: Config = steenwerck.steenwerckRootConfig.withFallback(ConfigFactory.load())
 
   private[replicate] val replicateConfig = config.getConfig("replicate").withFallback(config)
-  implicit val system = ActorSystem("replicator", replicateConfig)
-  implicit val dispatcher = system.dispatcher
-  implicit val flowMaterializer = Materializer(system)
+  implicit val system: ActorSystem = ActorSystem("replicator", replicateConfig)
+  implicit val dispatcher: ExecutionContext = system.dispatcher
+  implicit val flowMaterializer: Materializer = Materializer(system)
   val log = Logging(system, "replicate")
 
   val replicateRelaunchInterval: FiniteDuration = replicateConfig.as[FiniteDuration]("replication-relaunch-interval")

replicate/src/test/scala/replicate/CheckpointsStateSpec.scala

@@ -8,15 +8,15 @@ import replicate.state.CheckpointsState.Point
 import replicate.utils.Global
 import replicate.utils.Types._
 
-import scala.concurrent.Await
+import scala.concurrent.{Await, ExecutionContext}
 import scala.concurrent.duration._
 
 class CheckpointsStateSpec extends Specification {
 
   sequential
 
   trait CleanRanking extends Scope with BeforeAfter {
-    implicit val dispatcher = Global.dispatcher
+    implicit val dispatcher: ExecutionContext = Global.dispatcher
     def before = Await.ready(CheckpointsState.reset(), 1.second)
     def after = Await.ready(CheckpointsState.reset(), 1.second)
   }

replicate/src/test/scala/replicate/RaceUtils.scala

@@ -6,12 +6,12 @@ import replicate.state.CheckpointsState
 import replicate.utils.Types.RaceId
 import replicate.utils.{Global, Infos}
 
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 import scala.io.Source
 
 object RaceUtils {
 
-  implicit val dispatcher = Global.dispatcher
+  implicit val dispatcher: ExecutionContext = Global.dispatcher
 
   def loadRaceData: Iterator[CheckpointData] =
     Source.fromInputStream(getClass.getResourceAsStream("/dummy-timings.txt"), "utf-8").getLines().map(Json.parse(_).as[CheckpointData])

sms/src/main/scala/SMS.scala

@@ -27,7 +27,7 @@ object SMS extends App {
   }
   val options = parser.parse(args, Config()) getOrElse { sys.exit(1) }
 
-  implicit val actorSystem = ActorSystem()
+  implicit val actorSystem: ActorSystem = ActorSystem()
   val octopush = new Octopush(options.userLogin, options.apiKey)
   val sms = Octopush.SMS(smsRecipients = List(options.recipient), smsText = s"${options.message} - STOP au XXXXX", smsType = PremiumFrance, smsSender = Some(options.sender))
   println(s"""Sending "${options.message}" to ${options.recipient}""")

stats/src/main/scala/Stats.scala

@@ -5,6 +5,7 @@ import net.rfc1149.canape.implicits._
 import play.api.libs.json._
 
 import scala.concurrent.duration._
+import scala.concurrent.ExecutionContext
 import scala.util.Random._
 
 object Stats extends App {
@@ -27,8 +28,8 @@ object Stats extends App {
 
   private val options = parser.parse(args, Config()) getOrElse { sys.exit(1) }
 
-  private implicit val system = ActorSystem()
-  private implicit val dispatcher = system.dispatcher
+  private implicit val system: akka.actor.ActorSystem = ActorSystem()
+  private implicit val dispatcher: ExecutionContext = system.dispatcher
 
   private implicit val timeout: Duration = (5, SECONDS)
 

wipe/src/main/scala/Wipe.scala

@@ -5,6 +5,7 @@ import net.rfc1149.canape._
 import play.api.libs.json._
 
 import scala.concurrent.duration._
+import scala.concurrent.ExecutionContext
 import scopt.OptionParser
 
 object Wipe extends App {
@@ -23,8 +24,8 @@ object Wipe extends App {
 
   private val options = parser.parse(args, Options()) getOrElse { sys.exit(1) }
 
-  private implicit val system = ActorSystem()
-  private implicit val dispatcher = system.dispatcher
+  private implicit val system: ActorSystem = ActorSystem()
+  private implicit val dispatcher: ExecutionContext = system.dispatcher
 
   val hubCouch = steenwerck.masterCouch(auth = Some(options.login, options.password))