[BE2] drop scala-reflect dependency

dedis · Jun 13, 2022 · 5136902 · 5136902
1 parent bc9a138
commit 5136902
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 26 deletions.
diff --git a/be2-scala/build.sbt b/be2-scala/build.sbt
@@ -134,6 +134,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
diff --git a/be2-scala/src/main/scala/ch/epfl/pop/config/RuntimeEnvironment.scala b/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
@@ -17,6 +16,14 @@ import scala.sys.SystemProperties
  */
 object RuntimeEnvironment {
 
+  def deleteRecursively(f: File): Boolean = {
+    if (f.isDirectory) f.listFiles match {
+      case null =>
+      case xs   => xs foreach deleteRecursively
+    }
+    f.delete()
+  }
+
   private lazy val sp = new SystemProperties()
 
   private def getConfDir: String = {
@@ -25,9 +32,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")
       }
     }

diff --git a/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/CoinValidatorSuite.scala b/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
 import org.scalatest.matchers._
 import util.examples.data.PostTransactionMessages._
 
-import scala.reflect.io.Directory
-
 class CoinValidatorSuite extends TestKit(ActorSystem("coinValidatorTestActorSystem"))
   with AnyFunSuiteLike
   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") {

diff --git a/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/ElectionValidatorSuite.scala b/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/ElectionValidatorSuite.scala
@@ -4,6 +4,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.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 AnyFunSuiteLike
@@ -42,8 +42,8 @@ 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

diff --git a/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/LaoValidatorSuite.scala b/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/LaoValidatorSuite.scala
@@ -1,6 +1,7 @@
 package ch.epfl.pop.pubsub.graph.validators
 
 import akka.actor.{Actor, ActorRef, ActorSystem, Props}
+import ch.epfl.pop.config.RuntimeEnvironment.deleteRecursively
 import ch.epfl.pop.model.network.method.message.data.ObjectType
 import ch.epfl.pop.model.objects.{Base64Data, ChannelData, LaoData, PrivateKey, PublicKey}
 import ch.epfl.pop.storage.{DbActor, InMemoryStorage}
@@ -19,8 +20,6 @@ import org.scalatest.funsuite.AnyFunSuiteLike
 import org.scalatest.matchers._
 import util.examples.JsonRpcRequestExample._
 
-import scala.reflect.io.Directory
-
 class LaoValidatorSuite extends TestKit(ActorSystem("laoValidatorTestActorSystem"))
   with AnyFunSuiteLike
   with ImplicitSender
@@ -38,8 +37,8 @@ class LaoValidatorSuite extends TestKit(ActorSystem("laoValidatorTestActorSystem
     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("LAO creation works as intended") {

diff --git a/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/RollCallValidatorSuite.scala b/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/RollCallValidatorSuite.scala
@@ -4,6 +4,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.{ActionType, ObjectType}
 import ch.epfl.pop.model.objects._
 import ch.epfl.pop.pubsub.graph.{GraphMessage, PipelineError}
@@ -22,7 +23,6 @@ import util.examples.RollCall.CreateRollCallExamples.{SENDER, _}
 
 import java.io.File
 import java.util.concurrent.TimeUnit
-import scala.reflect.io.Directory
 
 class RollCallValidatorSuite extends TestKit(ActorSystem("rollcallValidatorTestActorSystem"))
   with AnyFunSuiteLike
@@ -42,8 +42,8 @@ class RollCallValidatorSuite extends TestKit(ActorSystem("rollcallValidatorTestA
     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 = SENDER

diff --git a/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/SocialMediaValidatorSuite.scala b/be2-scala/src/test/scala/ch/epfl/pop/pubsub/graph/validators/SocialMediaValidatorSuite.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}
@@ -18,8 +19,6 @@ import org.scalatest.matchers._
 import util.examples.JsonRpcRequestExample._
 import util.examples.socialMedia.AddChirpExamples
 
-import scala.reflect.io.Directory
-
 class SocialMediaValidatorSuite extends TestKit(ActorSystem("socialMediaValidatorTestActorSystem"))
   with AnyFunSuiteLike
   with ImplicitSender
@@ -38,8 +37,8 @@ class SocialMediaValidatorSuite extends TestKit(ActorSystem("socialMediaValidato
     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 PUBLIC_KEY: PublicKey = PublicKey(Base64Data("jsNj23IHALvppqV1xQfP71_3IyAHzivxiCz236_zzQc="))

diff --git a/be2-scala/src/test/scala/ch/epfl/pop/storage/DiskStorageSuite.scala b/be2-scala/src/test/scala/ch/epfl/pop/storage/DiskStorageSuite.scala
@@ -2,13 +2,13 @@ package ch.epfl.pop.storage
 
 import java.io.File
 
+import ch.epfl.pop.config.RuntimeEnvironment.deleteRecursively
 import ch.epfl.pop.model.objects.DbActorNAckException
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers._
 
 import scala.collection.concurrent.TrieMap
-import scala.reflect.io.Directory
 
 class DiskStorageSuite extends AnyFunSuite with should.Matchers with BeforeAndAfterAll {
   // concurrent map storing all instances of DiskStorage
@@ -28,8 +28,8 @@ class DiskStorageSuite extends AnyFunSuite with should.Matchers with BeforeAndAf
     for ((storeName, store) <- stores) {
       store.close()
 
-      val directory = new Directory(new File(storeName))
-      directory.deleteRecursively()
+      val directory = new File(storeName)
+      deleteRecursively(directory)
     }
   }