diff --git a/release-tools/pom.xml b/release-tools/pom.xml
index 42b3776..43fc6fa 100644
--- a/release-tools/pom.xml
+++ b/release-tools/pom.xml
@@ -14,6 +14,7 @@
 
 	<properties>
 		<spring-plugin.version>2.0.0.RELEASE</spring-plugin.version>
+		<lombok.version>1.18.18</lombok.version>
 	</properties>
 
 	<dependencies>
diff --git a/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java b/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java
index d6476ae..1b904b7 100644
--- a/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java
@@ -142,9 +142,10 @@ class IssueTrackerCommands extends TimedCommand {
 			@CliOption(key = "module") String moduleName,
 			@CliOption(key = "filter-release-tickets") Boolean filterReleaseTickets) {
 
+		Predicate<Ticket> notResolved = it -> !it.isResolved();
+
 		return getTickets(iteration, moduleName,
-				it -> !it.isResolved() && ((filterReleaseTickets == null && !it.isReleaseTicket())
-						|| (filterReleaseTickets != null && filterReleaseTickets && !it.isReleaseTicket())));
+				notResolved.and(getFilterPredicate(filterReleaseTickets == null || filterReleaseTickets)));
 	}
 
 	@CliCommand("tracker all-tickets")
@@ -152,8 +153,11 @@ class IssueTrackerCommands extends TimedCommand {
 			@CliOption(key = "module") String moduleName,
 			@CliOption(key = "filter-release-tickets") Boolean filterReleaseTickets) {
 
-		return getTickets(iteration, moduleName, it -> (filterReleaseTickets == null && !it.isReleaseTicket())
-				|| (filterReleaseTickets != null && filterReleaseTickets && !it.isReleaseTicket()));
+		return getTickets(iteration, moduleName, getFilterPredicate(filterReleaseTickets == null || filterReleaseTickets));
+	}
+
+	private static Predicate<Ticket> getFilterPredicate(boolean filterReleaseTickets) {
+		return it -> filterReleaseTickets == !it.isReleaseTicket();
 	}
 
 	private String getTickets(TrainIteration iteration, String moduleName, Predicate<Ticket> ticketPredicate) {