From a8e3b291db2922641782a9b1db3c8a37a0e8832b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 13 Jan 2021 15:18:29 +0100 Subject: [PATCH] Polishing. Improve method naming. Closes #168. --- .../data/release/git/GitOperations.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java index f2bbca2..e032065 100644 --- a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java +++ b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java @@ -883,23 +883,23 @@ public class GitOperations { private ObjectId findRequiredCommit(ModuleIteration module, String summary) { - Predicate trigger = calculateTrigger(module, summary); + Predicate trigger = calculateFilter(module, summary); return findCommit(module, summary).orElseThrow(() -> new IllegalStateException(String .format("Did not find a commit with summary starting with '%s' for project %s", module.getProject(), trigger))); } private Optional findCommit(ModuleIteration module, String summary) { - return findCommitWithTrigger(module.getProject(), calculateTrigger(module, summary)); + return findCommit(module.getProject(), calculateFilter(module, summary)); } - private Optional findCommitWithTrigger(Project project, Predicate trigger) { + private Optional findCommit(Project project, Predicate filter) { return doWithGit(project, git -> { for (RevCommit commit : git.log().setMaxCount(50).call()) { - if (trigger.test(commit)) { + if (filter.test(commit)) { return Optional.of(commit.getId()); } } @@ -908,7 +908,7 @@ public class GitOperations { }); } - private Predicate calculateTrigger(ModuleIteration module, String summary) { + private Predicate calculateFilter(ModuleIteration module, String summary) { Project project = module.getProject(); Ticket releaseTicket = issueTracker