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

GitTreeReader.stream: refactor for readability

Browse source
This commit is contained in:
Paul Campbell 2018-07-11 07:10:49 +01:00
parent 330e87b6a1
commit 2f68bd55d0
1 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/main/java/net/kemitix/gitdb/impl/GitTreeReader.java
View file

@ -26,7 +26,6 @@ import lombok.RequiredArgsConstructor;
import net.kemitix.mon.result.Result; import net.kemitix.mon.result.Result;
import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.TreeWalk;
@ -35,7 +34,6 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -58,27 +56,35 @@ class GitTreeReader {
* @return a stream of key/value pairs as NamedRevBlobs * @return a stream of key/value pairs as NamedRevBlobs
*/ */
Result<Stream<NamedRevBlob>> stream(final Ref branchRef) { Result<Stream<NamedRevBlob>> stream(final Ref branchRef) {
final TreeWalk treeWalk = new TreeWalk(repository);
final RevWalk revWalk = new RevWalk(repository); final RevWalk revWalk = new RevWalk(repository);
return Result.of(parseBranchCommit(branchRef, revWalk)) return Result.of(parseTree(branchRef, revWalk))
.map(RevCommit::getTree) .andThen(configureFilter())
.flatMap(addTreeTo(treeWalk)) .andThen(buildStream(revWalk));
.peek(disableRecursion(treeWalk))
.peek(setTreeFilter(treeWalk))
.flatMap(streamMatching(treeWalk, revWalk));
} }
private Function<Void, Result<Stream<NamedRevBlob>>> streamMatching( private Callable<RevTree> parseTree(final Ref branchRef, final RevWalk revWalk) {
final TreeWalk treeWalk, return () -> revWalk.parseCommit(branchRef.getObjectId()).getTree();
final RevWalk revWalk }
) {
return x -> Result.of(() -> { private Function<RevTree, Callable<TreeWalk>> configureFilter() {
return tree -> () -> {
final TreeWalk treeWalk = new TreeWalk(repository);
treeWalk.addTree(tree);
treeWalk.setRecursive(false);
Optional.ofNullable(treeFilter)
.ifPresent(treeWalk::setFilter);
return treeWalk;
};
}
private Function<TreeWalk, Callable<Stream<NamedRevBlob>>> buildStream(final RevWalk revWalk) {
return treeWalk -> () -> {
final Stream.Builder<NamedRevBlob> builder = Stream.builder(); final Stream.Builder<NamedRevBlob> builder = Stream.builder();
while (treeWalk.next()) { while (treeWalk.next()) {
builder.add(namedRevBlob(treeWalk, revWalk)); builder.add(namedRevBlob(treeWalk, revWalk));
} }
return builder.build(); return builder.build();
}); };
} }
private NamedRevBlob namedRevBlob(final TreeWalk treeWalk, final RevWalk revWalk) { private NamedRevBlob namedRevBlob(final TreeWalk treeWalk, final RevWalk revWalk) {
@ -88,25 +94,6 @@ class GitTreeReader {
repository); repository);
} }
private Consumer<Void> setTreeFilter(final TreeWalk treeWalk) {
return x -> Optional.ofNullable(treeFilter).ifPresent(treeWalk::setFilter);
}
private Consumer<Void> disableRecursion(final TreeWalk treeWalk) {
return x -> treeWalk.setRecursive(false);
}
private Function<RevTree, Result<Void>> addTreeTo(final TreeWalk treeWalk) {
return tree -> Result.of(() -> {
treeWalk.addTree(tree);
return null;
});
}
private Callable<RevCommit> parseBranchCommit(final Ref branchRef, final RevWalk revWalk) {
return () -> revWalk.parseCommit(branchRef.getObjectId());
}
/** /**
* Sets a path filter to limit the stream by. * Sets a path filter to limit the stream by.
* *