kemitix/gitdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HeadWriter: refactored

Browse source
This commit is contained in:
Paul Campbell 2018-07-20 07:47:18 +01:00
parent 058572ab91
commit 7f8dde5bd3
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/net/kemitix/gitdb/impl/HeadWriter.java
View file

@ -50,23 +50,38 @@ class HeadWriter {
* @return the Ref of the new branch
*/
Result<Ref> write(final String branchName, final ObjectId commitId) {
final Path branchRefPath = branchRefPath(branchName).toAbsolutePath();
final byte[] commitIdBytes = commitId.name().getBytes(StandardCharsets.UTF_8);
return Result.of(() -> {
Files.write(branchRefPath, commitIdBytes);
return repository.findRef(branchName);
});
return writeRef(branchName, commitId, repository)
.flatMap(x -> findRef(branchName, repository));
}
private Path branchRefPath(String branchName) {
return gitDirPath().resolve(branchName);
private static Result<Path> writeRef(
final String branchName,
final ObjectId commitId,
final Repository repository
) {
return Result.of(() ->
Files.write(
branchRefPath(branchName, repository).toAbsolutePath(),
commitIdBytes(commitId)));
}
private Path gitDirPath() {
return gitDir().toPath();
private static Result<Ref> findRef(final String branchName, final Repository repository) {
return Result.of(() -> repository.findRef(branchName));
}
private File gitDir() {
private static Path branchRefPath(final String branchName, final Repository repository) {
return gitDirPath(repository).resolve(branchName);
}
private static byte[] commitIdBytes(final ObjectId commitId) {
return commitId.name().getBytes(StandardCharsets.UTF_8);
}
private static Path gitDirPath(final Repository repository) {
return gitDir(repository).toPath();
}
private static File gitDir(final Repository repository) {
return repository.getDirectory();
}
}