Adapt to The Account- and Project-class using AutoValue
The Account- and Project-class were changed to use AutoValue in Gerrit
core. This required adaptations in the serviceuser plugin, which weren't
done yet.
Change-Id: I3f011068e51ea6a97c734903c0eeeb16346196e7
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
index 85da7b0..55bd815 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
@@ -77,7 +77,7 @@
String[] groups = cfg.getStringList("group");
info.groups = new TreeMap<>();
for (String g : groups) {
- Optional<InternalGroup> group = groupCache.get(new AccountGroup.NameKey(g));
+ Optional<InternalGroup> group = groupCache.get(AccountGroup.nameKey(g));
if (group.isPresent()) {
GroupInfo groupInfo = groupJson.format(new InternalGroupDescription(group.get()));
groupInfo.name = null;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetServiceUser.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetServiceUser.java
index c4a6e7d..62bd42f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetServiceUser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetServiceUser.java
@@ -71,7 +71,7 @@
ServiceUserInfo info = new ServiceUserInfo(getAccount.get().apply(rsrc));
AccountLoader al = accountLoader.create(true);
- info.createdBy = al.get(new Account.Id(db.getInt(USER, username, KEY_CREATOR_ID, -1)));
+ info.createdBy = al.get(Account.id(db.getInt(USER, username, KEY_CREATOR_ID, -1)));
al.fill();
info.createdAt = db.getString(USER, username, KEY_CREATED_AT);
info.inactive = !rsrc.getUser().getAccount().isActive() ? true : null;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ListServiceUsers.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ListServiceUsers.java
index 0b93721..cb80b09 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ListServiceUsers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ListServiceUsers.java
@@ -86,8 +86,7 @@
.get()
.parse(
new ConfigResource(),
- IdString.fromDecoded(
- String.valueOf(account.get().getAccount().getId().get())));
+ IdString.fromDecoded(String.valueOf(account.get().account().id().get())));
info = getServiceUser.get().apply(serviceUserResource);
info.username = null;
accounts.put(username, info);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/RefUpdateListener.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/RefUpdateListener.java
index c4090ac..f56679d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/RefUpdateListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/RefUpdateListener.java
@@ -73,7 +73,7 @@
@Override
public Project.NameKey getProjectNameKey() {
- return new Project.NameKey(event.getProjectName());
+ return Project.nameKey(event.getProjectName());
}
@Override
@@ -99,7 +99,7 @@
}
private void createServiceUserNotes(Event e) {
- Project.NameKey projectName = new Project.NameKey(e.getProjectName());
+ Project.NameKey projectName = Project.nameKey(e.getProjectName());
try (Repository git = repoManager.openRepository(projectName)) {
CreateServiceUserNotes crn = serviceUserNotesFactory.create(projectName, git);
crn.createNotes(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java
index 066898f..88bfbde 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java
@@ -101,7 +101,7 @@
}
} else if (!((IdentifiedUser) user)
.getAccountId()
- .equals(new Account.Id(storage.get().getInt(USER, username, KEY_CREATOR_ID, -1)))) {
+ .equals(Account.id(storage.get().getInt(USER, username, KEY_CREATOR_ID, -1)))) {
throw new ResourceNotFoundException(id);
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserResolver.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserResolver.java
index e2f16a6..74b5c71 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserResolver.java
@@ -88,10 +88,10 @@
committer.append("> ");
try {
- Account account = resolver.resolve(committer.toString()).asUnique().getAccount();
+ Account account = resolver.resolve(committer.toString()).asUnique().account();
return getServiceUser
.get()
- .apply(new ServiceUserResource(genericUserFactory.create(account.getId())));
+ .apply(new ServiceUserResource(genericUserFactory.create(account.id())));
} catch (ResourceNotFoundException | UnresolvableAccountException e) {
return null;
}
@@ -162,8 +162,8 @@
throws MethodNotAllowedException, PermissionBackendException {
List<AccountInfo> activeOwners = new ArrayList<>();
for (AccountInfo owner : listOwners(serviceUser)) {
- Optional<AccountState> accountState = accountCache.get(new Account.Id(owner._accountId));
- if (accountState.isPresent() && accountState.get().getAccount().isActive()) {
+ Optional<AccountState> accountState = accountCache.get(Account.id(owner._accountId));
+ if (accountState.isPresent() && accountState.get().account().isActive()) {
activeOwners.add(owner);
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ValidateServiceUserCommits.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ValidateServiceUserCommits.java
index d8c2176..fbf996d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ValidateServiceUserCommits.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ValidateServiceUserCommits.java
@@ -62,8 +62,8 @@
committer.getEmailAddress()));
}
Optional<AccountState> creator =
- accountCache.get(new Account.Id(serviceUser.createdBy._accountId));
- if (!creator.isPresent() || !creator.get().getAccount().isActive()) {
+ accountCache.get(Account.id(serviceUser.createdBy._accountId));
+ if (!creator.isPresent() || !creator.get().account().isActive()) {
throw new CommitValidationException(
String.format(
"Commit %s of service user %s (%s) is rejected because "