Skip to content

Commit 3ed9350

Browse files
Remove unnecessary check for states.isEmpty() in predicates, enforce states is not empty in validate()
1 parent 548fe0e commit 3ed9350

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ public ActionRequestValidationException validate() {
195195
} else if (after != null && fromSortValue != null) {
196196
validationException = addValidationError("can't use after and from_sort_value simultaneously", validationException);
197197
}
198+
if (states.isEmpty()) {
199+
validationException = addValidationError("states is empty", validationException);
200+
}
198201
return validationException;
199202
}
200203

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -580,10 +580,7 @@ private boolean matchesPredicates(SnapshotId snapshotId, RepositoryData reposito
580580

581581
final var details = repositoryData.getSnapshotDetails(snapshotId);
582582

583-
if (states.isEmpty() == false
584-
&& details != null
585-
&& details.getSnapshotState() != null
586-
&& states.contains(details.getSnapshotState()) == false) {
583+
if (details != null && details.getSnapshotState() != null && states.contains(details.getSnapshotState()) == false) {
587584
return false;
588585
}
589586

@@ -599,7 +596,7 @@ private boolean matchesPredicates(SnapshotInfo snapshotInfo) {
599596
return false;
600597
}
601598

602-
if (states.isEmpty() == false && snapshotInfo.state() != null && states.contains(snapshotInfo.state()) == false) {
599+
if (snapshotInfo.state() != null && states.contains(snapshotInfo.state()) == false) {
603600
return false;
604601
}
605602

0 commit comments

Comments
 (0)