devonfw#1517 implemented requested changes

saved the return of Systemutils.getUserHome() and determineMvnPath in a static variable to avoid multiple calls of the method
Zylesto · Nov 9, 2022 · 827fc1a · 827fc1a
1 parent 87504b1
commit 827fc1a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 9 deletions.
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenUtil.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenUtil.java
@@ -39,6 +39,12 @@ public class MavenUtil {
   /** Logger instance. */
   private static final Logger LOG = LoggerFactory.getLogger(MavenUtil.class);
 
+  /** Stores the user home */
+  private static File userHome;
+
+  /** Stores the maven path */
+  private static Path mavenPath;
+
   /**
    * Executes a Maven class path build command which will download all the transitive dependencies needed for the CLI
    *
@@ -51,7 +57,7 @@ public static void cacheMavenClassPath(Path pomFile, Path cpFile) {
 
     LOG.info("Calculating class path for {} and downloading the needed maven dependencies. Please be patient...",
         pomFile);
-    List<String> args = Lists.newArrayList(SystemUtil.determineMvnPath().toString(), "dependency:build-classpath",
+    List<String> args = Lists.newArrayList(determineMvnPath().toString(), "dependency:build-classpath",
         "-Dmdep.outputFile=" + cpFile.toString());
     if (pomFile.getFileSystem().provider().getClass().getSimpleName().equals("ZipFileSystemProvider")) {
       pomFile = createCachedPomFromJar(pomFile, cpFile.getParent());
@@ -74,7 +80,7 @@ public static void resolveDependencies(Path mvnProjectRoot) {
     LOG.info(
         "Resolving maven dependencies for maven project {} to be able to make use of reflection in templates. Please be patient...",
         mvnProjectRoot);
-    List<String> args = Lists.newArrayList(SystemUtil.determineMvnPath().toString(), "dependency:resolve");
+    List<String> args = Lists.newArrayList(determineMvnPath().toString(), "dependency:resolve");
     runCommand(mvnProjectRoot, args);
     LOG.debug("Downloaded dependencies successfully.");
   }
@@ -96,7 +102,7 @@ public static void resolveDependencies(Path pomFile, Path mvnProjectRoot) {
       pomFile = createCachedPomFromJar(pomFile, mvnProjectRoot);
     }
 
-    List<String> args = Lists.newArrayList(SystemUtil.determineMvnPath().toString());
+    List<String> args = Lists.newArrayList(determineMvnPath().toString());
     args.add("-f");
     args.add(pomFile.toString());
     args.add("dependency:resolve");
@@ -182,15 +188,40 @@ public static String generatePomFileHash(Path pomFile) {
     return pomFileHash;
   }
 
+  /**
+   * Determines maven home path if it was not set yet and returns it
+   *
+   * @return Path to maven home
+   */
+  private static Path determineMvnPath() {
+
+    if (mavenPath == null) {
+      mavenPath = SystemUtil.determineMvnPath();
+    }
+    return mavenPath;
+  }
+
+  /**
+   * Determines maven home path if it was not set yet and returns it
+   *
+   * @return File path to user home
+   */
+  private static File getUserHome() {
+
+    if (userHome == null) {
+      userHome = SystemUtils.getUserHome();
+    }
+    return userHome;
+  }
+
   /**
    * @return the maven repository path
    */
   public static Path determineMavenRepositoryPath() {
 
     LOG.info("Determine maven repository path");
-    String m2Repo = runCommand(SystemUtils.getUserHome().toPath(),
-        Lists.newArrayList(SystemUtil.determineMvnPath().toString(), "help:evaluate",
-            "-Dexpression=settings.localRepository", "-DforceStdout"));
+    String m2Repo = runCommand(getUserHome().toPath(), Lists.newArrayList(determineMvnPath().toString(),
+        "help:evaluate", "-Dexpression=settings.localRepository", "-DforceStdout"));
     LOG.debug("Determined {} as maven repository path.", m2Repo);
     return Paths.get(m2Repo);
   }
@@ -203,8 +234,8 @@ public static Path determineMavenRepositoryPath() {
   public static String determineMavenSettings() {
 
     LOG.info("Determine content of maven's settings.xml");
-    String mavenSettings = runCommand(SystemUtils.getUserHome().toPath(), Lists.newArrayList(
-        SystemUtil.determineMvnPath().toString(), "help:evaluate", "-Dexpression=settings", "-DforceStdout"));
+    String mavenSettings = runCommand(getUserHome().toPath(),
+        Lists.newArrayList(determineMvnPath().toString(), "help:evaluate", "-Dexpression=settings", "-DforceStdout"));
     return mavenSettings;
   }
 

diff --git a/...ore-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/ArtifactRetriever.java b/...ore-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/ArtifactRetriever.java
@@ -19,7 +19,7 @@
 import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsServerModel;
 
 /**
- * Utils to obtain maven artifact download URLs
+ * Used to obtain maven artifact download URLs
  */
 public class ArtifactRetriever {