commit d4abe611da0ea2228c832c00b2bb5f31274c561d
author David Ostrovsky <david@ostrovsky.org> Mon Dec 21 14:32:55 2020 +0100
committer David Ostrovsky <david@ostrovsky.org> Mon Dec 21 14:36:14 2020 +0100
tree e66c242700129afca52cc4744642049a6161ecbe
parent d19268747da8a6de596663e6cc41447f62e927fc

Adjust to changes in Gerrit core

PluginConfig and CommentLinkInfo were changed to auto-value.

Change-Id: I970e90f039db5d231491ec2fda98eb0e32ccb9b5

src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java
index 7c53b7f..9c3f550 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java
@@ -18,6 +18,7 @@
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
 import com.google.gerrit.entities.Project;
+import com.google.gerrit.entities.StoredCommentLinkInfo;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.server.GerritPersonIdent;
 import com.google.gerrit.server.config.GerritServerConfig;
@@ -26,7 +27,6 @@
 import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.meta.MetaDataUpdate;
-import com.google.gerrit.server.project.CommentLinkInfoImpl;
 import com.google.gerrit.server.project.NoSuchProjectException;
 import com.google.gerrit.server.project.ProjectCache;
 import com.google.gerrit.server.project.ProjectConfig;
@@ -115,8 +115,12 @@
           CharMatcher.is('/').trimFrom(jiraItsServerInfo.getUrl().toString()) + JiraURL.URL_SUFFIX;
       if (!commentLinksExist(config, link)) {
         String match = getCommentLinkFromGerritConfig("match");
-        CommentLinkInfoImpl commentlinkSection =
-            new CommentLinkInfoImpl(pluginName, match, link, null, true);
+        StoredCommentLinkInfo commentlinkSection =
+            StoredCommentLinkInfo.builder(pluginName)
+                .setMatch(match)
+                .setLink(link)
+                .setEnabled(true)
+                .build();
         config.addCommentLinkSection(commentlinkSection);
         md.getCommitBuilder().setAuthor(serverUser);
         md.getCommitBuilder().setCommitter(serverUser);
@@ -129,7 +133,7 @@
   }
 
   private boolean commentLinksExist(ProjectConfig config, String link) {
-    return config.getCommentLinkSections().stream().map(c -> c.link).anyMatch(link::equals);
+    return config.getCommentLinkSections().stream().map(c -> c.getLink()).anyMatch(link::equals);
   }
 
   @VisibleForTesting
@@ -146,6 +150,6 @@
             e);
       }
     }
-    return new PluginConfig(pluginName, new Config());
+    return PluginConfig.create(pluginName, new Config(), null);
   }
 }