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

Use non-SNAPSHOT versions of mon and conditional

Browse source
This commit is contained in:
Paul Campbell 2018-08-30 22:26:22 +01:00
parent 5882471590
commit f30eb5f334
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -21,10 +21,10 @@
<jgit.version>5.0.2.201807311906-r</jgit.version> <jgit.version>5.0.2.201807311906-r</jgit.version>
<junit.version>5.2.0</junit.version> <junit.version>5.2.0</junit.version>
<assertj.version>3.11.1</assertj.version> <assertj.version>3.11.1</assertj.version>
<mon.version>DEV-SNAPSHOT</mon.version> <mon.version>0.11.0</mon.version>
<mockito.version>2.21.0</mockito.version> <mockito.version>2.21.0</mockito.version>
<java-semver.version>0.9.0</java-semver.version> <java-semver.version>0.9.0</java-semver.version>
<conditional.version>DEV-SNAPSHOT</conditional.version> <conditional.version>0.7.0</conditional.version>
<digraph-dependency.basePackage>net.kemitix.gitdb</digraph-dependency.basePackage> <digraph-dependency.basePackage>net.kemitix.gitdb</digraph-dependency.basePackage>
</properties> </properties>

2
src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java
View file

@ -85,7 +85,7 @@ class GitDBRepo {
) { ) {
final GitTreeReader treeFilter = new GitTreeReader(repository).treeFilter(key); final GitTreeReader treeFilter = new GitTreeReader(repository).treeFilter(key);
return streamTree(branchRef, treeFilter).flatMap(s -> return streamTree(branchRef, treeFilter).flatMap(s ->
Result.swap(s.findFirst() Result.invert(s.findFirst()
.map(NamedRevBlob::blobAsString) .map(NamedRevBlob::blobAsString)
.map(Maybe::just) .map(Maybe::just)
.orElseGet(Maybe::nothing))); .orElseGet(Maybe::nothing)));

2
src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java
View file

@ -114,7 +114,7 @@ final class LocalGitDBImpl implements GitDB, LocalGitDB {
public Result<Maybe<GitDBBranch>> branch(final String name) { public Result<Maybe<GitDBBranch>> branch(final String name) {
return Result.flatMapMaybe( return Result.flatMapMaybe(
Result.of(() -> Maybe.maybe(repository.findRef(name))), Result.of(() -> Maybe.maybe(repository.findRef(name))),
refMaybe -> Result.swap(refMaybe.map(branchInit))); refMaybe -> Result.invert(refMaybe.map(branchInit)));
} }
} }