#439: refactor tool dependencies and tomcat

cli/src/main/java/com/devonfw/tools/ide/commandlet/AbstractUpdateCommandlet.java

@@ -167,7 +167,7 @@ private void updateSoftware() {
 
       // update/install the toolCommandlets
       for (ToolCommandlet toolCommandlet : toolCommandlets) {
-        toolCommandlet.install(false);
+        toolCommandlet.install(null, false);
       }
       step.success();
     } finally {

cli/src/main/java/com/devonfw/tools/ide/commandlet/InstallCommandlet.java

@@ -46,7 +46,7 @@ public void run() {
     if (versionIdentifier != null) {
       commandlet.setVersion(versionIdentifier, false);
     }
-    commandlet.install(false);
+    commandlet.install(null, false);
   }
 
   @Override

cli/src/main/java/com/devonfw/tools/ide/common/SystemPath.java

@@ -150,7 +150,7 @@ private static String getTool(Path path, Path ideRoot) {
 
   private Path findBinaryInOrder(Path path, String tool) {
 
-    List<String> extensionPriority = List.of("");
+    List<String> extensionPriority = List.of("", ".sh");
     if (SystemInfoImpl.INSTANCE.isWindows()) {
       extensionPriority = EXTENSION_PRIORITY;
     }

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

@@ -0,0 +1,7 @@
+package com.devonfw.tools.ide.process;
+
+public interface EnvironmentContext {
+
+  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,10 +1,10 @@
 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;
 
-
 public class CustomToolCommandlet extends LocalToolCommandlet {
 
   private CustomTool customTool;
@@ -16,15 +16,15 @@ public CustomToolCommandlet(IdeContext context, CustomTool customTool) {
   }
 
   @Override
-  public ToolInstallation installTool(VersionIdentifier version) {
+  public ToolInstallation installTool(EnvironmentContext environmentContext, VersionIdentifier version) {
 
-    return installTool(version, this.customTool.getEdition());
+    return installTool(environmentContext, version, this.customTool.getEdition());
   }
 
   @Override
-  public ToolInstallation installTool(VersionIdentifier version, String edition) {
+  public ToolInstallation installTool(EnvironmentContext environmentContext, VersionIdentifier version, String edition) {
 
-    return installTool(version, edition, this.context.getCustomToolRepository());
+    return installTool(environmentContext, version, edition, this.context.getCustomToolRepository());
   }
 
   @Override

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

@@ -1,23 +1,22 @@
 package com.devonfw.tools.ide.tool;
 
-import java.io.BufferedReader;
+import com.devonfw.tools.ide.context.IdeContext;
+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.url.model.folder.UrlRepository;
+import com.devonfw.tools.ide.url.model.folder.UrlTool;
+import com.devonfw.tools.ide.version.VersionIdentifier;
+import com.devonfw.tools.ide.version.VersionRange;
+
 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.dependencyJson.DependencyInfo;
-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 +26,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.
    *
@@ -49,10 +44,17 @@ public Dependency(IdeContext context, String tool) {
    * @param toolEdition the edition of the tool.
    * @return the {@link Path} of the dependency.json file
    */
-  public Path getDependencyJsonPath(String toolEdition) {
+  public boolean existsDependencyJsonPath(String toolEdition) {
 
-    Path toolPath = this.context.getUrlsPath().resolve(this.tool).resolve(toolEdition);
-    return toolPath.resolve(DEPENDENCY_FILENAME);
+    return Files.exists(getDependencyUrlEdition(toolEdition).getDependencyFile().getPath());
+  }
+
+  private UrlEdition getDependencyUrlEdition(String toolEdition) {
+
+    UrlRepository urlRepository = new UrlRepository(this.context.getUrlsPath());
+    UrlTool urlTool = new UrlTool(urlRepository, tool);
+    UrlEdition urlEdition = new UrlEdition(urlTool, toolEdition);
+    return urlEdition;
   }
 
   /**
@@ -64,16 +66,9 @@ 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();
+    Map<VersionRange, List<DependencyInfo>> dependencyMap = urlDependencyFile.getDependencyMap();
+    return findDependenciesFromJson(dependencyMap, version);
   }
 
   /**
@@ -121,9 +116,9 @@ public Path versionExistsInRepository(Path dependencyRepositoryPath, VersionRang
     return Path.of("");
   }
 
-  private List<DependencyInfo> findDependenciesFromJson(Map<VersionRange, List<DependencyInfo>> dependencies, VersionIdentifier toolVersionToCheck) {
+  private List<DependencyInfo> findDependenciesFromJson(Map<VersionRange, List<DependencyInfo>> dependencyMap, VersionIdentifier toolVersionToCheck) {
 
-    for (Map.Entry<VersionRange, List<DependencyInfo>> map : dependencies.entrySet()) {
+    for (Map.Entry<VersionRange, List<DependencyInfo>> map : dependencyMap.entrySet()) {
 
       VersionRange foundToolVersionRange = map.getKey();
 

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;
@@ -104,7 +105,7 @@ protected boolean isExtract() {
   }
 
   @Override
-  protected boolean doInstall(boolean silent) {
+  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