Merge branch 'stable-3.2' into master
* stable-3.2:
ListUsersCommand: Fix ternary operation logic
Upgrade bazlets to latest stable-3.1 to build with 3.1.12 API
Upgrade bazlets to latest stable-3.2 to build with 3.2.6 API
Upgrade bazlets to latest stable-3.1 to build with 3.1.11 API
Change-Id: I2a189d7ce7253fb1337a0d2caf6af8d1e7e2cc77
diff --git a/WORKSPACE b/WORKSPACE
index 6ed3a15..e85a976 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "cf0bbc90e09a8a1d7c042d79f1555e3fa40984e1",
+ commit = "8dc0767541f16b35d2136eccebffd9ebe2b81133",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
index 652ccb3..51d81c9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
@@ -70,8 +70,7 @@
new StringBuilder()
.append(account.id().toString())
.append(" |")
- .append(
- accountState.userName().isPresent() ? "" : " " + accountState.userName().get())
+ .append(accountState.userName().map(userName -> " " + userName).orElse(""))
.append(" |")
.append(Strings.isNullOrEmpty(account.fullName()) ? "" : " " + account.fullName())
.append(" |")
