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

Polishing.

Browse Source 
Simplify filter predicate.

See #176.
This commit is contained in:
Mark Paluch
2021-03-17 10:44:50 +01:00
parent 272545aac8
commit a69fd8cb1f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release-tools/pom.xml
View File

@@ -14,6 +14,7 @@
<properties> <properties>
<spring-plugin.version>2.0.0.RELEASE</spring-plugin.version> <spring-plugin.version>2.0.0.RELEASE</spring-plugin.version>
<lombok.version>1.18.18</lombok.version>
</properties> </properties>
<dependencies> <dependencies>

12
release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java
View File

@@ -142,9 +142,10 @@ class IssueTrackerCommands extends TimedCommand {
@CliOption(key = "module") String moduleName, @CliOption(key = "module") String moduleName,
@CliOption(key = "filter-release-tickets") Boolean filterReleaseTickets) { @CliOption(key = "filter-release-tickets") Boolean filterReleaseTickets) {
Predicate<Ticket> notResolved = it -> !it.isResolved();
return getTickets(iteration, moduleName, return getTickets(iteration, moduleName,
it -> !it.isResolved() && ((filterReleaseTickets == null && !it.isReleaseTicket()) notResolved.and(getFilterPredicate(filterReleaseTickets == null || filterReleaseTickets)));
|| (filterReleaseTickets != null && filterReleaseTickets && !it.isReleaseTicket())));
} }
@CliCommand("tracker all-tickets") @CliCommand("tracker all-tickets")
@@ -152,8 +153,11 @@ class IssueTrackerCommands extends TimedCommand {
@CliOption(key = "module") String moduleName, @CliOption(key = "module") String moduleName,
@CliOption(key = "filter-release-tickets") Boolean filterReleaseTickets) { @CliOption(key = "filter-release-tickets") Boolean filterReleaseTickets) {
return getTickets(iteration, moduleName, it -> (filterReleaseTickets == null && !it.isReleaseTicket()) return getTickets(iteration, moduleName, getFilterPredicate(filterReleaseTickets == null || filterReleaseTickets));
|| (filterReleaseTickets != null && filterReleaseTickets && !it.isReleaseTicket())); }
private static Predicate<Ticket> getFilterPredicate(boolean filterReleaseTickets) {
return it -> filterReleaseTickets == !it.isReleaseTicket();
} }
private String getTickets(TrainIteration iteration, String moduleName, Predicate<Ticket> ticketPredicate) { private String getTickets(TrainIteration iteration, String moduleName, Predicate<Ticket> ticketPredicate) {