commit 4bf5604ccd20c0437381773446c2749eb08a653c
author Edwin Kempin <ekempin@google.com> Wed Oct 12 16:36:32 2022 +0200
committer Edwin Kempin <ekempin@google.com> Wed Oct 12 16:36:32 2022 +0200
tree f34edae1e0b8c2251df5793ac3c9400c4d071b61
parent 8bd6bf029b2827f22fd44691f6788354752769af

Fix build in Eclipse

Release-Notes: skip
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I3a688df38d77de96868b7d0585cb7564654a46ed

java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java

diff --git a/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java b/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
index 0ce08b8..82f9b87 100644
--- a/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
+++ b/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
@@ -17,6 +17,8 @@
 import static com.google.gerrit.index.SchemaUtil.schema;
 
 import com.google.common.collect.ImmutableList;
+import com.google.gerrit.index.FieldDef;
+import com.google.gerrit.index.IndexedField;
 import com.google.gerrit.index.Schema;
 import com.google.gerrit.index.SchemaDefinitions;
 import com.google.gerrit.server.query.change.ChangeData;
@@ -33,7 +35,7 @@
   static final Schema<ChangeData> V74 =
       schema(
           /* version= */ 74,
-          ImmutableList.of(
+          ImmutableList.<FieldDef<ChangeData, ?>>of(
               ChangeField.ADDED,
               ChangeField.APPROVAL,
               ChangeField.ASSIGNEE,
@@ -100,13 +102,13 @@
               ChangeField.UPDATED,
               ChangeField.UPLOADER,
               ChangeField.WIP),
-          ImmutableList.of(
+          ImmutableList.<IndexedField<ChangeData, ?>>of(
               ChangeField.SUBMISSIONID_FIELD,
               ChangeField.STATUS_FIELD,
               ChangeField.PROJECT_FIELD,
               ChangeField.REF_FIELD,
               ChangeField.TOPIC_FIELD),
-          ImmutableList.of(
+          ImmutableList.<IndexedField<ChangeData, ?>.SearchSpec>of(
               ChangeField.EXACT_TOPIC,
               ChangeField.FUZZY_TOPIC,
               ChangeField.SUBMISSIONID_SPEC,

javatests/com/google/gerrit/server/index/change/FakeChangeIndex.java

diff --git a/javatests/com/google/gerrit/server/index/change/FakeChangeIndex.java b/javatests/com/google/gerrit/server/index/change/FakeChangeIndex.java
index 451126c..537867a 100644
--- a/javatests/com/google/gerrit/server/index/change/FakeChangeIndex.java
+++ b/javatests/com/google/gerrit/server/index/change/FakeChangeIndex.java
@@ -18,6 +18,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.gerrit.entities.Change;
+import com.google.gerrit.index.FieldDef;
+import com.google.gerrit.index.IndexedField;
 import com.google.gerrit.index.QueryOptions;
 import com.google.gerrit.index.Schema;
 import com.google.gerrit.index.query.FieldBundle;
@@ -33,16 +35,16 @@
   static final Schema<ChangeData> V1 =
       schema(
           1,
-          ImmutableList.of(),
-          ImmutableList.of(ChangeField.STATUS_FIELD),
-          ImmutableList.of(ChangeField.STATUS_SPEC));
+          ImmutableList.<FieldDef<ChangeData, ?>>of(),
+          ImmutableList.<IndexedField<ChangeData, ?>>of(ChangeField.STATUS_FIELD),
+          ImmutableList.<IndexedField<ChangeData, ?>.SearchSpec>of(ChangeField.STATUS_SPEC));
 
   static final Schema<ChangeData> V2 =
       schema(
           2,
-          ImmutableList.of(ChangeField.PATH, ChangeField.UPDATED),
-          ImmutableList.of(ChangeField.STATUS_FIELD),
-          ImmutableList.of(ChangeField.STATUS_SPEC));
+          ImmutableList.<FieldDef<ChangeData, ?>>of(ChangeField.PATH, ChangeField.UPDATED),
+          ImmutableList.<IndexedField<ChangeData, ?>>of(ChangeField.STATUS_FIELD),
+          ImmutableList.<IndexedField<ChangeData, ?>.SearchSpec>of(ChangeField.STATUS_SPEC));
 
   private static class Source implements ChangeDataSource {
     private final Predicate<ChangeData> p;