Bring scalafix to project

Author: dacr

.scalafix.conf

@@ -0,0 +1,12 @@
+rules = [
+  DisableSyntax,
+  RedundantSyntax,
+  //ExplicitResultTypes  // not yet compatible with Scala3
+]
+DisableSyntax.noVars = true
+DisableSyntax.noThrows = true
+DisableSyntax.noNulls = true
+DisableSyntax.noReturns = true
+DisableSyntax.noWhileLoops = true
+DisableSyntax.noAsInstanceOf = true
+DisableSyntax.noIsInstanceOf = true

project/plugins.sbt

@@ -6,3 +6,5 @@ addSbtPlugin("com.timushev.sbt"  % "sbt-updates"         % "0.6.3")
 addSbtPlugin("com.github.sbt"    % "sbt-native-packager" % "1.9.9")
 //addSbtPlugin("com.typesafe.play" % "sbt-twirl"           % "1.6.0-M7")
 addSbtPlugin("com.typesafe.play" % "sbt-twirl"           % "1.6.0-RC1")
+
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")

src/main/scala/fr/janalyse/cem/Execute.scala

@@ -28,7 +28,7 @@ object Execute {
 
   def makeCommandProcess(command: List[String], workingDir: Path) = {
     val results = for {
-      executable       <- ZIO.from(command.headOption).orElseFail(RunFailure(s"Example command is invalid"))
+      executable       <- ZIO.from(command.headOption).orElseFail(RunFailure("Example command is invalid"))
       arguments         = command.drop(1)
       process          <- ZIO.acquireRelease(
                             Command(executable, arguments*)
@@ -48,9 +48,9 @@ object Execute {
 
   def makeRunCommandProcess(example: CodeExample) = {
     for {
-      exampleFilePath  <- ZIO.fromOption(example.filepath).orElseFail(RunFailure(s"Example has no path for its content"))
-      workingDir       <- ZIO.fromOption(exampleFilePath.parent).orElseFail(RunFailure(s"Example file path content has no parent directory"))
-      absoluteFileName <- exampleFilePath.toAbsolutePath.orElseFail(RunFailure(s"Example absolute file path error"))
+      exampleFilePath  <- ZIO.fromOption(example.filepath).orElseFail(RunFailure("Example has no path for its content"))
+      workingDir       <- ZIO.fromOption(exampleFilePath.parent).orElseFail(RunFailure("Example file path content has no parent directory"))
+      absoluteFileName <- exampleFilePath.toAbsolutePath.orElseFail(RunFailure("Example absolute file path error"))
       command          <- ZIO
                             .from(
                               example.runWith
@@ -65,8 +65,8 @@ object Execute {
 
   def makeTestCommandProcess(example: CodeExample) = {
     for {
-      exampleFilePath <- ZIO.fromOption(example.filepath).orElseFail(RunFailure(s"Example has no path for its content"))
-      workingDir      <- ZIO.fromOption(exampleFilePath.parent).orElseFail(RunFailure(s"Example file path content has no parent directory"))
+      exampleFilePath <- ZIO.fromOption(example.filepath).orElseFail(RunFailure("Example has no path for its content"))
+      workingDir      <- ZIO.fromOption(exampleFilePath.parent).orElseFail(RunFailure("Example file path content has no parent directory"))
       command         <- ZIO.succeed(example.testWith.getOrElse(s"sleep ${timeoutDuration.getSeconds()}").trim.split("\\s+").toList)
       results         <- makeCommandProcess(command, workingDir) @@ annotated("example-test-command" -> command.mkString(" "))
     } yield results
@@ -79,7 +79,7 @@ object Execute {
         runEffect       = makeRunCommandProcess(example).disconnect
                             .timeout(timeoutDuration)
         testEffect      = makeTestCommandProcess(example)
-                            .filterOrFail(result => result.exitCode == 0)(RunFailure(s"test code is failing"))
+                            .filterOrFail(result => result.exitCode == 0)(RunFailure("test code is failing"))
                             .retry(Schedule.exponential(100.millis, 2).jittered && Schedule.recurs(5))
                             .delay(testStartDelay)
                             .disconnect
@@ -92,7 +92,7 @@ object Execute {
         success         = exitCodeOption.exists(_ == 0) || (example.shouldFail && exitCodeOption.exists(_ != 0))
         runState        = if timeout then "timeout" else if success then "success" else "failure"
         _              <- if (results.isLeft) ZIO.logError(s"""Couldn't execute either run or test part\n${results.swap.toOption.getOrElse("")}""") else ZIO.succeed(())
-        _              <- if (!success) ZIO.logWarning(s"example run $runState\nFailed cause:\n$output") else ZIO.log(s"example run success")
+        _              <- if (!success) ZIO.logWarning(s"example run $runState\nFailed cause:\n$output") else ZIO.log("example run success")
       } yield RunStatus(
         example = example,
         exitCodeOption = exitCodeOption,

src/main/scala/fr/janalyse/cem/tools/Hashes.scala

@@ -16,12 +16,13 @@
 package fr.janalyse.cem.tools
 
 object Hashes {
+  // TODO Migrate to an effect
   def sha1(that: String): String = {
     import java.math.BigInteger
     import java.security.MessageDigest
     // Inspired from https://alvinalexander.com/source-code/scala-method-create-md5-hash-of-string
-    val content      = if (that == null) "" else that     // TODO - probably discutable, migrate to an effect
-    val md           = MessageDigest.getInstance("SHA-1") // TODO - can fail => potential border side effect !
+    val content      = that
+    val md           = MessageDigest.getInstance("SHA-1")
     val digest       = md.digest(content.getBytes)
     val bigInt       = new BigInteger(1, digest)
     val hashedString = bigInt.toString(16)

src/test/scala/fr/janalyse/cem/tools/HashesSpec.scala

@@ -35,8 +35,7 @@ class HashesSpec extends ZIOSpecDefault {
       },
       // ----------------------------------------------------------------------------------------------
       test("sha1 should not fail") {
-        assertTrue(sha1("") == "da39a3ee5e6b4b0d3255bfef95601890afd80709") &&
-        assertTrue(sha1(null) == "da39a3ee5e6b4b0d3255bfef95601890afd80709")
+        assertTrue(sha1("") == "da39a3ee5e6b4b0d3255bfef95601890afd80709")
       },
       // ----------------------------------------------------------------------------------------------
       test("sha1 hashes are never empty") {