Merge branch 'stable-3.0'
* stable-3.0:
Adapt to Project.NameKey refactoring
ListUsersCommand: Fix NullPointerException when username is not set
Change-Id: I3230fa0a57005efc25e9d6f4adf92193dfaf19c9
diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/GetFullPathCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/GetFullPathCommand.java
index 12be859..ae16ef6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/GetFullPathCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/GetFullPathCommand.java
@@ -52,7 +52,7 @@
if (localDiskRepositoryManager == null) {
throw new UnloggedFailure(1, "Command only works with disk based repository managers");
}
- Project.NameKey nameKey = new Project.NameKey(projectName);
+ Project.NameKey nameKey = Project.nameKey(projectName);
stdout.println(
localDiskRepositoryManager
.getBasePath(nameKey)
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 78ac5ab..2c7062b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
@@ -71,7 +71,7 @@
.append(account.getId().toString())
.append(" |")
.append(
- Strings.isNullOrEmpty(accountState.getUserName().get())
+ accountState.getUserName().isPresent()
? ""
: " " + accountState.getUserName().get())
.append(" |")
diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java
index 367ed4b..1a79ee7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccessCommand.java
@@ -67,7 +67,7 @@
if (projectName.isEmpty()) {
throw new UnloggedFailure(1, "Please specify a project to show access for");
}
- Project.NameKey nameKey = new Project.NameKey(projectName);
+ Project.NameKey nameKey = Project.nameKey(projectName);
permissionGroupWidth = wide ? Integer.MAX_VALUE : columns - 9 - 5 - 9;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java
index 4ed3b8c..6d0e4ca 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowRepoAccountAccessCommand.java
@@ -112,7 +112,7 @@
+ " Tip: Try double-escaping spaces, for example: \"--user Last,\\\\ First\"");
}
- Project.NameKey nameKey = new Project.NameKey(projectName);
+ Project.NameKey nameKey = Project.nameKey(projectName);
try {
MetaDataUpdate md = metaDataUpdateFactory.create(nameKey);
