Merge branch 'stable-3.5'
* stable-3.5:
Remove the bug-report link from code-owners
Use PerThreadProjectCache instead of PerThreadCache
Change-Id: Ib37ccacffe8db1ff31ac30907dd437ffbd79665f
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfiguration.java b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfiguration.java
index a216eb1..cb565c5 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfiguration.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfiguration.java
@@ -18,6 +18,7 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.server.cache.PerThreadCache;
+import com.google.gerrit.server.cache.PerThreadProjectCache;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -69,8 +70,9 @@
*/
public CodeOwnersPluginProjectConfigSnapshot getProjectConfig(Project.NameKey projectName) {
requireNonNull(projectName, "projectName");
- return PerThreadCache.getOrCompute(
- PerThreadCache.Key.create(CodeOwnersPluginProjectConfigSnapshot.class, projectName),
+ return PerThreadProjectCache.getOrCompute(
+ PerThreadCache.Key.create(
+ Project.NameKey.class, projectName, "CodeOwnersPluginConfiguration"),
() -> codeOwnersPluginProjectConfigSnapshotFactory.create(projectName));
}
}
diff --git a/ui/suggest-owners-trigger.js b/ui/suggest-owners-trigger.js
index 3c7bf91..518210d 100644
--- a/ui/suggest-owners-trigger.js
+++ b/ui/suggest-owners-trigger.js
@@ -55,9 +55,6 @@
[[computeButtonText(model.showSuggestions)]]
</gr-button>
<span>
- <a on-click="_reportBugClick" href="https://bugs.chromium.org/p/gerrit/issues/entry?template=code-owners-plugin" target="_blank">
- <iron-icon icon="gr-icons:bug" title="report a problem"></iron-icon>
- </a>
<a on-click="_reportDocClick" href="https://gerrit.googlesource.com/plugins/code-owners/+/HEAD/resources/Documentation/how-to-use.md" target="_blank">
<iron-icon icon="gr-icons:help-outline" title="read documentation"></iron-icon>
</a>
@@ -97,10 +94,6 @@
_reportDocClick() {
this.reporting.reportInteraction('code-owners-doc-click');
}
-
- _reportBugClick() {
- this.reporting.reportInteraction('code-owners-bug-click');
- }
}
customElements.define(SuggestOwnersTrigger.is, SuggestOwnersTrigger);
