Remove unnecessary @Listen annotations These are bound using modules and do not rely on auto-registration. Change-Id: I87d0609e481e67912a9d796a84e642606ffbaf24
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/command/CheckoutCommand.java b/src/main/java/com/googlesource/gerrit/plugins/download/command/CheckoutCommand.java index 349e56a..b415813 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/command/CheckoutCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/command/CheckoutCommand.java
@@ -16,19 +16,17 @@ import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand.CHECKOUT; -import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.server.config.DownloadConfig; import com.google.inject.Inject; -@Listen -public class CheckoutCommand extends GitDownloadCommand { +class CheckoutCommand extends GitDownloadCommand { @Inject CheckoutCommand(DownloadConfig downloadConfig) { super(downloadConfig, CHECKOUT); } @Override - public String getCommand(String url, String ref) { + String getCommand(String url, String ref) { return "git fetch " + url + " " + ref + " && git checkout FETCH_HEAD"; } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/command/CherryPickCommand.java b/src/main/java/com/googlesource/gerrit/plugins/download/command/CherryPickCommand.java index a357aa8..5490848 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/command/CherryPickCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/command/CherryPickCommand.java
@@ -16,19 +16,17 @@ import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand.CHERRY_PICK; -import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.server.config.DownloadConfig; import com.google.inject.Inject; -@Listen -public class CherryPickCommand extends GitDownloadCommand { +class CherryPickCommand extends GitDownloadCommand { @Inject CherryPickCommand(DownloadConfig downloadConfig) { super(downloadConfig, CHERRY_PICK); } @Override - public String getCommand(String url, String ref) { + String getCommand(String url, String ref) { return "git fetch " + url + " " + ref + " && git cherry-pick FETCH_HEAD"; } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/command/FormatPatchCommand.java b/src/main/java/com/googlesource/gerrit/plugins/download/command/FormatPatchCommand.java index aefa23f..67e1d17 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/command/FormatPatchCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/command/FormatPatchCommand.java
@@ -16,19 +16,17 @@ import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand.FORMAT_PATCH; -import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.server.config.DownloadConfig; import com.google.inject.Inject; -@Listen -public class FormatPatchCommand extends GitDownloadCommand { +class FormatPatchCommand extends GitDownloadCommand { @Inject FormatPatchCommand(DownloadConfig downloadConfig) { super(downloadConfig, FORMAT_PATCH); } @Override - public String getCommand(String url, String ref) { + String getCommand(String url, String ref) { return "git fetch " + url + " " + ref + " && git format-patch -1 --stdout FETCH_HEAD"; } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java b/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java index 61e3fbd..eaeb82c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java
@@ -26,7 +26,7 @@ import com.googlesource.gerrit.plugins.download.scheme.HttpScheme; import com.googlesource.gerrit.plugins.download.scheme.SshScheme; -public abstract class GitDownloadCommand extends DownloadCommand { +abstract class GitDownloadCommand extends DownloadCommand { private final boolean commandAllowed; GitDownloadCommand( @@ -56,5 +56,5 @@ } } - public abstract String getCommand(String url, String ref); + abstract String getCommand(String url, String ref); }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/command/PullCommand.java b/src/main/java/com/googlesource/gerrit/plugins/download/command/PullCommand.java index d86a630..b70ff56 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/command/PullCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/command/PullCommand.java
@@ -16,19 +16,17 @@ import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand.PULL; -import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.server.config.DownloadConfig; import com.google.inject.Inject; -@Listen -public class PullCommand extends GitDownloadCommand { +class PullCommand extends GitDownloadCommand { @Inject PullCommand(DownloadConfig downloadConfig) { super(downloadConfig, PULL); } @Override - public String getCommand(String url, String ref) { + String getCommand(String url, String ref) { return "git pull " + url + " " + ref; } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/command/RepoCommand.java b/src/main/java/com/googlesource/gerrit/plugins/download/command/RepoCommand.java index 2edfac3..6145d98 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/command/RepoCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/command/RepoCommand.java
@@ -23,7 +23,7 @@ import com.googlesource.gerrit.plugins.download.scheme.RepoScheme; -public class RepoCommand extends DownloadCommand { +class RepoCommand extends DownloadCommand { private final boolean commandAllowed; @Inject
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/RepoScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/RepoScheme.java index 9147d12..f1abc25 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/RepoScheme.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/RepoScheme.java
@@ -16,14 +16,11 @@ import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.REPO_DOWNLOAD; -import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.extensions.config.DownloadScheme; import com.google.gerrit.server.config.DownloadConfig; import com.google.inject.Inject; -@Listen public class RepoScheme extends DownloadScheme { - private final boolean schemeAllowed; @Inject
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java index 5e3c0da..f662060 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java +++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
@@ -18,7 +18,6 @@ import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.SSH; import com.google.gerrit.common.Nullable; -import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.extensions.config.DownloadScheme; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.CanonicalWebUrl; @@ -31,7 +30,6 @@ import java.net.URL; import java.util.List; -@Listen public class SshScheme extends DownloadScheme { private final String sshdAddress; private final Provider<CurrentUser> userProvider;