#439: refactor tool dependencies and tomcat

cli/src/main/java/com/devonfw/tools/ide/process/EnvironmentContext.java

@@ -0,0 +1,19 @@
+package com.devonfw.tools.ide.process;
+
+/**
+ * Interface for the environment context relatable in the case a tool needs to be run with an environment variable.
+ */
+public interface EnvironmentContext {
+
+  /**
+   * Sets or overrides the specified environment variable only for the planned process execution. Please note that the environment variables are initialized
+   * when the {@link EnvironmentContext} is created. This method explicitly set an additional or overrides an existing environment and will have effect for each
+   * process execution invoked from this {@link EnvironmentContext} instance.
+   *
+   * @param key the name of the environment variable (E.g. "PATH").
+   * @param value the value of the environment variable.
+   * @return this {@link EnvironmentContext} for fluent API calls.
+   */
+  EnvironmentContext withEnvVar(String key, String value);
+
+}

cli/src/main/java/com/devonfw/tools/ide/process/ProcessContext.java

@@ -7,7 +7,7 @@
 /**
  * Wrapper for {@link ProcessBuilder} to simplify its usage and avoid common mistakes and pitfalls.
  */
-public interface ProcessContext {
+public interface ProcessContext extends EnvironmentContext {
 
   /**
    * @param handling the desired {@link ProcessErrorHandling}.

cli/src/main/java/com/devonfw/tools/ide/tool/CustomToolCommandlet.java

@@ -1,6 +1,7 @@
 package com.devonfw.tools.ide.tool;
 
 import com.devonfw.tools.ide.context.IdeContext;
+import com.devonfw.tools.ide.process.EnvironmentContext;
 import com.devonfw.tools.ide.repo.CustomTool;
 import com.devonfw.tools.ide.version.VersionIdentifier;
 
@@ -17,21 +18,29 @@ public CustomToolCommandlet(IdeContext context, CustomTool customTool) {
     this.customTool = customTool;
   }
 
+  @Override
+  public ToolInstallation installTool(VersionIdentifier version, EnvironmentContext environmentContext) {
+
+    return installTool(version, this.customTool.getEdition(), environmentContext);
+  }
+
   @Override
   public ToolInstallation installTool(VersionIdentifier version) {
 
-    return installTool(version, this.customTool.getEdition());
+    return installTool(version, this.customTool.getEdition(), null);
   }
 
   @Override
-  public ToolInstallation installTool(VersionIdentifier version, String edition) {
+  public ToolInstallation installTool(VersionIdentifier version, String edition, EnvironmentContext environmentContext) {
 
-    return installTool(version, edition, this.context.getCustomToolRepository());
+    return installTool(version, edition, this.context.getCustomToolRepository(), environmentContext);
   }
 
+
   @Override
   public VersionIdentifier getConfiguredVersion() {
 
     return this.customTool.getVersion();
   }
+
 }

cli/src/main/java/com/devonfw/tools/ide/tool/Dependency.java

@@ -1,22 +1,19 @@
 package com.devonfw.tools.ide.tool;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
 import com.devonfw.tools.ide.context.IdeContext;
-import com.devonfw.tools.ide.json.mapping.JsonMapping;
+import com.devonfw.tools.ide.url.model.file.UrlDependencyFile;
 import com.devonfw.tools.ide.url.model.file.dependencyJson.DependencyInfo;
+import com.devonfw.tools.ide.url.model.folder.UrlEdition;
 import com.devonfw.tools.ide.version.VersionIdentifier;
 import com.devonfw.tools.ide.version.VersionRange;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Class to represent the functionality of installing the dependencies when a tool is being installed.
@@ -27,10 +24,6 @@ public class Dependency {
 
   private final String tool;
 
-  private static final String DEPENDENCY_FILENAME = "dependencies.json";
-
-  private static final ObjectMapper MAPPER = JsonMapping.create();
-
   /**
    * The constructor.
    *
@@ -43,16 +36,9 @@ public Dependency(IdeContext context, String tool) {
     this.tool = tool;
   }
 
-  /**
-   * Method to get the dependency json file path
-   *
-   * @param toolEdition the edition of the tool.
-   * @return the {@link Path} of the dependency.json file
-   */
-  public Path getDependencyJsonPath(String toolEdition) {
+  private UrlEdition getDependencyUrlEdition(String toolEdition) {
 
-    Path toolPath = this.context.getUrlsPath().resolve(this.tool).resolve(toolEdition);
-    return toolPath.resolve(DEPENDENCY_FILENAME);
+    return this.context.getUrls().getEdition(this.tool, toolEdition);
   }
 
   /**
@@ -64,16 +50,12 @@ public Path getDependencyJsonPath(String toolEdition) {
    */
   public List<DependencyInfo> readJson(VersionIdentifier version, String toolEdition) {
 
-    Path dependencyJsonPath = getDependencyJsonPath(toolEdition);
-
-    try (BufferedReader reader = Files.newBufferedReader(dependencyJsonPath)) {
-      TypeReference<HashMap<VersionRange, List<DependencyInfo>>> typeRef = new TypeReference<>() {
-      };
-      Map<VersionRange, List<DependencyInfo>> dependencyJson = MAPPER.readValue(reader, typeRef);
-      return findDependenciesFromJson(dependencyJson, version);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    UrlDependencyFile urlDependencyFile = getDependencyUrlEdition(toolEdition).getDependencyFile();
+    if (!urlDependencyFile.isDependencyMapNull()) {
+      Map<VersionRange, List<DependencyInfo>> dependencyMap = urlDependencyFile.getDependencyMap();
+      return urlDependencyFile.findDependenciesFromJson(dependencyMap, version);
     }
+    return null;
   }
 
   /**
@@ -121,16 +103,5 @@ public Path versionExistsInRepository(Path dependencyRepositoryPath, VersionRang
     return Path.of("");
   }
 
-  private List<DependencyInfo> findDependenciesFromJson(Map<VersionRange, List<DependencyInfo>> dependencies, VersionIdentifier toolVersionToCheck) {
-
-    for (Map.Entry<VersionRange, List<DependencyInfo>> map : dependencies.entrySet()) {
 
-      VersionRange foundToolVersionRange = map.getKey();
-
-      if (foundToolVersionRange.contains(toolVersionToCheck)) {
-        return map.getValue();
-      }
-    }
-    return null;
-  }
 }

cli/src/main/java/com/devonfw/tools/ide/tool/GlobalToolCommandlet.java

@@ -10,6 +10,7 @@
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.io.FileAccess;
 import com.devonfw.tools.ide.log.IdeLogLevel;
+import com.devonfw.tools.ide.process.EnvironmentContext;
 import com.devonfw.tools.ide.process.ProcessContext;
 import com.devonfw.tools.ide.process.ProcessErrorHandling;
 import com.devonfw.tools.ide.repo.ToolRepository;
@@ -106,6 +107,12 @@ protected boolean isExtract() {
   @Override
   protected boolean doInstall(boolean silent) {
 
+    return doInstall(null, silent);
+  }
+
+  @Override
+  protected boolean doInstall(EnvironmentContext environmentContext, boolean silent) {
+
     Path binaryPath = this.context.getPath().findBinary(Path.of(getBinaryName()));
     // if force mode is enabled, go through with the installation even if the tool is already installed
     if (binaryPath != null && Files.exists(binaryPath) && !this.context.isForceMode()) {