Adopt code-owners to change ProjectCache.evict rename
The rename was introduced by I946e8df456424de52f694cdcf6456b77d452ae4c
which caused the projects not being reindexed on ProjectConfig evictions.
Change-Id: Icdfed6fe9bd6b37bcbbf0bd56990f65abe68a1cd
diff --git a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java
index 1309568..32c82a1 100644
--- a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java
+++ b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java
@@ -191,7 +191,7 @@
.message("Configure code owner backend")
.add("code-owners.config", codeOwnersConfig.toText()));
}
- projectCache.evict(project);
+ projectCache.evictAndReindex(project);
}
protected void createOwnersOverrideLabel() throws RestApiException {
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/PutCodeOwnerProjectConfig.java b/java/com/google/gerrit/plugins/codeowners/restapi/PutCodeOwnerProjectConfig.java
index 96b467e..4fe0574 100644
--- a/java/com/google/gerrit/plugins/codeowners/restapi/PutCodeOwnerProjectConfig.java
+++ b/java/com/google/gerrit/plugins/codeowners/restapi/PutCodeOwnerProjectConfig.java
@@ -264,7 +264,7 @@
validateConfig(projectResource.getProjectState(), codeOwnersConfig);
codeOwnersProjectConfigFile.commit(metaDataUpdate);
- projectCache.evict(projectResource.getNameKey());
+ projectCache.evictAndReindex(projectResource.getNameKey());
}
CodeOwnerProjectConfigInfo updatedCodeOwnerProjectConfigInfo =
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigTest.java
index 9ca0339..c972af9 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigTest.java
@@ -471,6 +471,6 @@
.message("Configure code owner backend")
.add("code-owners.config", String.format("[%s \"%s\"]", SECTION, subsection)));
}
- projectCache.evict(project);
+ projectCache.evictAndReindex(project);
}
}
