Skip to content

Update File.separator usage in GitService.java #1537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgubaidullin merged 2 commits into from
Jun 24, 2025
Merged

Update File.separator usage in GitService.java #1537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b35066
Update File.separator usage in GitService.java
MarcelRosenberger Jun 23, 2025
9617b2d
Update GitService.java
MarcelRosenberger Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ private List<GitRepo> readProjectsFromRepository(Git git, String... filter) {
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);
List<GitRepoFile> files = new ArrayList<>(filesRead.size());
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);
Expand Down Expand Up @@ -290,7 +290,7 @@ public RevCommit commitAddedAndPush(Git git, String branch, String message, Stri
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();
Expand All @@ -315,7 +315,7 @@ public Git init(String dir, String uri, String branch) throws GitAPIException, I
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);
}
Expand All @@ -333,6 +333,7 @@ public void deleteProject(String projectId, String authorName, String authorEmai
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) {
Expand Down Expand Up @@ -557,4 +558,4 @@ private static AbstractTreeIterator prepareTreeParser(Repository repository, Rev
return treeParser;
}
}
}
}