🐵🐶🐻

axonivy · Jul 29, 2024 · a718bef · a718bef
1 parent 4f9abd0
commit a718bef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/main/java/ch/ivyteam/ivy/maven/ShareEngineCoreClasspathMojo.java b/src/main/java/ch/ivyteam/ivy/maven/ShareEngineCoreClasspathMojo.java
@@ -47,10 +47,8 @@ public class ShareEngineCoreClasspathMojo extends AbstractEngineMojo {
 
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {
-    List<File> ivyEngineClassPathFiles = EngineClassLoaderFactory
-            .getIvyEngineClassPathFiles(identifyAndGetEngineDirectory().toFile());
+    List<File> ivyEngineClassPathFiles = EngineClassLoaderFactory.getIvyEngineClassPathFiles(identifyAndGetEngineDirectory());
     String propertyValue = StringUtils.join(ivyEngineClassPathFiles, ",");
-
     MavenProperties properties = new MavenProperties(project, getLog());
     properties.setMavenProperty(IVY_ENGINE_CORE_CLASSPATH_PROPERTY, propertyValue);
   }

diff --git a/src/main/java/ch/ivyteam/ivy/maven/engine/EngineClassLoaderFactory.java b/src/main/java/ch/ivyteam/ivy/maven/engine/EngineClassLoaderFactory.java
@@ -112,14 +112,14 @@ private static void addToClassPath(List<File> classPathFiles, File dir, Predicat
     }
   }
 
-  public static List<File> getIvyEngineClassPathFiles(File engineDirectory) {
-    List<File> classPathFiles = new ArrayList<>();
+  public static List<File> getIvyEngineClassPathFiles(Path engineDirectory) {
+    var classPathFiles = new ArrayList<File>();
     for (String libDirPath : ENGINE_LIB_DIRECTORIES) {
-      File jarDir = new File(engineDirectory, libDirPath + File.separator);
-      if (!jarDir.isDirectory()) {
+      var jarDir = engineDirectory.resolve(libDirPath);
+      if (!Files.isDirectory(jarDir)) {
         continue;
       }
-      try (var walker = Files.walk(jarDir.toPath())) {
+      try (var walker = Files.walk(jarDir)) {
         var jars = walker
           .filter(p -> p.getFileName().toString().endsWith(".jar"))
           .map(p -> p.toFile())
@@ -133,7 +133,7 @@ public static List<File> getIvyEngineClassPathFiles(File engineDirectory) {
   }
 
   public void writeEngineClasspathJar(File engineDirectory) throws IOException {
-    writeEngineClasspathJar(getIvyEngineClassPathFiles(engineDirectory));
+    writeEngineClasspathJar(getIvyEngineClassPathFiles(engineDirectory.toPath()));
   }
 
   private void writeEngineClasspathJar(List<File> ivyEngineClassPathFiles) throws IOException {
@@ -174,5 +174,4 @@ public File getJar(String groupId, String artifactId, String version) {
       return jar;
     }
   }
-
-}
+}
diff --git a/src/main/java/ch/ivyteam/ivy/maven/engine/MavenProjectBuilderProxy.java b/src/main/java/ch/ivyteam/ivy/maven/engine/MavenProjectBuilderProxy.java
@@ -62,7 +62,7 @@ public MavenProjectBuilderProxy(EngineClassLoaderFactory classLoaderFactory, Fil
 
     delegate = executeInEngineDir(() -> constructor.newInstance(workspace));
 
-    List<File> engineJars = EngineClassLoaderFactory.getIvyEngineClassPathFiles(baseDirToBuildIn);
+    List<File> engineJars = EngineClassLoaderFactory.getIvyEngineClassPathFiles(baseDirToBuildIn.toPath());
     engineClasspath = getEngineClasspath(engineJars);
   }