(camel-karavan) branch main updated: Update File.separator usage in GitService.java (#1537)

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new 9c4ae2f8 Update File.separator usage in GitService.java (#1537)
9c4ae2f8 is described below

commit 9c4ae2f8d8f25f5a52615499e8d2119e4916850e
Author: MarcelRosenberger <mar...@brutex.de>
AuthorDate: Tue Jun 24 13:08:34 2025 +0200

    Update File.separator usage in GitService.java (#1537)
    
    * Update File.separator usage in GitService.java
    
    * Update GitService.java
---
 .../java/org/apache/camel/karavan/service/GitService.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
index 1ce9f35e..cba60873 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
@@ -165,7 +165,7 @@ public class GitService {
         LOGGER.info("Read projects...");
         List<GitRepo> result = new ArrayList<>();
         try {
-            String folder = 
git.getRepository().getDirectory().getAbsolutePath().replace("/.git", "");
+            String folder = 
git.getRepository().getDirectory().getAbsolutePath().replace(File.separator + 
".git", "");
             List<String> projects = readProjectsFromFolder(folder, filter);
             for (String project : projects) {
                 Map<String, String> filesRead = 
readProjectFilesFromFolder(folder, project);
@@ -173,7 +173,7 @@ public class GitService {
                 for (Map.Entry<String, String> entry : filesRead.entrySet()) {
                     String name = entry.getKey();
                     String body = entry.getValue();
-                    Tuple2<String, Integer> fileCommit = lastCommit(git, 
project + File.separator + name);
+                    Tuple2<String, Integer> fileCommit = lastCommit(git, 
project + "/" + name);
                     files.add(new GitRepoFile(name, 
fileCommit.getItem2().longValue() * 1000, body));
                 }
                 Tuple2<String, Integer> commit = lastCommit(git, project);
@@ -290,7 +290,7 @@ public class GitService {
         LOGGER.info("Commit and push changes to the branch " + branch);
         AddCommand add = git.add();
         for (String fileName : fileNames) {
-            add = add.addFilepattern(projectId + File.separator + fileName);
+            add = add.addFilepattern(projectId + "/" + fileName);
         }
         LOGGER.info("Git add: " + add.call());
         RevCommit commit = git.commit().setMessage(message).setAuthor(new 
PersonIdent(authorName, authorEmail)).call();
@@ -315,7 +315,7 @@ public class GitService {
     private void addDeletedFolderToIndex(Git git, String projectId) {
         LOGGER.infof("Add folder %s to git index.", projectId);
         try {
-            git.rm().addFilepattern(projectId + File.separator).call();
+            git.rm().addFilepattern(projectId + "/").call();
         } catch (GitAPIException e) {
             throw new RuntimeException(e);
         }
@@ -333,6 +333,7 @@ public class GitService {
             addDeletedFolderToIndex(git, projectId);
             commitAddedAndPush(git, gitConfig.getBranch(), commitMessage, 
authorName, authorEmail, List.of("."), projectId);
             LOGGER.info("Delete Temp folder " + folder);
+            git.close();
             vertx.fileSystem().deleteRecursiveBlocking(folder, true);
             LOGGER.infof("Project %s deleted from Git", projectId);
         } catch (RefNotFoundException e) {
@@ -557,4 +558,4 @@ public class GitService {
             return treeParser;
         }
     }
-}
\ No newline at end of file
+}