handle updated jar files properly

Author: Heliozoa

plugins/java/src/lib.rs

@@ -37,7 +37,13 @@ fn get_junit_runner_path() -> Result<PathBuf, JavaError> {
     let jar_dir = tmc_dir()?;
 
     let junit_path = jar_dir.join("tmc-junit-runner.jar");
-    if !junit_path.exists() {
+    if let Ok(bytes) = file_util::read_file(&junit_path) {
+        if TMC_CHECKSTYLE_RUNNER_BYTES != bytes.as_slice() {
+            log::debug!("updating tmc junit runner jar");
+            file_util::write_to_file(&mut TMC_JUNIT_RUNNER_BYTES, &junit_path)?;
+        }
+    } else {
+        log::debug!("failed to read tmc junit runner jar, writing");
         file_util::write_to_file(&mut TMC_JUNIT_RUNNER_BYTES, &junit_path)?;
     }
     Ok(junit_path)
@@ -48,7 +54,13 @@ fn get_checkstyle_runner_path() -> Result<PathBuf, JavaError> {
     let jar_dir = tmc_dir()?;
 
     let checkstyle_path = jar_dir.join("tmc-checkstyle-runner.jar");
-    if !checkstyle_path.exists() {
+    if let Ok(bytes) = file_util::read_file(&checkstyle_path) {
+        if TMC_CHECKSTYLE_RUNNER_BYTES != bytes.as_slice() {
+            log::debug!("updating checkstyle runner jar");
+            file_util::write_to_file(&mut TMC_CHECKSTYLE_RUNNER_BYTES, &checkstyle_path)?;
+        }
+    } else {
+        log::debug!("failed to read checkstyle runner jar, writing");
         file_util::write_to_file(&mut TMC_CHECKSTYLE_RUNNER_BYTES, &checkstyle_path)?;
     }
     Ok(checkstyle_path)
@@ -60,7 +72,14 @@ fn initialize_jassets() -> Result<PathBuf, JavaError> {
     let jassets_dir = jar_dir.join("jassets");
 
     let j4rs_path = jassets_dir.join("j4rs.jar");
-    if !j4rs_path.exists() {
+
+    if let Ok(bytes) = file_util::read_file(&j4rs_path) {
+        if J4RS_BYTES != bytes.as_slice() {
+            log::debug!("updating j4rs jar");
+            file_util::write_to_file(&mut J4RS_BYTES, &j4rs_path)?;
+        }
+    } else {
+        log::debug!("failed to read j4rs jar, writing");
         file_util::write_to_file(&mut J4RS_BYTES, &j4rs_path)?;
     }
     Ok(j4rs_path)

plugins/java/src/plugin.rs

@@ -226,10 +226,10 @@ pub(crate) trait JavaPlugin: LanguagePlugin {
         locale: &Language,
         path: &Path,
     ) -> Result<ValidationResult, JavaError> {
-        let file = self.jvm().create_instance(
-            "java.io.File",
-            &[InvocationArg::try_from(&*path.to_string_lossy())?],
-        )?;
+        let path = path.to_string_lossy();
+        let file = self
+            .jvm()
+            .create_instance("java.io.File", &[InvocationArg::try_from(path.as_ref())?])?;
         let locale_code = locale.to_639_1().unwrap_or_else(|| locale.to_639_3()); // Java requires 639-1 if one exists
         let locale = self
             .jvm()