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

InitGitDBRepo.create: rewrite to use new Result methods

Browse source
This commit is contained in:
Paul Campbell 2018-07-10 22:16:13 +01:00
parent d702968b94
commit 88bbfd428b
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/net/kemitix/gitdb/impl/InitGitDBRepo.java
View file

@ -29,7 +29,6 @@ import org.eclipse.jgit.lib.RepositoryCache;
import org.eclipse.jgit.util.FS;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.*;
@ -52,19 +51,14 @@ class InitGitDBRepo {
*
* @param dbDir the directory to initialise the repo in
*/
static Result<Void> create(final Path dbDir) {
static Result<Repository> create(final Path dbDir) {
final InitGitDBRepo initRepo = new InitGitDBRepo();
return initRepo.validDbDir(dbDir.toFile())
.peek(File::mkdirs)
.flatMap(dir -> {
try (Repository repository = RepositoryCache.FileKey.exact(dir, FS.DETECTED).open(false)) {
repository.create(true);
initRepo.createInitialBranchOnMaster(repository);
} catch (IOException e) {
return Result.error(e);
}
return Result.ok(null);
});
.map(dir -> RepositoryCache.FileKey.exact(dir, FS.DETECTED))
.andThen(fileKey -> () -> fileKey.open(false))
.thenWith(repository -> () -> repository.create(true))
.thenWith(repository -> () -> initRepo.createInitialBranchOnMaster(repository));
}
private Result<File> validDbDir(final File dbDir) {