From ffc2b56b05e31c0a1a8763194ab7fbccd658667a Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 14 Jun 2018 07:32:58 +0100 Subject: [PATCH] GitDBRepo.readValue now returns String --- src/main/java/net/kemitix/gitdb/GitDBBranch.java | 3 +-- src/main/java/net/kemitix/gitdb/GitDBRepo.java | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/kemitix/gitdb/GitDBBranch.java b/src/main/java/net/kemitix/gitdb/GitDBBranch.java index b879d3b..7feb860 100644 --- a/src/main/java/net/kemitix/gitdb/GitDBBranch.java +++ b/src/main/java/net/kemitix/gitdb/GitDBBranch.java @@ -79,8 +79,7 @@ public class GitDBBranch { * @throws IOException if there was an error reading the value */ public Optional get(final String key) throws IOException { - return gitDBRepo.readValue(branchRef, KEY_PREFIX + key) - .map(String::new); + return gitDBRepo.readValue(branchRef, KEY_PREFIX + key); } /** diff --git a/src/main/java/net/kemitix/gitdb/GitDBRepo.java b/src/main/java/net/kemitix/gitdb/GitDBRepo.java index a9d4c90..d5ae37c 100644 --- a/src/main/java/net/kemitix/gitdb/GitDBRepo.java +++ b/src/main/java/net/kemitix/gitdb/GitDBRepo.java @@ -165,14 +165,15 @@ class GitDBRepo { * @return an Optional containing the value if found, or empty * @throws IOException if there was an error reading the value */ - Optional readValue( + Optional readValue( final Ref branchRef, final String key ) throws IOException { try (TreeWalk treeWalk = getTreeWalk(branchRef)) { treeWalk.setFilter(PathFilter.create(key)); 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();