Add distance scores for code owners that are added for resolving all users
If --resolve-all-users is specified when listing code owners code
ownerships that are assigned to all users (aka '*') are resolved to
random users until the limit is reached. For these users no distance
score was added.
After adding random users to fill up the limit, no further code owners
will be included in the result (because the limit is reached). This
means the random users will always have the lowest score. For the
sorting this means that this fix makes no difference (since lowest score
and no score will result in the same sort position). Due to this we
can't test this fix via the sort order. Since we also don't return the
scores to the client, it's hard to test this and hence this change
doesn't include a test.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: If579300d1af822c997344ca350a93a220047f2c8
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java b/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java
index 490343a..6f11173 100644
--- a/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java
+++ b/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java
@@ -190,7 +190,10 @@
if (pathCodeOwners.ownedByAllUsers()) {
ownedByAllUsers.set(true);
- fillUpWithRandomUsers(rsrc, codeOwners, limit);
+ ImmutableSet<CodeOwner> addedCodeOwners =
+ fillUpWithRandomUsers(rsrc, codeOwners, limit);
+ addedCodeOwners.forEach(
+ localCodeOwner -> distanceScoring.putValueForCodeOwner(localCodeOwner, distance));
if (codeOwners.size() < limit) {
logger.atFine().log(
@@ -214,7 +217,9 @@
if (globalCodeOwners.ownedByAllUsers()) {
ownedByAllUsers.set(true);
- fillUpWithRandomUsers(rsrc, codeOwners, limit);
+ ImmutableSet<CodeOwner> addedCodeOwners = fillUpWithRandomUsers(rsrc, codeOwners, limit);
+ addedCodeOwners.forEach(
+ codeOwner -> distanceScoring.putValueForCodeOwner(codeOwner, globalOwnersDistance));
}
}
@@ -391,16 +396,19 @@
* all user.
*
* <p>No-op if code ownership for all users should not be resolved.
+ *
+ * @return the added code owners
*/
- private void fillUpWithRandomUsers(R rsrc, Set<CodeOwner> codeOwners, int limit) {
+ private ImmutableSet<CodeOwner> fillUpWithRandomUsers(
+ R rsrc, Set<CodeOwner> codeOwners, int limit) {
if (!resolveAllUsers || codeOwners.size() >= limit) {
// code ownership for all users should not be resolved or the limit has already been reached
// so that we don't need to add further suggestions
- return;
+ return ImmutableSet.of();
}
logger.atFine().log("filling up with random users");
- codeOwners.addAll(
+ ImmutableSet<CodeOwner> codeOwnersToAdd =
filterCodeOwners(
rsrc,
// ask for 2 times the number of users that we need so that we still have enough
@@ -412,7 +420,9 @@
.stream()
.filter(codeOwner -> !codeOwners.contains(codeOwner))
.limit(limit - codeOwners.size())
- .collect(toImmutableSet()));
+ .collect(toImmutableSet());
+ codeOwners.addAll(codeOwnersToAdd);
+ return codeOwnersToAdd;
}
/**
