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

GitDBRepo.readValue now returns String

Browse source
This commit is contained in:
Paul Campbell 2018-06-14 07:32:58 +01:00
parent f2ee721ec4
commit ffc2b56b05
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/kemitix/gitdb/GitDBBranch.java
View file

@ -79,8 +79,7 @@ public class GitDBBranch {
* @throws IOException if there was an error reading the value * @throws IOException if there was an error reading the value
*/ */
public Optional<String> get(final String key) throws IOException { public Optional<String> get(final String key) throws IOException {
return gitDBRepo.readValue(branchRef, KEY_PREFIX + key) return gitDBRepo.readValue(branchRef, KEY_PREFIX + key);
.map(String::new);
} }
/** /**

5
src/main/java/net/kemitix/gitdb/GitDBRepo.java
View file

@ -165,14 +165,15 @@ class GitDBRepo {
* @return an Optional containing the value if found, or empty * @return an Optional containing the value if found, or empty
* @throws IOException if there was an error reading the value * @throws IOException if there was an error reading the value
*/ */
Optional<byte[]> readValue( Optional<String> readValue(
final Ref branchRef, final Ref branchRef,
final String key final String key
) throws IOException { ) throws IOException {
try (TreeWalk treeWalk = getTreeWalk(branchRef)) { try (TreeWalk treeWalk = getTreeWalk(branchRef)) {
treeWalk.setFilter(PathFilter.create(key)); treeWalk.setFilter(PathFilter.create(key));
if (treeWalk.next()) { if (treeWalk.next()) {
return Optional.of(repository.open(treeWalk.getObjectId(0), Constants.OBJ_BLOB).getBytes()); return Optional.of(new String(
repository.open(treeWalk.getObjectId(0), Constants.OBJ_BLOB).getBytes()));
} }
} }
return Optional.empty(); return Optional.empty();