Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Improve method naming.

Closes #168.
This commit is contained in:
Mark Paluch
2021-01-13 15:18:29 +01:00
parent add132d009
commit a8e3b291db
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
View File

@@ -883,23 +883,23 @@ public class GitOperations {
private ObjectId findRequiredCommit(ModuleIteration module, String summary) {
Predicate<RevCommit> trigger = calculateTrigger(module, summary);
Predicate<RevCommit> 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<ObjectId> findCommit(ModuleIteration module, String summary) {
return findCommitWithTrigger(module.getProject(), calculateTrigger(module, summary));
return findCommit(module.getProject(), calculateFilter(module, summary));
}
private Optional<ObjectId> findCommitWithTrigger(Project project, Predicate<RevCommit> trigger) {
private Optional<ObjectId> findCommit(Project project, Predicate<RevCommit> 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<RevCommit> calculateTrigger(ModuleIteration module, String summary) {
private Predicate<RevCommit> calculateFilter(ModuleIteration module, String summary) {
Project project = module.getProject();
Ticket releaseTicket = issueTracker