added an option to specify a j2eo version to download

Author: nikololiahim

src/main/scala/org/polystat/HoconConfig.scala

@@ -50,6 +50,8 @@ case class HoconConfig(path: Path):
     case (dirs, files, console) =>
       Output(dirs = dirs, files = files, console = console)
   }
+
+  private val j2eoVersion = hocon(keys.j2eoVersion).as[String].option
   private val outputFormats =
     hocon(keys.outputFormats).as[List[OutputFormat]].default(List.empty)
   private val inex: ConfigValue[IO, Option[IncludeExclude]] =
@@ -60,22 +62,32 @@ case class HoconConfig(path: Path):
       .option
 
   val config: ConfigValue[IO, PolystatUsage.Analyze] =
-    (j2eo, inex, input, tmp, outputs, outputFormats, lang).parMapN {
-      case (j2eo, inex, input, tmp, outputs, outputFormats, lang) =>
-        PolystatUsage.Analyze(
-          language = lang match
-            case Java(_) => Java(j2eo)
-            case other   => other
-          ,
-          config = AnalyzerConfig(
-            inex = inex,
-            input = input,
-            tmp = tmp,
-            outputFormats = outputFormats,
-            output = outputs,
-          ),
-        )
-    }
+    (j2eo, j2eoVersion, inex, input, tmp, outputs, outputFormats, lang)
+      .parMapN {
+        case (
+              j2eo,
+              j2eoVersion,
+              inex,
+              input,
+              tmp,
+              outputs,
+              outputFormats,
+              lang,
+            ) =>
+          PolystatUsage.Analyze(
+            language = lang match
+              case Java(_, _) => Java(j2eo, j2eoVersion)
+              case other      => other
+            ,
+            config = AnalyzerConfig(
+              inex = inex,
+              input = input,
+              tmp = tmp,
+              outputFormats = outputFormats,
+              output = outputs,
+            ),
+          )
+      }
 end HoconConfig
 
 object HoconConfig:
@@ -94,13 +106,16 @@ object HoconConfig:
     val outputsConsole = s"$outputs.console"
     val outputsDirs = s"$outputs.dirs"
     val outputsFiles = s"$outputs.files"
+    val j2eoVersion = "j2eoVersion"
     val explanation = s"""
                        |$toplevel.$inputLanguage
                        |    The type of input files which will be analyzed. This key must be present.
                        |    Possible values:
                        |        "java" - only ".java" files will be analyzed.
                        |        "eo" - only ".eo" files will be analyzed.
                        |        "python" - only ".py" files will be analyzed.
+                       |$toplevel.$j2eoVersion
+                       |    Specifies the version of J2EO to download.
                        |$toplevel.$j2eo
                        |    Specifies the path to the J2EO executable.
                        |    If not specified, defaults to looking for j2eo.jar in the current working directory.
@@ -142,7 +157,7 @@ object HoconConfig:
   extension (s: String)
     def asSupportedLang: Option[SupportedLanguage] = s match
       case "eo"     => Some(EO)
-      case "java"   => Some(Java(None))
+      case "java"   => Some(Java(None, None))
       case "python" => Some(Python)
       case _        => None
 

src/main/scala/org/polystat/Java.scala

@@ -19,18 +19,19 @@ import InputUtils.*
 object Java:
 
   private val DEFAULT_J2EO_PATH = Path("j2eo.jar")
-  private val J2EO_URL =
-    "https://search.maven.org/remotecontent?filepath=org/polystat/j2eo/0.5.0/j2eo-0.5.0.jar"
+  val DEFAULT_J2EO_VERSION = "0.5.0"
+  private def j2eoUrl(j2eoVesion: String) =
+    s"https://search.maven.org/remotecontent?filepath=org/polystat/j2eo/$j2eoVesion/j2eo-$j2eoVesion.jar"
 
-  private def defaultJ2EO: IO[Path] =
+  private def defaultJ2EO(j2eoVesion: String): IO[Path] =
     Files[IO]
       .exists(DEFAULT_J2EO_PATH)
       .ifM(
         ifTrue = IO.pure(DEFAULT_J2EO_PATH),
-        ifFalse = downloadJ2EO.as(DEFAULT_J2EO_PATH),
+        ifFalse = downloadJ2EO(j2eoVesion),
       )
 
-  private def downloadJ2EO: IO[Unit] =
+  private def downloadJ2EO(j2eoVesion: String): IO[Path] =
     EmberClientBuilder
       .default[IO]
       .build
@@ -40,7 +41,7 @@ object Java:
           .run(
             Request[IO](
               GET,
-              uri = Uri.unsafeFromString(J2EO_URL),
+              uri = Uri.unsafeFromString(j2eoUrl(j2eoVesion)),
             )
           )
           .use(resp =>
@@ -53,17 +54,21 @@ object Java:
                 .drain
           )
       }
+      .as(DEFAULT_J2EO_PATH)
   end downloadJ2EO
 
   private def runJ2EO(
+      j2eoVersion: Option[String],
       j2eo: Option[Path],
       inputDir: Path,
       outputDir: Path,
   ): IO[Unit] =
     val command =
       s"java -jar ${j2eo.getOrElse(DEFAULT_J2EO_PATH)} -o $outputDir $inputDir"
     for
-      j2eo <- j2eo.map(IO.pure).getOrElse(defaultJ2EO)
+      j2eo <- j2eo
+        .map(IO.pure)
+        .getOrElse(defaultJ2EO(j2eoVersion.getOrElse(DEFAULT_J2EO_VERSION)))
       _ <- Files[IO]
         .exists(j2eo)
         .ifM(
@@ -77,7 +82,11 @@ object Java:
     end for
   end runJ2EO
 
-  def analyze(j2eo: Option[Path], cfg: ProcessedConfig): IO[Unit] =
+  def analyze(
+      j2eoVersion: Option[String],
+      j2eo: Option[Path],
+      cfg: ProcessedConfig,
+  ): IO[Unit] =
     for
       tmp <- cfg.tempDir
       _ <- cfg.input match // writing EO files to tempDir
@@ -88,12 +97,17 @@ object Java:
               path / "stdin.eo"
             )
             _ <- writeOutputTo(stdinTmp)(code)
-            _ <- runJ2EO(j2eo, inputDir = stdinTmp, outputDir = tmp)
+            _ <- runJ2EO(
+              j2eoVersion,
+              j2eo,
+              inputDir = stdinTmp,
+              outputDir = tmp,
+            )
           yield ()
         case Input.FromFile(path) =>
-          runJ2EO(j2eo, inputDir = path, outputDir = tmp)
+          runJ2EO(j2eoVersion, j2eo, inputDir = path, outputDir = tmp)
         case Input.FromDirectory(path) =>
-          runJ2EO(j2eo, inputDir = path, outputDir = tmp)
+          runJ2EO(j2eoVersion, j2eo, inputDir = path, outputDir = tmp)
       _ <- EO.analyze(
         cfg.copy(input = Input.FromDirectory(tmp))
       )

src/main/scala/org/polystat/Main.scala

@@ -82,8 +82,8 @@ object Main extends IOApp:
         val analysisResults: IO[Unit] =
           lang match
             case SupportedLanguage.EO => EO.analyze(processedConfig)
-            case SupportedLanguage.Java(j2eo) =>
-              Java.analyze(j2eo, processedConfig)
+            case SupportedLanguage.Java(j2eo, j2eoVersion) =>
+              Java.analyze(j2eoVersion, j2eo, processedConfig)
             case SupportedLanguage.Python => Python.analyze(processedConfig)
         analysisResults
   end execute

src/main/scala/org/polystat/PolystatConfig.scala

@@ -28,7 +28,7 @@ object PolystatConfig:
 
   enum SupportedLanguage:
     case EO, Python
-    case Java(j2eo: Option[Path])
+    case Java(j2eo: Option[Path], j2eoVersion: Option[String])
   end SupportedLanguage
 
   enum PolystatUsage:

src/main/scala/org/polystat/PolystatOpts.scala

@@ -45,13 +45,20 @@ object PolystatOpts:
     name = "java",
     help = "Analyze Java files",
   ) {
-    (analyzerConfig, j2eo).mapN((conf, j2eo) =>
+    (analyzerConfig, j2eo, j2eoVersion).mapN((conf, j2eo, j2eoVesion) =>
       conf.map(conf =>
-        PolystatUsage.Analyze(SupportedLanguage.Java(j2eo), conf)
+        PolystatUsage.Analyze(SupportedLanguage.Java(j2eo, j2eoVesion), conf)
       )
     )
   }
 
+  def j2eoVersion: Opts[Option[String]] = Opts
+    .option[String](
+      long = "j2eo-version",
+      help = "Version of j2eo to download.",
+    )
+    .orNone
+
   def j2eo: Opts[Option[Path]] = Opts
     .option[JPath](
       long = "j2eo",