From f30eb5f334f017742991b390bfe8b41e16ec04c2 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 30 Aug 2018 22:26:22 +0100 Subject: [PATCH] Use non-SNAPSHOT versions of mon and conditional --- pom.xml | 4 ++-- src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java | 2 +- src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6e470c3..8733b95 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ 5.0.2.201807311906-r 5.2.0 3.11.1 - DEV-SNAPSHOT + 0.11.0 2.21.0 0.9.0 - DEV-SNAPSHOT + 0.7.0 net.kemitix.gitdb diff --git a/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java b/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java index 36841d3..20e759e 100644 --- a/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java +++ b/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java @@ -85,7 +85,7 @@ class GitDBRepo { ) { final GitTreeReader treeFilter = new GitTreeReader(repository).treeFilter(key); return streamTree(branchRef, treeFilter).flatMap(s -> - Result.swap(s.findFirst() + Result.invert(s.findFirst() .map(NamedRevBlob::blobAsString) .map(Maybe::just) .orElseGet(Maybe::nothing))); diff --git a/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java b/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java index fac9502..6ac5c17 100644 --- a/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java +++ b/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java @@ -114,7 +114,7 @@ final class LocalGitDBImpl implements GitDB, LocalGitDB { public Result> branch(final String name) { return Result.flatMapMaybe( Result.of(() -> Maybe.maybe(repository.findRef(name))), - refMaybe -> Result.swap(refMaybe.map(branchInit))); + refMaybe -> Result.invert(refMaybe.map(branchInit))); } }