opendev/gerrit
Code Issues Proposed changes

Revert "ListPlugins: Remove deprecated --format option"

Browse Source 
Removing the --format option from the REST API had the side effect of
also removing it from the 'plugin ls' ssh command.

Removing the option from the 'plugin ls' is a breaking change for some
users, so put it back.

This reverts commit 3bbd3c313f.

Change-Id: I2f4af48f16273f4875b28349e5afd707f2103bec
This commit is contained in:
David Pursehouse
2016-11-17 23:44:10 -08:00
parent 2682094831
commit 0ba528039e
1 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java
View File

@@ -40,6 +40,10 @@ import java.util.TreeMap;
public class ListPlugins implements RestReadView<TopLevelResource> {
private final PluginLoader pluginLoader;
@Deprecated
@Option(name = "--format", usage = "(deprecated) output format")
private OutputFormat format = OutputFormat.TEXT;
@Option(name = "--all", aliases = {"-a"}, usage = "List all plugins, including disabled plugins")
private boolean all;
@@ -48,12 +52,23 @@ public class ListPlugins implements RestReadView<TopLevelResource> {
this.pluginLoader = pluginLoader;
}
public OutputFormat getFormat() {
return format;
}
public ListPlugins setFormat(OutputFormat fmt) {
this.format = fmt;
return this;
}
@Override
public Object apply(TopLevelResource resource) {
format = OutputFormat.JSON;
return display(null);
}
public JsonElement display(PrintWriter stdout) {
Map<String, PluginInfo> output = new TreeMap<>();
List<Plugin> plugins = Lists.newArrayList(pluginLoader.getPlugins(all));
Collections.sort(plugins, new Comparator<Plugin>() {
@Override
@@ -62,24 +77,30 @@ public class ListPlugins implements RestReadView<TopLevelResource> {
}
});
if (stdout == null) {
Map<String, PluginInfo> output = new TreeMap<>();
for (Plugin p : plugins) {
PluginInfo info = new PluginInfo(p);
if (!format.isJson()) {
stdout.format("%-30s %-10s %-8s %s\n", "Name", "Version", "Status", "File");
stdout.print("-------------------------------------------------------------------------------\n");
}
for (Plugin p : plugins) {
PluginInfo info = new PluginInfo(p);
if (format.isJson()) {
output.put(p.getName(), info);
} else {
stdout.format("%-30s %-10s %-8s %s\n", p.getName(),
Strings.nullToEmpty(info.version),
p.isDisabled() ? "DISABLED" : "ENABLED",
p.getSrcFile().getFileName());
}
}
if (stdout == null) {
return OutputFormat.JSON.newGson().toJsonTree(
output,
new TypeToken<Map<String, Object>>() {}.getType());
}
stdout.format("%-30s %-10s %-8s %s\n", "Name", "Version", "Status", "File");
stdout.print("-------------------------------------------------------------------------------\n");
for (Plugin p : plugins) {
PluginInfo info = new PluginInfo(p);
stdout.format("%-30s %-10s %-8s %s\n", p.getName(),
Strings.nullToEmpty(info.version),
p.isDisabled() ? "DISABLED" : "ENABLED",
p.getSrcFile().getFileName());
} else if (format.isJson()) {
format.newGson().toJson(output,
new TypeToken<Map<String, PluginInfo>>() {}.getType(), stdout);
stdout.print('\n');
}
stdout.flush();