diff options
| author | Edwin Kempin <ekempin@google.com> | 2022-11-10 13:35:12 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2022-11-13 12:50:13 +0100 |
| commit | aec2bead1ba39b32a75bffc005e2f66ad22c65fa (patch) | |
| tree | 55ef1e45f3966e02b03ea40b1150dda23dbd8344 | |
| parent | 838ea2ff9b9d41a47bb55112166f3c6276e365d9 (diff) | |
Fix recently introduced issues that are flagged as warnings
* ChangeIndexRewriterTest: OrPredicate is a raw type. References to
generic type OrPredicate<T> should be parameterized
* ChangeStatusPredicate: The enum constant NEW should have a
corresponding case label in this enum switch on Change.Status.
* AndSource: Type safety: Unchecked cast from Predicate<T> to
DataSource<T>
Release-Notes: skip
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I01413362ffd402f8f20ec929cd86610f51f50050
(cherry picked from commit fec2b0ce0d51cbb59106e9b055272377b1e6173d)
3 files changed, 3 insertions, 2 deletions
diff --git a/java/com/google/gerrit/index/query/AndSource.java b/java/com/google/gerrit/index/query/AndSource.java index f7feaa0d35..ebd115bcf4 100644 --- a/java/com/google/gerrit/index/query/AndSource.java +++ b/java/com/google/gerrit/index/query/AndSource.java @@ -62,7 +62,7 @@ public class AndSource<T> extends AndPredicate<T> implements DataSource<T> { int minCardinality = Integer.MAX_VALUE; for (Predicate<T> p : getChildren()) { if (p instanceof DataSource) { - DataSource<T> source = (DataSource<T>) p; + DataSource<?> source = (DataSource<?>) p; int cardinality = source.getCardinality(); c = Math.min(c, source.getCardinality()); diff --git a/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java b/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java index ef902b58e7..47445f6e4b 100644 --- a/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java +++ b/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java @@ -155,6 +155,7 @@ public final class ChangeStatusPredicate extends ChangeIndexPredicate implements return 50_000; case ABANDONED: return 50_000; + case NEW: default: return 2000; } diff --git a/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java b/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java index 0a4f31cb0f..8c25edf956 100644 --- a/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java +++ b/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java @@ -130,7 +130,7 @@ public class ChangeIndexRewriterTest { assertThat(out.getChild(0)).isEqualTo(query(firstIndexedSubQuery)); assertThat(out.getChild(1).getClass()).isSameInstanceAs(OrPredicate.class); - OrPredicate indexedSubTree = (OrPredicate) out.getChild(1); + OrPredicate<ChangeData> indexedSubTree = (OrPredicate<ChangeData>) out.getChild(1); Predicate<ChangeData> secondIndexedSubQuery = parse("foo:a OR file:b"); assertThat(indexedSubTree.getChildren()) |