Merge changes I6b261f98,I183548a8,I522966af,If178e387
* changes:
rest-api-config.txt: Fix monospace `plugin`
Document theme.* config options as GWT-only
GetServerInfo: Remove arguments from instance methods
GetServerInfo: Remove unnecessary MalformedURLException
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 7b04e37..ded6b9d 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -4629,7 +4629,7 @@
[[theme.backgroundColor]]theme.backgroundColor::
+
-Background color for the page, and major data tables like the all
+_(GWT UI only)_ Background color for the page, and major data tables like the all
open changes table or the account dashboard. The value must be a
valid HTML hex color code, or standard color name.
+
@@ -4637,7 +4637,7 @@
[[theme.topMenuColor]]theme.topMenuColor::
+
-This is the color of the main menu bar at the top of the page.
+_(GWT UI only)_ This is the color of the main menu bar at the top of the page.
The value must be a valid HTML hex color code, or standard color
name.
+
@@ -4645,53 +4645,52 @@
[[theme.textColor]]theme.textColor::
+
-Text color for the page, and major data tables like the all
-open changes table or the account dashboard. The value must be a
-valid HTML hex color code, or standard color name.
+_(GWT UI only)_ Text color for the page, and major data tables like the all open
+changes table or the account dashboard. The value must be a valid HTML hex color
+code, or standard color name.
+
By default dark grey, `353535`.
[[theme.trimColor]]theme.trimColor::
+
-Primary color used as a background color behind text. This is
-the color of the main menu bar at the top, of table headers,
-and of major UI areas that we want to offset from other portions
-of the page. The value must be a valid HTML hex color code, or
-standard color name.
+_(GWT UI only)_ Primary color used as a background color behind text. This is
+the color of the main menu bar at the top, of table headers, and of major UI
+areas that we want to offset from other portions of the page. The value must be
+a valid HTML hex color code, or standard color name.
+
By default a light grey, `EEEEEE`.
[[theme.selectionColor]]theme.selectionColor::
+
-Background color used within a trimColor area to denote the currently
-selected tab, or the background color used in a table to denote the
-currently selected row. The value must be a valid HTML hex color
-code, or standard color name.
+_(GWT UI only)_ Background color used within a trimColor area to denote the
+currently selected tab, or the background color used in a table to denote the
+currently selected row. The value must be a valid HTML hex color code, or
+standard color name.
+
By default a pale blue, `D8EDF9`.
[[theme.changeTableOutdatedColor]]theme.changeTableOutdatedColor::
+
-Background color used for patch outdated messages. The value must be
-a valid HTML hex color code, or standard color name.
+_(GWT UI only)_ Background color used for patch outdated messages. The value
+must be a valid HTML hex color code, or standard color name.
+
By default a shade of red, `F08080`.
[[theme.tableOddRowColor]]theme.tableOddRowColor::
+
-Background color for tables such as lists of open reviews for odd
-rows. This is so you can have a different color for odd and even
-rows of the table. The value must be a valid HTML hex color code,
-or standard color name.
+_(GWT UI only)_ Background color for tables such as lists of open reviews for
+odd rows. This is so you can have a different color for odd and even rows of
+the table. The value must be a valid HTML hex color code, or standard color
+name.
+
By default transparent.
[[theme.tableEvenRowColor]]theme.tableEvenRowColor::
+
-Background color for tables such as lists of open reviews for even
-rows. This is so you can have a different color for odd and even
-rows of the table. The value must be a valid HTML hex color code,
-or standard color name.
+_(GWT UI only)_ Background color for tables such as lists of open reviews for
+even rows. This is so you can have a different color for odd and even rows of
+the table. The value must be a valid HTML hex color code, or standard color
+name.
+
By default transparent.
diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt
index 4b8922a..3ec989e 100644
--- a/Documentation/rest-api-config.txt
+++ b/Documentation/rest-api-config.txt
@@ -1927,7 +1927,7 @@
GerritInfo] entity.
|`note_db_enabled` |not set if `false`|
Whether the NoteDb storage backend is fully enabled.
-|`plugin ` ||
+|`plugin` ||
Information about Gerrit extensions by plugins as
link:#plugin-config-info[PluginConfigInfo] entity.
|`receive` |optional|
diff --git a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
index b7931bd..66e9f90 100644
--- a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
+++ b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
@@ -64,7 +64,6 @@
import com.google.gerrit.server.restapi.change.AllowedFormats;
import com.google.gerrit.server.submit.MergeSuperSet;
import com.google.inject.Inject;
-import java.net.MalformedURLException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
@@ -149,44 +148,42 @@
}
@Override
- public ServerInfo apply(ConfigResource rsrc)
- throws MalformedURLException, PermissionBackendException {
+ public ServerInfo apply(ConfigResource rsrc) throws PermissionBackendException {
ServerInfo info = new ServerInfo();
- info.accounts = getAccountsInfo(accountVisibilityProvider);
- info.auth = getAuthInfo(authConfig, realm);
- info.change = getChangeInfo(config);
- info.download =
- getDownloadInfo(downloadSchemes, downloadCommands, cloneCommands, archiveFormats);
- info.gerrit = getGerritInfo(config, allProjectsName, allUsersName);
+ info.accounts = getAccountsInfo();
+ info.auth = getAuthInfo();
+ info.change = getChangeInfo();
+ info.download = getDownloadInfo();
+ info.gerrit = getGerritInfo();
info.noteDbEnabled = toBoolean(isNoteDbEnabled());
info.plugin = getPluginInfo();
if (Files.exists(sitePaths.site_theme)) {
info.defaultTheme = "/static/" + SitePaths.THEME_FILENAME;
}
- info.sshd = getSshdInfo(config);
- info.suggest = getSuggestInfo(config);
+ info.sshd = getSshdInfo();
+ info.suggest = getSuggestInfo();
- Map<String, String> urlAliases = getUrlAliasesInfo(config);
+ Map<String, String> urlAliases = getUrlAliasesInfo();
info.urlAliases = !urlAliases.isEmpty() ? urlAliases : null;
- info.user = getUserInfo(anonymousCowardName);
+ info.user = getUserInfo();
info.receive = getReceiveInfo();
return info;
}
- private AccountsInfo getAccountsInfo(AccountVisibilityProvider accountVisibilityProvider) {
+ private AccountsInfo getAccountsInfo() {
AccountsInfo info = new AccountsInfo();
info.visibility = accountVisibilityProvider.get();
return info;
}
- private AuthInfo getAuthInfo(AuthConfig cfg, Realm realm) throws PermissionBackendException {
+ private AuthInfo getAuthInfo() throws PermissionBackendException {
AuthInfo info = new AuthInfo();
- info.authType = cfg.getAuthType();
- info.useContributorAgreements = toBoolean(cfg.isUseContributorAgreements());
+ info.authType = authConfig.getAuthType();
+ info.useContributorAgreements = toBoolean(authConfig.isUseContributorAgreements());
info.editableAccountFields = new ArrayList<>(realm.getEditableFields());
- info.switchAccountUrl = cfg.getSwitchAccountUrl();
- info.gitBasicAuthPolicy = cfg.getGitBasicAuthPolicy();
+ info.switchAccountUrl = authConfig.getSwitchAccountUrl();
+ info.gitBasicAuthPolicy = authConfig.getGitBasicAuthPolicy();
if (info.useContributorAgreements != null) {
Collection<ContributorAgreement> agreements =
@@ -202,22 +199,22 @@
switch (info.authType) {
case LDAP:
case LDAP_BIND:
- info.registerUrl = cfg.getRegisterUrl();
- info.registerText = cfg.getRegisterText();
- info.editFullNameUrl = cfg.getEditFullNameUrl();
+ info.registerUrl = authConfig.getRegisterUrl();
+ info.registerText = authConfig.getRegisterText();
+ info.editFullNameUrl = authConfig.getEditFullNameUrl();
break;
case CUSTOM_EXTENSION:
- info.registerUrl = cfg.getRegisterUrl();
- info.registerText = cfg.getRegisterText();
- info.editFullNameUrl = cfg.getEditFullNameUrl();
- info.httpPasswordUrl = cfg.getHttpPasswordUrl();
+ info.registerUrl = authConfig.getRegisterUrl();
+ info.registerText = authConfig.getRegisterText();
+ info.editFullNameUrl = authConfig.getEditFullNameUrl();
+ info.httpPasswordUrl = authConfig.getHttpPasswordUrl();
break;
case HTTP:
case HTTP_LDAP:
- info.loginUrl = cfg.getLoginUrl();
- info.loginText = cfg.getLoginText();
+ info.loginUrl = authConfig.getLoginUrl();
+ info.loginText = authConfig.getLoginText();
break;
case CLIENT_SSL_CERT_LDAP:
@@ -230,40 +227,37 @@
return info;
}
- private ChangeConfigInfo getChangeInfo(Config cfg) {
+ private ChangeConfigInfo getChangeInfo() {
ChangeConfigInfo info = new ChangeConfigInfo();
- info.allowBlame = toBoolean(cfg.getBoolean("change", "allowBlame", true));
+ info.allowBlame = toBoolean(config.getBoolean("change", "allowBlame", true));
boolean hasAssigneeInIndex =
indexes.getSearchIndex().getSchema().hasField(ChangeField.ASSIGNEE);
info.showAssigneeInChangesTable =
toBoolean(
- cfg.getBoolean("change", "showAssigneeInChangesTable", false) && hasAssigneeInIndex);
- info.largeChange = cfg.getInt("change", "largeChange", 500);
+ config.getBoolean("change", "showAssigneeInChangesTable", false) && hasAssigneeInIndex);
+ info.largeChange = config.getInt("change", "largeChange", 500);
info.replyTooltip =
- Optional.ofNullable(cfg.getString("change", null, "replyTooltip")).orElse("Reply and score")
+ Optional.ofNullable(config.getString("change", null, "replyTooltip"))
+ .orElse("Reply and score")
+ " (Shortcut: a)";
info.replyLabel =
- Optional.ofNullable(cfg.getString("change", null, "replyLabel")).orElse("Reply") + "\u2026";
+ Optional.ofNullable(config.getString("change", null, "replyLabel")).orElse("Reply")
+ + "\u2026";
info.updateDelay =
- (int) ConfigUtil.getTimeUnit(cfg, "change", null, "updateDelay", 300, TimeUnit.SECONDS);
- info.submitWholeTopic = MergeSuperSet.wholeTopicEnabled(cfg);
+ (int) ConfigUtil.getTimeUnit(config, "change", null, "updateDelay", 300, TimeUnit.SECONDS);
+ info.submitWholeTopic = MergeSuperSet.wholeTopicEnabled(config);
info.disablePrivateChanges =
- toBoolean(config.getBoolean("change", null, "disablePrivateChanges", false));
+ toBoolean(this.config.getBoolean("change", null, "disablePrivateChanges", false));
return info;
}
- private DownloadInfo getDownloadInfo(
- DynamicMap<DownloadScheme> downloadSchemes,
- DynamicMap<DownloadCommand> downloadCommands,
- DynamicMap<CloneCommand> cloneCommands,
- AllowedFormats archiveFormats) {
+ private DownloadInfo getDownloadInfo() {
DownloadInfo info = new DownloadInfo();
info.schemes = new HashMap<>();
for (DynamicMap.Entry<DownloadScheme> e : downloadSchemes) {
DownloadScheme scheme = e.getProvider().get();
if (scheme.isEnabled() && scheme.getUrl("${project}") != null) {
- info.schemes.put(
- e.getExportName(), getDownloadSchemeInfo(scheme, downloadCommands, cloneCommands));
+ info.schemes.put(e.getExportName(), getDownloadSchemeInfo(scheme));
}
}
info.archives =
@@ -271,10 +265,7 @@
return info;
}
- private DownloadSchemeInfo getDownloadSchemeInfo(
- DownloadScheme scheme,
- DynamicMap<DownloadCommand> downloadCommands,
- DynamicMap<CloneCommand> cloneCommands) {
+ private DownloadSchemeInfo getDownloadSchemeInfo(DownloadScheme scheme) {
DownloadSchemeInfo info = new DownloadSchemeInfo();
info.url = scheme.getUrl("${project}");
info.isAuthRequired = toBoolean(scheme.isAuthRequired());
@@ -304,17 +295,16 @@
return info;
}
- private GerritInfo getGerritInfo(
- Config cfg, AllProjectsName allProjectsName, AllUsersName allUsersName) {
+ private GerritInfo getGerritInfo() {
GerritInfo info = new GerritInfo();
info.allProjects = allProjectsName.get();
info.allUsers = allUsersName.get();
- info.reportBugUrl = cfg.getString("gerrit", null, "reportBugUrl");
- info.reportBugText = cfg.getString("gerrit", null, "reportBugText");
- info.docUrl = getDocUrl(cfg);
+ info.reportBugUrl = config.getString("gerrit", null, "reportBugUrl");
+ info.reportBugText = config.getString("gerrit", null, "reportBugText");
+ info.docUrl = getDocUrl();
info.docSearch = docSearcher.isAvailable();
info.editGpgKeys =
- toBoolean(enableSignedPush && cfg.getBoolean("gerrit", null, "editGpgKeys", true));
+ toBoolean(enableSignedPush && config.getBoolean("gerrit", null, "editGpgKeys", true));
info.webUis = EnumSet.noneOf(UiType.class);
info.webUis.add(UiType.POLYGERRIT);
if (gerritOptions.enableGwtUi()) {
@@ -323,8 +313,8 @@
return info;
}
- private String getDocUrl(Config cfg) {
- String docUrl = cfg.getString("gerrit", null, "docUrl");
+ private String getDocUrl() {
+ String docUrl = config.getString("gerrit", null, "docUrl");
if (Strings.isNullOrEmpty(docUrl)) {
return null;
}
@@ -352,18 +342,18 @@
return info;
}
- private Map<String, String> getUrlAliasesInfo(Config cfg) {
+ private Map<String, String> getUrlAliasesInfo() {
Map<String, String> urlAliases = new HashMap<>();
- for (String subsection : cfg.getSubsections(URL_ALIAS)) {
+ for (String subsection : config.getSubsections(URL_ALIAS)) {
urlAliases.put(
- cfg.getString(URL_ALIAS, subsection, KEY_MATCH),
- cfg.getString(URL_ALIAS, subsection, KEY_TOKEN));
+ config.getString(URL_ALIAS, subsection, KEY_MATCH),
+ config.getString(URL_ALIAS, subsection, KEY_TOKEN));
}
return urlAliases;
}
- private SshdInfo getSshdInfo(Config cfg) {
- String[] addr = cfg.getStringList("sshd", null, "listenAddress");
+ private SshdInfo getSshdInfo() {
+ String[] addr = config.getStringList("sshd", null, "listenAddress");
if (addr.length == 1 && isOff(addr[0])) {
return null;
}
@@ -376,13 +366,13 @@
|| "no".equalsIgnoreCase(listenHostname);
}
- private SuggestInfo getSuggestInfo(Config cfg) {
+ private SuggestInfo getSuggestInfo() {
SuggestInfo info = new SuggestInfo();
- info.from = cfg.getInt("suggest", "from", 0);
+ info.from = config.getInt("suggest", "from", 0);
return info;
}
- private UserConfigInfo getUserInfo(String anonymousCowardName) {
+ private UserConfigInfo getUserInfo() {
UserConfigInfo info = new UserConfigInfo();
info.anonymousCowardName = anonymousCowardName;
return info;
