[BE2] prepare for Scala 3 migration

be2-scala/build.sbt

@@ -126,8 +126,8 @@ assembly/ assemblyMergeStrategy := {
 
 // ------------------------ DEPENDENCIES ------------------------ 77
 
-val AkkaVersion = "2.6.8"
-val AkkaHttpVersion = "10.2.0"
+val AkkaVersion = "2.6.19"
+val AkkaHttpVersion = "10.2.9"
 
 libraryDependencies ++= Seq(
     "com.typesafe.akka" %% "akka-stream-typed" % AkkaVersion,   // Akka streams (Graph)
@@ -144,7 +144,7 @@ libraryDependencies += "org.iq80.leveldb" % "leveldb" % "0.12"
 libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.7.3"
 
 // Json Parser (https://github.com/spray/spray-json)
-libraryDependencies += "io.spray" %%  "spray-json" % "1.3.5"
+libraryDependencies += "io.spray" %%  "spray-json" % "1.3.6"
 
 // Cryptography
 libraryDependencies += "com.google.crypto.tink" % "tink" % "1.5.0"
@@ -158,6 +158,5 @@ libraryDependencies += "com.networknt" % "json-schema-validator" % "1.0.60"
 libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.0.0-RC3"
 
 // Scala file system handling
-libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
 
 conflictManager := ConflictManager.latestCompatible

be2-scala/project/plugins.sbt

@@ -4,3 +4,4 @@ addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.3.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
 addSbtPlugin("com.rallyhealth.sbt" % "sbt-git-versioning" % "1.6.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
+addSbtPlugin("ch.epfl.scala" % "sbt-scala3-migrate" % "0.5.1")

be2-scala/src/main/scala/ch/epfl/pop/Server.scala

@@ -7,7 +7,7 @@ import akka.actor.{ActorRef, Props}
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.{RequestContext, RouteResult}
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.util.Timeout
 import ch.epfl.pop.config.{RuntimeEnvironment, ServerConf}
 import ch.epfl.pop.pubsub.{MessageRegistry, PubSubMediator, PublishSubscribe}

be2-scala/src/main/scala/ch/epfl/pop/config/RuntimeEnvironment.scala

@@ -4,7 +4,6 @@ import java.io.File
 
 import com.typesafe.config.{Config, ConfigFactory}
 
-import scala.reflect.io.Directory
 import scala.sys.SystemProperties
 
 /** RuntimeConfiguration object provider This object provides application config for setting up akka http/actor environment
@@ -16,6 +15,14 @@ import scala.sys.SystemProperties
   */
 object RuntimeEnvironment {
 
+  def deleteRecursively(f: File): Boolean = {
+    f.listFiles match {
+      case null    =>
+      case entries => entries.foreach(deleteRecursively)
+    }
+    f.delete()
+  }
+
   private lazy val sp = new SystemProperties()
 
   private def getConfDir: String = {
@@ -24,9 +31,9 @@ object RuntimeEnvironment {
       // starting the program with fresh database
       println("Starting the server without any previous persistent state")
 
-      // removing database folder
-      val directory = new Directory(new File("database"))
-      if (directory.deleteRecursively()) {
+      // removing database directory
+      val database = new File("database/")
+      if (deleteRecursively(database)) {
         println("Removed old database folder")
       }
     }

be2-scala/src/main/scala/ch/epfl/pop/json/HighLevelProtocol.scala

@@ -83,13 +83,13 @@ object HighLevelProtocol extends DefaultJsonProtocol {
       Broadcast(params.channel, params.message)
     }
 
-    override def write(obj: Broadcast): JsValue = obj.toJson(ParamsFormat.write)
+    override def write(obj: Broadcast): JsValue = obj.toJson(ParamsFormat.write _)
   }
 
   implicit object CatchupFormat extends RootJsonFormat[Catchup] {
     override def read(json: JsValue): Catchup = Catchup(json.convertTo[Params].channel)
 
-    override def write(obj: Catchup): JsValue = obj.toJson(ParamsFormat.write)
+    override def write(obj: Catchup): JsValue = obj.toJson(ParamsFormat.write _)
   }
 
   implicit object PublishFormat extends RootJsonFormat[Publish] {
@@ -98,19 +98,19 @@ object HighLevelProtocol extends DefaultJsonProtocol {
       Publish(params.channel, params.message)
     }
 
-    override def write(obj: Publish): JsValue = obj.toJson(ParamsFormat.write)
+    override def write(obj: Publish): JsValue = obj.toJson(ParamsFormat.write _)
   }
 
   implicit object SubscribeFormat extends RootJsonFormat[Subscribe] {
     override def read(json: JsValue): Subscribe = Subscribe(json.convertTo[Params].channel)
 
-    override def write(obj: Subscribe): JsValue = obj.toJson(ParamsFormat.write)
+    override def write(obj: Subscribe): JsValue = obj.toJson(ParamsFormat.write _)
   }
 
   implicit object UnsubscribeFormat extends RootJsonFormat[Unsubscribe] {
     override def read(json: JsValue): Unsubscribe = Unsubscribe(json.convertTo[Params].channel)
 
-    override def write(obj: Unsubscribe): JsValue = obj.toJson(ParamsFormat.write)
+    override def write(obj: Unsubscribe): JsValue = obj.toJson(ParamsFormat.write _)
   }
 
   implicit val errorObjectFormat: JsonFormat[ErrorObject] = jsonFormat2(ErrorObject.apply)

be2-scala/src/main/scala/ch/epfl/pop/model/objects/Address.scala

@@ -14,7 +14,7 @@ final case class Address(base64Data: Base64Data) {
 object Address {
 
   private val bytesCount = 20
-  val sha2_256 = MessageDigest.getInstance("SHA-256")
+  val sha2_256: MessageDigest = MessageDigest.getInstance("SHA-256")
 
   /** Compute the address of the given public key
     *

be2-scala/src/main/scala/ch/epfl/pop/model/objects/ElectionChannel.scala

@@ -21,7 +21,7 @@ object ElectionChannel {
       * @return
       *   Future of a list of tuple containing the message and the data extracted
       */
-    def extractMessages[T: Manifest](dbActor: AskableActorRef = DbActor.getInstance): Future[List[(Message, T)]] = {
+    def extractMessages[T: reflect.ClassTag](dbActor: AskableActorRef = DbActor.getInstance): Future[List[(Message, T)]] = {
       for {
         DbActor.DbActorCatchupAck(messages) <- dbActor ? DbActor.Catchup(channel)
         result <- Future.traverse(messages.flatMap(message =>

be2-scala/src/main/scala/ch/epfl/pop/model/objects/Transaction.scala

@@ -21,7 +21,7 @@ final case class Transaction(
     outputs: List[Transaction.Output],
     lockTime: Int
 ) {
-  lazy val transactionId = {
+  lazy val transactionId: Hash = {
     val strings = collection.mutable.ListBuffer.empty[String]
     strings ++= inputs.foldRight(List.empty[String]) { (txin, acc) =>
       txin.script.pubkey.base64Data.toString ::

be2-scala/src/main/scala/ch/epfl/pop/pubsub/ClientActor.scala

@@ -2,7 +2,7 @@ package ch.epfl.pop.pubsub
 
 import akka.actor.{Actor, ActorLogging, ActorRef, Props}
 import akka.event.LoggingReceive
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import ch.epfl.pop.model.objects.Channel
 import ch.epfl.pop.pubsub.ClientActor._
 import ch.epfl.pop.pubsub.PubSubMediator._
@@ -92,7 +92,7 @@ object ClientActor {
   final case class ConnectWsHandle(wsClient: ActorRef) extends Event
 
   // unsubscribe from all channels
-  final case object DisconnectWsHandle extends Event
+  case object DisconnectWsHandle extends Event
 
   // subscribe to a particular channel
   final case class SubscribeTo(channel: Channel) extends Event

be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/Answerer.scala

@@ -52,7 +52,7 @@ object Answerer {
       .to(Sink.actorRef(
         clientActorRef,
         DisconnectWsHandle,
-        { t: Throwable =>
+        { (t: Throwable) =>
           println(t); DisconnectWsHandle
         }
       ))

be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/LaoHandler.scala

@@ -53,7 +53,7 @@ case object LaoHandler extends MessageHandler {
           _ <- dbActor ? DbActor.WriteLaoData(laoChannel, message, address)
           // after creating the lao, we need to send a lao#greet message to the frontend
           greet: GreetLao = GreetLao(data.id, params.get.sender, address.get, List.empty)
-          broadcastGreet: Base64Data = Base64Data.encode(GreetLaoFormat.write(greet).toString())
+          broadcastGreet: Base64Data = Base64Data.encode(GreetLaoFormat.write(greet).toString)
           _ <- dbBroadcast(rpcMessage, laoChannel, broadcastGreet, laoChannel)
         } yield ()
 

be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/ParamsHandler.scala

@@ -2,7 +2,7 @@ package ch.epfl.pop.pubsub.graph.handlers
 
 import akka.NotUsed
 import akka.actor.ActorRef
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.stream.FlowShape
 import akka.stream.scaladsl.{Flow, GraphDSL, Merge, Partition}
 import ch.epfl.pop.model.network.method.{Catchup, Subscribe, Unsubscribe}

be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/RollCallHandler.scala

@@ -172,7 +172,7 @@ class RollCallHandler(dbRef: => AskableActorRef) extends MessageHandler {
             ))
         }
       case error @ Right(_) => error
-      case _                => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, unknownAnswer, rpcRequest.id))
+      case null             => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, unknownAnswer, rpcRequest.id))
     }
   }
 

be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/SocialMediaHandler.scala

@@ -56,7 +56,7 @@ class SocialMediaHandler(dbRef: => AskableActorRef) extends MessageHandler {
           case None => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, "Server failed to extract LAO id for the broadcast", rpcMessage.id))
         }
       case error @ Right(_) => error
-      case _                => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, unknownAnswerDatabase, rpcMessage.id))
+      case null             => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, unknownAnswerDatabase, rpcMessage.id))
     }
   }
 
@@ -79,7 +79,7 @@ class SocialMediaHandler(dbRef: => AskableActorRef) extends MessageHandler {
           case None => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, "Server failed to extract LAO id for the broadcast", rpcMessage.id))
         }
       case error @ Right(_) => error
-      case _                => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, unknownAnswerDatabase, rpcMessage.id))
+      case null             => Right(PipelineError(ErrorCodes.SERVER_ERROR.id, unknownAnswerDatabase, rpcMessage.id))
     }
   }
 

be2-scala/src/test/scala/ch/epfl/pop/model/network/method/message/data/socialMedia/AddChirpSuite.scala

@@ -29,7 +29,7 @@ class AddChirpSuite extends FunSuite with Matchers {
 object AddChirpExample {
   final val TEXT: String = "text"
   final val PARENT_ID: Option[String] = None
-  final val TIMESTAMP = Timestamp(0)
+  final val TIMESTAMP: Timestamp = Timestamp(0)
 
   final val ADDCHIRP_MESSAGE: AddChirp = AddChirp(TEXT, PARENT_ID, TIMESTAMP)
 }

be2-scala/src/test/scala/ch/epfl/pop/model/objects/ChannelSuite.scala

@@ -64,7 +64,6 @@ class ChannelSuite extends FunSuite with Matchers {
     def channel = Channel("/root/full/pop")
 
     val expected = Hash(Base64Data("pop"))
-    an[IllegalArgumentException] shouldNot be(thrownBy(channel))
     channel.extractChildChannel should equal(expected)
   }
   test("Encoded LaoId extraction channel test") {

be2-scala/src/test/scala/ch/epfl/pop/model/objects/SignatureSuite.scala

@@ -20,9 +20,9 @@ class SignatureSuite extends FunSuite with Matchers with BeforeAndAfterAll {
     TestObj(ed_signer, kpair)
   }
   // Data used for testing signature
-  final val dataTest = Seq("PoP-scala", "HelloWorld", "Not true is false", "😀", "OMEGA \u03A9", "\u03A8", "Non empty can be fully non empty", "Not false is true")
+  final val dataTest: Seq[String] = Seq("PoP-scala", "HelloWorld", "Not true is false", "😀", "OMEGA \u03A9", "\u03A8", "Non empty can be fully non empty", "Not false is true")
 
-  final val verify_pk = PublicKey(Base64Data.encode(tester.keyPair.getPublicKey))
+  final val verify_pk: PublicKey = PublicKey(Base64Data.encode(tester.keyPair.getPublicKey))
 
   /*Provides correct signature for a msg*/
   private def getTrueSignatureTest(msg: String): Signature = {

be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/AnswerGeneratorSuite.scala

@@ -1,7 +1,7 @@
 package ch.epfl.pop.pubsub.graph
 
 import akka.actor.{Actor, ActorSystem, Props, Status}
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
 import ch.epfl.pop.model.network.method.message.Message

be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/handlers/ElectionHandlerTest.scala

@@ -1,7 +1,7 @@
 package ch.epfl.pop.pubsub.graph.handlers
 
 import akka.actor.{Actor, ActorSystem, Props, Status}
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
 import ch.epfl.pop.model.network.method.message.Message
@@ -35,12 +35,12 @@ class ElectionHandlerTest extends TestKit(ActorSystem("Election-DB-System")) wit
   private val keyPair: KeyPair = KeyPair()
   private val electionData: ElectionData = ElectionData(Hash(Base64Data.encode("election")), keyPair)
 
-  private final val sender: PublicKey = SetupElectionExamples.SENDER_SETUPELECTION
+  private final val SENDER: PublicKey = SetupElectionExamples.SENDER_SETUPELECTION
 
   private final val PUBLIC_KEY: PublicKey = PublicKey(Base64Data("jsNj23IHALvppqV1xQfP71_3IyAHzivxiCz236_zzQc="))
   private final val PRIVATE_KEY: PrivateKey = PrivateKey(Base64Data("qRfms3wzSLkxAeBz6UtwA-L1qP0h8D9XI1FSvY68t7Y="))
   private final val PK_OWNER: PublicKey = PublicKey(Base64Data.encode("wrongOwner"))
-  private final val laoDataRight: LaoData = LaoData(sender, List(sender), PRIVATE_KEY, PUBLIC_KEY, List.empty)
+  private final val laoDataRight: LaoData = LaoData(SENDER, List(SENDER), PRIVATE_KEY, PUBLIC_KEY, List.empty)
 
   private final val channelDataWithSetupAndOpenAndCastMessage: ChannelData = ChannelData(ObjectType.ELECTION, List(DATA_CAST_VOTE_MESSAGE, DATA_SET_UP_OPEN_BALLOT, DATA_OPEN_MESSAGE))
   private final val messages: List[Message] = List(MESSAGE_CAST_VOTE_ELECTION_WORKING, MESSAGE_SETUPELECTION_OPEN_BALLOT_WORKING, MESSAGE_OPEN_ELECTION_WORKING, MESSAGE_END_ELECTION_WORKING)

be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/handlers/RollCallHandlerTest.scala

@@ -1,7 +1,7 @@
 package ch.epfl.pop.pubsub.graph.handlers
 
 import akka.actor.{Actor, ActorSystem, Props, Status}
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
 import ch.epfl.pop.model.objects.DbActorNAckException

be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/handlers/SocialMediaHandlerSuite.scala

@@ -1,7 +1,7 @@
 package ch.epfl.pop.pubsub.graph.handlers
 
 import akka.actor.{Actor, ActorSystem, Props, Status}
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
 import ch.epfl.pop.model.objects.DbActorNAckException

be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/handlers/WitnessHandlerTest.scala

@@ -1,7 +1,7 @@
 package ch.epfl.pop.pubsub.graph.handlers
 
 import akka.actor.{Actor, ActorSystem, Props, Status}
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
 import ch.epfl.pop.model.network.method.message.Message

be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/CoinValidatorSuite.scala

@@ -7,6 +7,7 @@ import akka.actor.{Actor, ActorRef, ActorSystem, Props}
 import akka.pattern.AskableActorRef
 import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
+import ch.epfl.pop.config.RuntimeEnvironment.deleteRecursively
 import ch.epfl.pop.model.network.method.message.data.ObjectType
 import ch.epfl.pop.model.objects._
 import ch.epfl.pop.pubsub.graph.{GraphMessage, PipelineError}
@@ -17,8 +18,6 @@ import org.scalatest.funsuite.{AnyFunSuiteLike => FunSuiteLike}
 import org.scalatest.matchers.should.Matchers
 import util.examples.data.PostTransactionMessages._
 
-import scala.reflect.io.Directory
-
 class CoinValidatorSuite extends TestKit(ActorSystem("coinValidatorTestActorSystem"))
     with FunSuiteLike
     with ImplicitSender
@@ -34,8 +33,8 @@ class CoinValidatorSuite extends TestKit(ActorSystem("coinValidatorTestActorSyst
     TestKit.shutdownActorSystem(system)
 
     // Deletes the test database
-    val directory = new Directory(new File(DB_TEST_FOLDER))
-    directory.deleteRecursively()
+    val directory = new File(DB_TEST_FOLDER)
+    deleteRecursively(directory)
   }
 
   test("Posting a transaction works as intended") {

be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/ElectionValidatorSuite.scala

@@ -1,9 +1,10 @@
 package ch.epfl.pop.pubsub.graph.validators
 
 import akka.actor.{Actor, ActorRef, ActorSystem, Props}
-import akka.pattern.AskableActorRef
+import akka.pattern.{AskableActorRef, ask}
 import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
+import ch.epfl.pop.config.RuntimeEnvironment.deleteRecursively
 import ch.epfl.pop.model.network.method.message.Message
 import ch.epfl.pop.model.network.method.message.data.ObjectType
 import ch.epfl.pop.model.objects._
@@ -22,7 +23,6 @@ import util.examples.JsonRpcRequestExample._
 
 import java.io.File
 import java.util.concurrent.TimeUnit
-import scala.reflect.io.Directory
 
 class ElectionValidatorSuite extends TestKit(ActorSystem("electionValidatorTestActorSystem"))
     with FunSuiteLike
@@ -42,16 +42,16 @@ class ElectionValidatorSuite extends TestKit(ActorSystem("electionValidatorTestA
     TestKit.shutdownActorSystem(system)
 
     // Deletes the test database
-    val directory = new Directory(new File(DB_TEST_FOLDER))
-    directory.deleteRecursively()
+    val directory = new File(DB_TEST_FOLDER)
+    deleteRecursively(directory)
   }
 
-  private final val sender: PublicKey = SetupElectionExamples.SENDER_SETUPELECTION
+  private final val SENDER: PublicKey = SetupElectionExamples.SENDER_SETUPELECTION
 
   private final val PUBLIC_KEY: PublicKey = PublicKey(Base64Data("jsNj23IHALvppqV1xQfP71_3IyAHzivxiCz236_zzQc="))
   private final val PRIVATE_KEY: PrivateKey = PrivateKey(Base64Data("qRfms3wzSLkxAeBz6UtwA-L1qP0h8D9XI1FSvY68t7Y="))
   private final val PK_WRONG: PublicKey = PublicKey(Base64Data.encode("wrongOwner"))
-  private final val laoDataRight: LaoData = LaoData(sender, List(sender), PRIVATE_KEY, PUBLIC_KEY, List.empty)
+  private final val laoDataRight: LaoData = LaoData(SENDER, List(SENDER), PRIVATE_KEY, PUBLIC_KEY, List.empty)
   private final val laoDataWrong: LaoData = LaoData(PK_WRONG, List(PK_WRONG), PRIVATE_KEY, PUBLIC_KEY, List.empty)
   private final val channelDataRightSetup: ChannelData = ChannelData(ObjectType.LAO, List.empty)
   private final val channelDataWrongSetup: ChannelData = ChannelData(ObjectType.ELECTION, List.empty)