Merge "Suppress deprecation warnings related to ChangeField.SORTKEY"

gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeSchemas.java

@@ -29,7 +29,7 @@ import java.util.Map;
 
 /** Secondary index schemas for changes. */
 public class ChangeSchemas {
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "deprecation"})
   static final Schema<ChangeData> V1 = release(
         ChangeField.LEGACY_ID,
         ChangeField.ID,

gerrit-server/src/main/java/com/google/gerrit/server/query/change/SortKeyPredicate.java

@@ -25,6 +25,7 @@ import com.google.inject.Provider;
 public abstract class SortKeyPredicate extends IndexPredicate<ChangeData> {
   protected final Provider<ReviewDb> dbProvider;
 
+  @SuppressWarnings("deprecation")
   SortKeyPredicate(Provider<ReviewDb> dbProvider, String name, String value) {
     super(ChangeField.SORTKEY, name, value);
     this.dbProvider = dbProvider;