reviewed changes

Author: salimbouch

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

@@ -46,15 +46,15 @@ public String getName() {
   @Override
   public void run() {
 
-    Path repositoriesPath = this.context.getSettingsPath().resolve(IdeContext.FOLDER_REPOSITORIES);
-    Path legacyRepositoriesPath = this.context.getSettingsPath().resolve(IdeContext.FOLDER_LEGACY_REPOSITORIES);
     Path repositoryFile = repository.getValueAsPath(context);
 
     if (repositoryFile != null) {
       // Handle the case when a specific repository is provided
       doImportRepository(repositoryFile, true);
     } else {
       // If no specific repository is provided, check for repositories folder
+      Path repositoriesPath = this.context.getSettingsPath().resolve(IdeContext.FOLDER_REPOSITORIES);
+      Path legacyRepositoriesPath = this.context.getSettingsPath().resolve(IdeContext.FOLDER_LEGACY_REPOSITORIES);
       Path repositories;
       if (Files.exists(repositoriesPath)) {
         repositories = repositoriesPath;
@@ -99,7 +99,6 @@ private void doImportRepository(Path repositoryFile, boolean forceMode) {
     }
 
     this.context.debug(repositoryConfig.toString());
-    this.context.debug("Pull or clone git repository {} ...", repository);
 
     String workspace = repositoryConfig.workspace() != null ? repositoryConfig.workspace() : "main";
     Path workspacePath = this.context.getIdeHome().resolve("workspaces").resolve(workspace);
@@ -127,10 +126,5 @@ private void doImportRepository(Path repositoryFile, boolean forceMode) {
       this.context.info("Build command not set. Skipping build for repository.");
     }
 
-    if (!Files.exists(repositoryPath.resolve(".project"))) {
-      for (String ideCommandlet : repositoryConfig.imports()) {
-        //TODO: import repository to ideCommandlet
-      }
-    }
   }
 }

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

@@ -45,7 +45,7 @@ public static RepositoryConfig loadProperties(Path filePath) {
     return new RepositoryConfig(properties.getProperty("path"), properties.getProperty("workingsets"),
         properties.getProperty("workspace"), properties.getProperty("git_url"), properties.getProperty("git_branch"),
         properties.getProperty(("build_path")), properties.getProperty("build_cmd"), importsSet,
-        Boolean.parseBoolean(properties.getProperty("active")));
+        Boolean.parseBoolean(properties.getProperty("active").trim()));
   }
 
   private static Set<String> getImports(Properties properties) {

cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

@@ -601,6 +601,7 @@ public void gitPullOrClone(Path target, String gitRepoUrl) {
     if (!gitRepoUrl.startsWith("http")) {
       throw new IllegalArgumentException("Invalid git URL '" + gitRepoUrl + "'!");
     }
+    debug("Pull or clone git repository {} ...", gitRepoUrl);
     ProcessContext pc = newProcess().directory(target).executable("git");
     if (Files.isDirectory(target.resolve(".git"))) {
       ProcessResult result = pc.addArg("remote").run(true);

cli/src/main/java/com/devonfw/tools/ide/io/FileAccess.java

@@ -140,4 +140,13 @@ default void copy(Path source, Path target) {
    */
   List<Path> getChildrenInDir(Path dir, Predicate<Path> filter);
 
+  /**
+   * Finds the existing file with the specified name in the given list of directories.
+   *
+   * @param fileName      The name of the file to find.
+   * @param searchDirs    The list of directories to search for the file.
+   * @return              The {@code Path} of the existing file, or {@code null} if the file is not found.
+   */
+  Path findExistingFile(String fileName, List<Path> searchDirs);
+
 }

cli/src/main/java/com/devonfw/tools/ide/io/FileAccessImpl.java

@@ -477,4 +477,20 @@ public List<Path> getChildrenInDir(Path dir, Predicate<Path> filter) {
     return files;
   }
 
+  @Override
+  public Path findExistingFile(String fileName, List<Path> searchDirs) {
+
+    for (Path dir : searchDirs) {
+      Path filePath = dir.resolve(fileName);
+      try {
+        if (Files.exists(filePath)) {
+          return filePath;
+        }
+      } catch (SecurityException e) {
+        throw new IllegalStateException("SecurityException while checking file existence.");
+      }
+    }
+    return null;
+  }
+
 }

cli/src/main/java/com/devonfw/tools/ide/property/RepositoryProperty.java

@@ -4,6 +4,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.function.Consumer;
 
 public class RepositoryProperty extends Property<String> {
@@ -47,28 +48,22 @@ public String parse(String valueAsString) {
 
   public Path getValueAsPath(IdeContext context) {
 
-    Path repositoriesPath = context.getSettingsPath().resolve(IdeContext.FOLDER_REPOSITORIES);
-    Path legacyRepositoriesPath = context.getSettingsPath().resolve(IdeContext.FOLDER_LEGACY_REPOSITORIES);
-
     String value = getValue();
     if (value == null) {
       return null;
     }
+
     Path repositoryFile = Path.of(value);
-    
     if (!Files.exists(repositoryFile)) {
-      repositoryFile = repositoriesPath.resolve(value + ".properties");
+      Path repositoriesPath = context.getSettingsPath().resolve(IdeContext.FOLDER_REPOSITORIES);
+      Path legacyRepositoriesPath = context.getSettingsPath().resolve(IdeContext.FOLDER_LEGACY_REPOSITORIES);
+      repositoryFile = context.getFileAccess().findExistingFile(value + ".properties",
+          Arrays.asList(repositoriesPath, legacyRepositoriesPath));
     }
-    if (!Files.exists(repositoryFile)) {
-      Path legacyRepositoryFile = legacyRepositoriesPath.resolve(repositoryFile.getFileName().toString());
-      if (Files.exists(legacyRepositoryFile)) {
-        repositoryFile = legacyRepositoryFile;
-      } else {
-        throw new IllegalStateException("Could not find " + repositoryFile);
-      }
+    if (repositoryFile == null) {
+      throw new IllegalStateException("Could not find " + value);
     }
     return repositoryFile;
   }
 
-
 }