#809: Enhance uninstall with --force to remove from the software repo

CHANGELOG.adoc

@@ -5,6 +5,8 @@ This file documents all notable changes to https://github.com/devonfw/IDEasy[IDE
 == 2025.05.002
 
 Release with new features and bugfixes:
+
+* https://github.com/devonfw/IDEasy/issues/809[#809]: make uninstall with --force also remove from software repo
 * https://github.com/devonfw/IDEasy/issues/1038[#1038]: XML merger fails in native-image on custom XPath with MissingResourceException
 
 The full list of changes for this release can be found in https://github.com/devonfw/IDEasy/milestone/28?closed=1[milestone 2025.05.002].

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

@@ -41,7 +41,9 @@ public LocalToolCommandlet(IdeContext context, String tool, Set<Tag> tags) {
    * @return the {@link Path} where the tool is located (installed).
    */
   public Path getToolPath() {
-
+    if (this.context.getSoftwarePath() == null) {
+      return null;
+    }
     return this.context.getSoftwarePath().resolve(getName());
   }
 
@@ -331,7 +333,6 @@ public String getInstalledEdition() {
    * @return the installed edition of this tool or {@code null} if not installed.
    */
   private String getInstalledEdition(Path toolPath) {
-
     if (!Files.isDirectory(toolPath)) {
       this.context.debug("Tool {} not installed in {}", this.tool, toolPath);
       return null;
@@ -369,26 +370,106 @@ private String getEdition(Path toolRepoFolder, Path toolInstallFolder) {
     return null;
   }
 
+  private Path getInstalledSoftwareRepoPath(Path toolPath) {
+    if (!Files.isDirectory(toolPath)) {
+      this.context.debug("Tool {} not installed in {}", this.tool, toolPath);
+      return null;
+    }
+    Path installPath = this.context.getFileAccess().toRealPath(toolPath);
+    // if the installPath changed, a link has been resolved
+    if (installPath.equals(toolPath)) {
+      if (!isIgnoreSoftwareRepo()) {
+        this.context.warning("Tool {} is not installed via software repository (maybe from devonfw-ide). Please consider reinstalling it.", this.tool);
+      }
+      // I do not see any reliable way how we could determine the edition of a tool that does not use software repo or that was installed by devonfw-ide
+      return null;
+    }
+    installPath = getValidInstalledSoftwareRepoPath(installPath, context.getSoftwareRepositoryPath());
+    return installPath;
+  }
+
+  Path getValidInstalledSoftwareRepoPath(Path installPath, Path softwareRepoPath) {
+    int softwareRepoNameCount = softwareRepoPath.getNameCount();
+    int toolInstallNameCount = installPath.getNameCount();
+    int targetToolInstallNameCount = softwareRepoNameCount + 4;
+
+    // installPath can't be shorter than softwareRepoPath
+    if (toolInstallNameCount < softwareRepoNameCount) {
+      this.context.warning("The installation path is not located within the software repository {}.", installPath);
+      return null;
+    }
+    // ensure installPath starts with $IDE_ROOT/_ide/software/
+    for (int i = 0; i < softwareRepoNameCount; i++) {
+      if (!softwareRepoPath.getName(i).toString().equals(installPath.getName(i).toString())) {
+        this.context.warning("The installation path is not located within the software repository {}.", installPath);
+        return null;
+      }
+    }
+    // return $IDE_ROOT/_ide/software/«id»/«tool»/«edition»/«version»
+    if (toolInstallNameCount == targetToolInstallNameCount) {
+      return installPath;
+    } else if (toolInstallNameCount > targetToolInstallNameCount) {
+      Path validInstallPath = installPath;
+      for (int i = 0; i < toolInstallNameCount - targetToolInstallNameCount; i++) {
+        validInstallPath = validInstallPath.getParent();
+      }
+      return validInstallPath;
+    } else {
+      this.context.warning("The installation path is faulty {}.", installPath);
+      return null;
+    }
+  }
+
   @Override
   public void uninstall() {
+    try {
+      Path toolPath = getToolPath();
+      if (!Files.exists(toolPath)) {
+        this.context.warning("An installed version of " + this.tool + " does not exist.");
+        return;
+      }
+      if (this.context.isForceMode()) {
+        this.context.warning(
+            "Sub-command uninstall via force mode will physically delete the currently installed version of " + this.tool + " from the machine.\n"
+                + "This may cause issues with other projects, that use the same version of " + this.tool + ".\n"
+                + "Deleting " + this.tool + " version " + getInstalledVersion() + " from your machine.");
+        uninstallFromSoftwareRepository(toolPath);
+      }
+      try {
+        this.context.getFileAccess().delete(toolPath);
+        this.context.success("Successfully uninstalled " + this.tool);
+      } catch (Exception e) {
+        this.context.error("Couldn't uninstall " + this.tool + ". ", e);
+      }
+    } catch (Exception e) {
+      this.context.error(e.getMessage(), e);
+    }
+  }
 
+  /**
+   * Deletes the installed version of the tool from the shared software repository.
+   */
+  private void uninstallFromSoftwareRepository(Path toolPath) {
     try {
-      Path softwarePath = getToolPath();
-      if (Files.exists(softwarePath)) {
-        try {
-          this.context.getFileAccess().delete(softwarePath);
-          this.context.success("Successfully uninstalled " + this.tool);
-        } catch (Exception e) {
-          this.context.error("Couldn't uninstall " + this.tool);
-        }
-      } else {
-        this.context.warning("An installed version of " + this.tool + " does not exist");
+      Path repoPath = getInstalledSoftwareRepoPath(toolPath);
+      if (!Files.exists(repoPath)) {
+        this.context.warning("An installed version of " + this.tool + " does not exist.");
+        return;
+      }
+      this.context.info("Physically deleting " + repoPath + " as requested by the user via force mode.");
+      try {
+        this.context.getFileAccess().delete(repoPath);
+        this.context.success("Successfully deleted " + repoPath + " from your computer.");
+      } catch (Exception e) {
+        this.context.error("Couldn't delete " + this.tool + " from your computer.", e);
       }
     } catch (Exception e) {
-      this.context.error(e.getMessage());
+      throw new IllegalStateException(
+          " Couldn't uninstall " + this.tool + ". Couldn't determine the software repository path for " + this.tool + ".", e);
     }
   }
 
+
   private ToolInstallation createToolInstallation(Path rootDir, VersionIdentifier resolvedVersion, Path toolVersionFile,
       boolean newInstallation, EnvironmentContext environmentContext, boolean extraInstallation) {
 

cli/src/main/resources/nls/Help.properties

@@ -109,7 +109,7 @@ cmd.tomcat.val.command=Action to perform ( START | STOP )
 cmd.uninstall=Uninstall selected tool(s).
 cmd.uninstall-plugin=Uninstall the selected plugin for the selected tool.
 cmd.uninstall-plugin.detail=Plugins can be only installed or uninstalled for tools that support such. Using the command "ide install-plugin", an uninstalled plugin can be restored.
-cmd.uninstall.detail=Can be used to uninstall selected tool(s). E.g. to uninstall java simply call 'ide uninstall java'. To uninstall IDEasy itself, run 'ide uninstall' without further arguments.
+cmd.uninstall.detail=Can be used to uninstall selected tool(s). E.g. to uninstall java simply call 'ide uninstall java'. To uninstall IDEasy itself, run 'ide uninstall' without further arguments. To fully delete the selected tool from your machine, use force mode. E.g. 'ide --force uninstall java'.
 cmd.update=Pull your settings and apply updates (software, configuration and repositories).
 cmd.update.detail=To update your IDE (if instructed by your ide-admin), you only need to run the following command: 'ide update'.
 cmd.upgrade=Upgrade the version of IDEasy to the latest version available.

cli/src/main/resources/nls/Help_de.properties

@@ -109,7 +109,7 @@ cmd.tomcat.val.command=Auszuführende Aktion ( START | STOP )
 cmd.uninstall=Deinstalliert ausgewählte Werkzeug(e).
 cmd.uninstall-plugin=Deinstalliert die selektierte Erweiterung für das selektierte Werkzeug.
 cmd.uninstall-plugin.detail=Erweiterung können nur für Werkzeuge installiert und deinstalliert werden die diese unterstützen. Mit dem Befehl "ide install-plugin" kann die Erweiterung wieder hergestellt werden.
-cmd.uninstall.detail=Wird dazu verwendet um ausgewählte Werkzeuge zu deinstallieren. Um z.B. Java zu deinstallieren, dient der Befehl 'ide uninstall java'. Um IDEasy selbst zu installieren, dient der Befehl 'ide uninstall' ohne weitere Parameter.
+cmd.uninstall.detail=Wird dazu verwendet um ausgewählte Werkzeuge zu deinstallieren. Um z.B. Java zu deinstallieren, dient der Befehl 'ide uninstall java'. Um IDEasy selbst zu installieren, dient der Befehl 'ide uninstall' ohne weitere Parameter. Um ein aktuelles Werzeug vollständig von der Maschine zu löschen, wird der Force-Modus verwendet. Z.B. 'ide --force uninstall java'.
 cmd.update=Updatet die Settings, Software und Repositories.
 cmd.update.detail=Um die IDE auf den neuesten Stand zu bringen (falls von Ihrem Admin angewiesen) geben Sie einfach 'ide update' in die Konsole ein.
 cmd.upgrade=Aktualisiere IDEasy auf die neueste Version.

cli/src/test/java/com/devonfw/tools/ide/commandlet/UninstallCommandletTest.java

@@ -1,18 +1,21 @@
 package com.devonfw.tools.ide.commandlet;
 
 import java.nio.file.Files;
+import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import com.devonfw.tools.ide.context.AbstractIdeContextTest;
+import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.context.IdeTestContext;
 import com.devonfw.tools.ide.log.IdeLogEntry;
 import com.devonfw.tools.ide.os.SystemInfo;
 import com.devonfw.tools.ide.os.SystemInfoMock;
 import com.devonfw.tools.ide.os.WindowsHelper;
 import com.devonfw.tools.ide.property.ToolProperty;
+import com.devonfw.tools.ide.tool.az.Azure;
 import com.devonfw.tools.ide.tool.dotnet.DotNet;
 import com.devonfw.tools.ide.tool.eclipse.Eclipse;
 import com.devonfw.tools.ide.tool.npm.Npm;
@@ -23,6 +26,22 @@
  */
 public class UninstallCommandletTest extends AbstractIdeContextTest {
 
+  private static final String PROJECT = "edition-version-get-uninstall";
+
+  /**
+   * Mocks the installation of a tool, since forceUninstall depends on symlinks which are not distributed with git
+   *
+   * @param context the {@link IdeContext} to use.
+   * @param tool the tool to mock installation of.
+   */
+  private static void mockInstallTool(IdeTestContext context, String tool) {
+
+    Path pathToInstallationOfDummyTool = context.getSoftwareRepositoryPath()
+        .resolve(context.getDefaultToolRepository().getId()).resolve(tool).resolve(tool).resolve("testVersion");
+    Path pathToLinkedSoftware = context.getSoftwarePath().resolve(tool);
+    context.getFileAccess().symlink(pathToInstallationOfDummyTool, pathToLinkedSoftware);
+  }
+
   /**
    * Test of {@link UninstallCommandlet} run.
    */
@@ -84,6 +103,35 @@ public void testUninstallNpm() {
     assertThat(context).log().hasEntries(IdeLogEntry.ofSuccess("Successfully uninstalled npm"));
   }
 
+  /** Test of {@link UninstallCommandlet} run with --force. */
+  @ParameterizedTest
+  @ValueSource(strings = { "windows", "mac", "linux" })
+  public void testForceUninstallAzure(String os) {
+
+    // arrange
+    SystemInfo systemInfo = SystemInfoMock.of(os);
+    String tool = "az";
+    IdeTestContext context = newContext(PROJECT, null, true);
+    context.setSystemInfo(systemInfo);
+    mockInstallTool(context, tool);
+    CommandletManager commandletManager = context.getCommandletManager();
+    UninstallCommandlet uninstallCommandlet = commandletManager.getCommandlet(UninstallCommandlet.class);
+    Azure azureCommandlet = commandletManager.getCommandlet(Azure.class);
+    uninstallCommandlet.tools.addValue(azureCommandlet);
+    uninstallCommandlet.tools.setValueAsString(tool, context);
+    context.getStartContext().setForceMode(true);
+
+    // act
+    uninstallCommandlet.run();
+    // assert
+    assertThat(context).log()
+        .hasEntries(IdeLogEntry.ofSuccess("Successfully deleted " + context.getSoftwareRepositoryPath()
+            .resolve(context.getDefaultToolRepository().getId()).resolve(tool).resolve(tool).resolve("testVersion") + " from your computer."));
+    assertThat(context).log().hasEntries(IdeLogEntry.ofSuccess("Successfully uninstalled " + tool));
+    assertThat(context.getSoftwareRepositoryPath()
+        .resolve(context.getDefaultToolRepository().getId()).resolve(tool).resolve(tool).resolve("testVersion")).doesNotExist();
+  }
+
   /** Test {@link UninstallCommandlet} without arguments uninstalls IDEasy. */
   @ParameterizedTest
   @ValueSource(strings = { "windows", "mac", "linux" })

cli/src/test/java/com/devonfw/tools/ide/tool/LocalToolCommandletTest.java

@@ -0,0 +1,105 @@
+package com.devonfw.tools.ide.tool;
+
+import java.nio.file.Path;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import com.devonfw.tools.ide.common.Tag;
+import com.devonfw.tools.ide.context.AbstractIdeContextTest;
+import com.devonfw.tools.ide.context.IdeContext;
+import com.devonfw.tools.ide.context.IdeTestContext;
+import com.devonfw.tools.ide.log.IdeLogEntry;
+
+/**
+ * Test of {@link LocalToolCommandlet}.
+ */
+public class LocalToolCommandletTest extends AbstractIdeContextTest {
+
+  /**
+   * Dummy commandlet extending {@link LocalToolCommandlet} for testing.
+   */
+  public static class LocalToolDummyCommandlet extends LocalToolCommandlet {
+
+    LocalToolDummyCommandlet(IdeContext context) {
+
+      super(context, "dummy", Set.of(Tag.TEST));
+    }
+  }
+
+  /**
+   * Test {@link LocalToolCommandlet#getValidInstalledSoftwareRepoPath(Path, Path)} with a long installation path, as commonly encountered on macOS systems.
+   */
+  @Test
+  public void testGetValidInstalledSoftwareRepoPathWithLongPath() {
+    // arrange
+    Path installPath = Path.of("/projects/_ide/software/default/java/java/21.0.7_6/Contents/Resources/app/");
+    Path softwareRepoPath = Path.of("/projects/_ide/software/");
+    Path expectedResultPath = Path.of("/projects/_ide/software/default/java/java/21.0.7_6/");
+    IdeTestContext context = newContext(PROJECT_BASIC);
+    LocalToolDummyCommandlet localToolCommandlet = new LocalToolDummyCommandlet(context);
+
+    // act
+    Path resultPath = localToolCommandlet.getValidInstalledSoftwareRepoPath(installPath, softwareRepoPath);
+
+    // assert
+    assertThat(resultPath).isEqualTo(expectedResultPath);
+  }
+
+  /**
+   * Test {@link LocalToolCommandlet#getValidInstalledSoftwareRepoPath(Path, Path)} with a valid installation path.
+   */
+  @Test
+  public void testGetValidInstalledSoftwareRepoPathWithValidPath() {
+    // arrange
+    Path installPath = Path.of("/projects/_ide/software/default/java/java/21.0.7_6/");
+    Path softwareRepoPath = Path.of("/projects/_ide/software/");
+    IdeTestContext context = newContext(PROJECT_BASIC);
+    LocalToolDummyCommandlet localToolCommandlet = new LocalToolDummyCommandlet(context);
+
+    // act
+    Path resultPath = localToolCommandlet.getValidInstalledSoftwareRepoPath(installPath, softwareRepoPath);
+
+    // assert
+    assertThat(resultPath).isEqualTo(installPath);
+  }
+
+  /**
+   * Test {@link LocalToolCommandlet#getValidInstalledSoftwareRepoPath(Path, Path)} with an installation path that is too short.
+   */
+  @Test
+  public void testGetValidInstalledSoftwareRepoPathWithShortPath() {
+    // arrange
+    Path installPath = Path.of("/projects/_ide/software/default/java/java/");
+    Path softwareRepoPath = Path.of("/projects/_ide/software/");
+    IdeTestContext context = newContext(PROJECT_BASIC);
+    LocalToolDummyCommandlet localToolCommandlet = new LocalToolDummyCommandlet(context);
+
+    // act
+    Path resultPath = localToolCommandlet.getValidInstalledSoftwareRepoPath(installPath, softwareRepoPath);
+
+    // assert
+    assertThat(resultPath).isNull();
+    assertThat(context).log().hasEntries(IdeLogEntry.ofWarning("The installation path is faulty " + installPath + "."));
+  }
+
+  /**
+   * Test {@link LocalToolCommandlet#getValidInstalledSoftwareRepoPath(Path, Path)} with an installation path that completely differs from the software
+   * repository path.
+   */
+  @Test
+  public void testGetValidInstalledSoftwareRepoPathWithWrongPath() {
+    // arrange
+    Path installPath = Path.of("/projects/IDEasy/workspaces/main/IDEasy/software/java/");
+    Path softwareRepoPath = Path.of("/projects/_ide/software/");
+    IdeTestContext context = newContext(PROJECT_BASIC);
+    LocalToolDummyCommandlet localToolCommandlet = new LocalToolDummyCommandlet(context);
+
+    // act
+    Path resultPath = localToolCommandlet.getValidInstalledSoftwareRepoPath(installPath, softwareRepoPath);
+
+    // assert
+    assertThat(resultPath).isNull();
+    assertThat(context).log().hasEntries(IdeLogEntry.ofWarning("The installation path is not located within the software repository " + installPath + "."));
+  }
+}