diff options
| author | Nasser Grainawi <nasser.grainawi@linaro.org> | 2023-02-17 16:19:28 -0700 |
|---|---|---|
| committer | Nasser Grainawi <nasser.grainawi@linaro.org> | 2023-02-17 16:19:28 -0700 |
| commit | 4b005196b9457e008bab1fffdfe01742f69567f4 (patch) | |
| tree | 40a2e0efcf819e1ffbe0ee964bb07ead87c84e5d | |
| parent | b891bc14db3261e74af999e531e0a716eaa0c507 (diff) | |
ChangeQueryBuilder: De-dup parseGroup()
A few other methods implemented this same logic, so remove the
duplicates and call parseGroup() instead.
Change-Id: I455dc8e9b2363a7c87d754e4e70e00ca1f87221b
Release-Notes: skip
| -rw-r--r-- | java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 186fb1171f..5b6f044ae7 100644 --- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -1239,11 +1239,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData, ChangeQueryBuil @Operator public Predicate<ChangeData> ownerin(String group) throws QueryParseException, IOException { - GroupReference g = GroupBackends.findBestSuggestion(args.groupBackend, group); - if (g == null) { - throw error("Group " + group + " not found"); - } - + GroupReference g = parseGroup(group); AccountGroup.UUID groupId = g.getUUID(); GroupDescription.Basic groupDescription = args.groupBackend.get(groupId); if (!(groupDescription instanceof GroupDescription.Internal) @@ -1265,11 +1261,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData, ChangeQueryBuil throw new QueryParseException("'uploader' operator is not supported by change index version"); } - GroupReference g = GroupBackends.findBestSuggestion(args.groupBackend, group); - if (g == null) { - throw error("Group " + group + " not found"); - } - + GroupReference g = parseGroup(group); AccountGroup.UUID groupId = g.getUUID(); GroupDescription.Basic groupDescription = args.groupBackend.get(groupId); if (!(groupDescription instanceof GroupDescription.Internal) @@ -1323,10 +1315,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData, ChangeQueryBuil @Operator public Predicate<ChangeData> reviewerin(String group) throws QueryParseException { - GroupReference g = GroupBackends.findBestSuggestion(args.groupBackend, group); - if (g == null) { - throw error("Group " + group + " not found"); - } + GroupReference g = parseGroup(group); return new ReviewerinPredicate(args.userFactory, g.getUUID()); } |