Merge branch 'stable-3.1'
* stable-3.1:
Upgrade bazlets to latest stable-3.1
Upgrade bazlets to latest stable-3.0
Upgrade bazlets to latest stable-2.16
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Change-Id: I38077bf5f46d7531d14d5a23605eefc6a9bac01c
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutOwner.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutOwner.java
index 78bc448..8453e51 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutOwner.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutOwner.java
@@ -22,6 +22,7 @@
import com.google.common.base.Strings;
import com.google.gerrit.common.data.GroupDescription;
import com.google.gerrit.entities.AccountGroup;
+import com.google.gerrit.entities.AccountGroup.UUID;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.common.GroupInfo;
@@ -109,10 +110,11 @@
db.unset(USER, rsrc.getUser().getUserName().get(), KEY_OWNER);
} else {
group = groups.parse(TopLevelResource.INSTANCE, IdString.fromDecoded(input.group)).getGroup();
- if (!AccountGroup.isInternalGroup(group.getGroupUUID())) {
- throw new MethodNotAllowedException();
+ UUID groupUUID = group.getGroupUUID();
+ if (!AccountGroup.isInternalGroup(groupUUID)) {
+ throw new MethodNotAllowedException("Group with UUID '" + groupUUID + "' is external");
}
- db.setString(USER, rsrc.getUser().getUserName().get(), KEY_OWNER, group.getGroupUUID().get());
+ db.setString(USER, rsrc.getUser().getUserName().get(), KEY_OWNER, groupUUID.get());
}
MetaDataUpdate md = metaDataUpdateFactory.create(allProjects);
md.setMessage("Set owner for service user '" + rsrc.getUser().getUserName() + "'\n");