Move DownloadCommand enum from GeneralPreferencesInfo to DownloadConfig The correlative download_commands plugin change is: https://gerrit-review.git.corp.google.com/c/plugins/download-commands/+/381394 Change-Id: I8d87dee5450d5e0bbeedeac7cf0fbf1bd0796445 Bug: Google b/289356590 Release-Notes: skip
diff --git a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java index 020351b..262ae37 100644 --- a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java +++ b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java
@@ -22,16 +22,6 @@ /** Default number of items to display per page. */ public static final int DEFAULT_PAGESIZE = 25; - /** Preferred method to download a change. */ - public enum DownloadCommand { - PULL, - CHECKOUT, - CHERRY_PICK, - FORMAT_PATCH, - BRANCH, - RESET, - } - public enum DateFormat { /** US style dates: Apr 27, Feb 14, 2010 */ STD("MMM d", "MMM d, yyyy"),
diff --git a/java/com/google/gerrit/server/config/DownloadConfig.java b/java/com/google/gerrit/server/config/DownloadConfig.java index 4fdbd4a..28baa1a 100644 --- a/java/com/google/gerrit/server/config/DownloadConfig.java +++ b/java/com/google/gerrit/server/config/DownloadConfig.java
@@ -19,7 +19,6 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; import com.google.gerrit.entities.CoreDownloadSchemes; -import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DownloadCommand; import com.google.gerrit.server.change.ArchiveFormatInternal; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -41,6 +40,16 @@ */ @Singleton public class DownloadConfig { + /** Preferred method to download a change. */ + public enum DownloadCommand { + PULL, + CHECKOUT, + CHERRY_PICK, + FORMAT_PATCH, + BRANCH, + RESET, + } + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private final ImmutableSet<String> downloadSchemes;
diff --git a/plugins/download-commands b/plugins/download-commands index b90e523..42b608a 160000 --- a/plugins/download-commands +++ b/plugins/download-commands
@@ -1 +1 @@ -Subproject commit b90e523f589a0e2902823233010163f453243926 +Subproject commit 42b608a64bdb1350656b2ca09643ed4173cd6e73