CodeOwnersPluginConfigSnapshot: Rename getOverrideApproval() method
Since this method returns multiple override approvals it should be
called getOverrideApprovals().
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I76cd0561278f6afd62fbd67c06395d33ef42e52a
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
index b3a921e..af7d9b7 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
@@ -287,7 +287,7 @@
RequiredApproval requiredApproval = codeOwnersConfig.getRequiredApproval();
logger.atFine().log("requiredApproval = %s", requiredApproval);
- ImmutableSet<RequiredApproval> overrideApprovals = codeOwnersConfig.getOverrideApproval();
+ ImmutableSet<RequiredApproval> overrideApprovals = codeOwnersConfig.getOverrideApprovals();
boolean hasOverride =
hasOverride(currentPatchSetApprovals, overrideApprovals, patchSetUploader);
logger.atFine().log(
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/OnCodeOwnerOverride.java b/java/com/google/gerrit/plugins/codeowners/backend/OnCodeOwnerOverride.java
index db3f936..138623f 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/OnCodeOwnerOverride.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/OnCodeOwnerOverride.java
@@ -76,7 +76,7 @@
}
ImmutableList<RequiredApproval> appliedOverrideApprovals =
- codeOwnersConfig.getOverrideApproval().stream()
+ codeOwnersConfig.getOverrideApprovals().stream()
.sorted(comparing(RequiredApproval::toString))
// If oldApprovals doesn't contain the label or if the labels value in it is null, the
// label was not changed.
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshot.java b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshot.java
index 37b286b..669b92f 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshot.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshot.java
@@ -439,7 +439,7 @@
* @return the override approvals that should be used, an empty set if no override approval is
* configured, in this case the override functionality is disabled
*/
- public ImmutableSet<RequiredApproval> getOverrideApproval() {
+ public ImmutableSet<RequiredApproval> getOverrideApprovals() {
try {
return filterOutDuplicateRequiredApprovals(
getConfiguredRequiredApproval(overrideApprovalConfig));
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java b/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java
index e233344..8140fac 100644
--- a/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java
+++ b/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java
@@ -162,7 +162,7 @@
@Nullable
ImmutableList<RequiredApprovalInfo> formatOverrideApprovalInfo(Project.NameKey projectName) {
ImmutableList<RequiredApprovalInfo> overrideApprovalInfos =
- codeOwnersPluginConfiguration.getProjectConfig(projectName).getOverrideApproval().stream()
+ codeOwnersPluginConfiguration.getProjectConfig(projectName).getOverrideApprovals().stream()
.sorted(comparing(requiredApproval -> requiredApproval.toString()))
.map(CodeOwnerProjectConfigJson::formatRequiredApproval)
.collect(toImmutableList());
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java
index 90f950a..aa269c7 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java
@@ -326,11 +326,11 @@
PushResult r = pushRefsMetaConfig();
assertThat(r.getRemoteUpdate(RefNames.REFS_CONFIG).getStatus()).isEqualTo(Status.OK);
- ImmutableSet<RequiredApproval> overrideApproval =
- codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApproval();
- assertThat(overrideApproval).hasSize(1);
- assertThat(overrideApproval).element(0).hasLabelNameThat().isEqualTo("Code-Review");
- assertThat(overrideApproval).element(0).hasValueThat().isEqualTo(2);
+ ImmutableSet<RequiredApproval> overrideApprovals =
+ codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApprovals();
+ assertThat(overrideApprovals).hasSize(1);
+ assertThat(overrideApprovals).element(0).hasLabelNameThat().isEqualTo("Code-Review");
+ assertThat(overrideApprovals).element(0).hasValueThat().isEqualTo(2);
}
@Test
@@ -423,11 +423,11 @@
PushResult r = pushRefsMetaConfig();
assertThat(r.getRemoteUpdate(RefNames.REFS_CONFIG).getStatus()).isEqualTo(Status.OK);
- ImmutableSet<RequiredApproval> overrideApproval =
- codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApproval();
- assertThat(overrideApproval).hasSize(1);
- assertThat(overrideApproval).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
- assertThat(overrideApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> overrideApprovals =
+ codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApprovals();
+ assertThat(overrideApprovals).hasSize(1);
+ assertThat(overrideApprovals).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
+ assertThat(overrideApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/PutCodeOwnerProjectConfigIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/PutCodeOwnerProjectConfigIT.java
index 9e6fb23..f92d566 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/PutCodeOwnerProjectConfigIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/PutCodeOwnerProjectConfigIT.java
@@ -254,7 +254,7 @@
@Test
public void setOverrideApproval() throws Exception {
- assertThat(codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApproval())
+ assertThat(codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApprovals())
.isEmpty();
String overrideLabel1 = "Bypass-Owners";
@@ -271,13 +271,13 @@
assertThat(updatedConfig.overrideApproval.get(0).value).isEqualTo(1);
assertThat(updatedConfig.overrideApproval.get(1).label).isEqualTo(overrideLabel2);
assertThat(updatedConfig.overrideApproval.get(1).value).isEqualTo(1);
- assertThat(codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApproval())
+ assertThat(codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApprovals())
.hasSize(2);
input.overrideApprovals = ImmutableList.of();
updatedConfig = projectCodeOwnersApiFactory.project(project).updateConfig(input);
assertThat(updatedConfig.overrideApproval).isNull();
- assertThat(codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApproval())
+ assertThat(codeOwnersPluginConfiguration.getProjectConfig(project).getOverrideApprovals())
.isEmpty();
}
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java
index 37d4bc8..6da19e4 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java
@@ -982,47 +982,47 @@
@Test
public void getOverrideApprovalWhenNoRequiredApprovalIsConfigured() throws Exception {
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
@GerritConfig(name = "plugin.code-owners.overrideApproval", value = "Owners-Override+1")
public void getConfiguredOverrideApproval() throws Exception {
createOwnersOverrideLabel();
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
@GerritConfig(name = "plugin.code-owners.overrideApproval", value = "Foo-Bar+1")
public void getOverrideApprovalIfNonExistingLabelIsConfiguredAsOverrideApproval()
throws Exception {
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
@GerritConfig(name = "plugin.code-owners.overrideApproval", value = "Code-Review+3")
public void getOverrideApprovalIfNonExistingLabelValueIsConfiguredAsOverrideApproval()
throws Exception {
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
@GerritConfig(name = "plugin.code-owners.overrideApproval", value = "INVALID")
public void getOverrideApprovalIfInvalidOverrideApprovalIsConfigured() throws Exception {
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
public void getOverrideApprovalConfiguredOnProjectLevel() throws Exception {
createOwnersOverrideLabel();
configureOverrideApproval(project, "Owners-Override+1");
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
@@ -1036,7 +1036,7 @@
OverrideApprovalConfig.KEY_OVERRIDE_APPROVAL,
ImmutableList.of("Owners-Override+1", "Other-Override+1"));
- ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApproval();
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
assertThat(
requiredApprovals.stream()
.map(requiredApproval -> requiredApproval.toString())
@@ -1052,10 +1052,10 @@
createOwnersOverrideLabel("Other-Override");
configureOverrideApproval(project, "Other-Override+1");
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Other-Override");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Other-Override");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
@@ -1063,10 +1063,10 @@
createOwnersOverrideLabel();
configureOverrideApproval(allProjects, "Owners-Override+1");
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
@@ -1077,10 +1077,10 @@
createOwnersOverrideLabel("Other-Override");
configureOverrideApproval(allProjects, "Other-Override+1");
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Other-Override");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Other-Override");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
@@ -1090,10 +1090,10 @@
configureOverrideApproval(allProjects, "Owners-Override+1");
configureOverrideApproval(project, "Other-Override+1");
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Other-Override");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Other-Override");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
@@ -1106,17 +1106,17 @@
configureOverrideApproval(allProjects, "Owners-Override+1");
configureOverrideApproval(project, "Owners-Override+2");
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(2);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(2);
}
@Test
public void getOverrideApprovalIfNonExistingLabelIsConfiguredAsOverrideApprovalOnProjectLevel()
throws Exception {
configureOverrideApproval(project, "Foo-Bar+1");
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
@@ -1125,14 +1125,14 @@
throws Exception {
createOwnersOverrideLabel();
configureOverrideApproval(project, "Owners-Override+2");
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
public void getOverrideApprovalIfInvalidOverrideApprovalIsConfiguredOnProjectLevel()
throws Exception {
configureOverrideApproval(project, "INVALID");
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
@@ -1140,7 +1140,7 @@
createOwnersOverrideLabel();
Project.NameKey otherProject = projectOperations.newProject().create();
configureOverrideApproval(otherProject, "Owners-Override+1");
- assertThat(cfgSnapshot().getOverrideApproval()).isEmpty();
+ assertThat(cfgSnapshot().getOverrideApprovals()).isEmpty();
}
@Test
@@ -1152,10 +1152,10 @@
ImmutableList.of("Code-Review+2", "Code-Review+1", "Code-Review+2"));
// If multiple values are set for a key, the last value wins.
- ImmutableSet<RequiredApproval> requiredApproval = cfgSnapshot().getOverrideApproval();
- assertThat(requiredApproval).hasSize(1);
- assertThat(requiredApproval).element(0).hasLabelNameThat().isEqualTo("Code-Review");
- assertThat(requiredApproval).element(0).hasValueThat().isEqualTo(1);
+ ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+ assertThat(requiredApprovals).hasSize(1);
+ assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Code-Review");
+ assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java b/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java
index 313bef4..ffecde7 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java
@@ -169,7 +169,7 @@
when(codeOwnersPluginConfigSnapshot.areImplicitApprovalsEnabled()).thenReturn(true);
when(codeOwnersPluginConfigSnapshot.getRequiredApproval())
.thenReturn(RequiredApproval.create(getDefaultCodeReviewLabel(), (short) 2));
- when(codeOwnersPluginConfigSnapshot.getOverrideApproval())
+ when(codeOwnersPluginConfigSnapshot.getOverrideApprovals())
.thenReturn(
ImmutableSet.of(
RequiredApproval.create(
@@ -242,7 +242,7 @@
public void withMultipleOverrides() throws Exception {
createOwnersOverrideLabel();
- when(codeOwnersPluginConfigSnapshot.getOverrideApproval())
+ when(codeOwnersPluginConfigSnapshot.getOverrideApprovals())
.thenReturn(
ImmutableSet.of(
RequiredApproval.create(LabelType.withDefaultValues("Owners-Override"), (short) 1),
@@ -284,7 +284,7 @@
when(codeOwnersPluginConfigSnapshot.areImplicitApprovalsEnabled()).thenReturn(true);
when(codeOwnersPluginConfigSnapshot.getRequiredApproval())
.thenReturn(RequiredApproval.create(getDefaultCodeReviewLabel(), (short) 2));
- when(codeOwnersPluginConfigSnapshot.getOverrideApproval())
+ when(codeOwnersPluginConfigSnapshot.getOverrideApprovals())
.thenReturn(
ImmutableSet.of(
RequiredApproval.create(
