opendev/gerrit
Code Issues Proposed changes

Don't set note_db_enabled in ServerInfo if false

Browse Source 
In the REST API we always return null for boolean values that are
false.

Change-Id: Idce6acc1a1ae7f81b49b8f2d2a9d49f368800088
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-06-21 07:29:43 +02:00
parent dca76072f4
commit 7c044328b0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/rest-api-config.txt
View File

@@ -1416,7 +1416,7 @@ information about Gerrit
Information about the configuration from the Information about the configuration from the
link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[ link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[
GerritInfo] entity. GerritInfo] entity.
|`note_db_enabled` || |`note_db_enabled` |not set if `false`|
Whether the NoteDB storage backend is fully enabled. Whether the NoteDB storage backend is fully enabled.
|`plugin ` || |`plugin ` ||
Information about Gerrit extensions by plugins as Information about Gerrit extensions by plugins as

2
gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
View File

@@ -114,7 +114,7 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
getDownloadInfo(downloadSchemes, downloadCommands, cloneCommands, getDownloadInfo(downloadSchemes, downloadCommands, cloneCommands,
archiveFormats); archiveFormats);
info.gerrit = getGerritInfo(config, allProjectsName, allUsersName); info.gerrit = getGerritInfo(config, allProjectsName, allUsersName);
info.noteDbEnabled = isNoteDbEnabled(); info.noteDbEnabled = toBoolean(isNoteDbEnabled());
info.plugin = getPluginInfo(); info.plugin = getPluginInfo();
info.sshd = getSshdInfo(config); info.sshd = getSshdInfo(config);
info.suggest = getSuggestInfo(config); info.suggest = getSuggestInfo(config);