Merge branch 'stable-3.1' into stable-3.2
* stable-3.1:
Add its-jira configuration to the new PolyGerrit UI
Change-Id: Ic9de79f7f407622d739cbec7ee62f78c2651b535
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java
index a955363..e304b28 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java
@@ -24,6 +24,7 @@
import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static com.google.gerrit.server.project.ProjectCache.illegalState;
import static java.lang.String.format;
import static java.net.HttpURLConnection.HTTP_CREATED;
import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
@@ -31,11 +32,11 @@
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.TestPlugin;
import com.google.gerrit.acceptance.UseLocalDisk;
+import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.testing.ConfigSuite;
import java.io.IOException;
import java.nio.file.Files;
@@ -82,7 +83,8 @@
@Before
public void enablePluginInProjectConfig() throws Exception {
projectCache
- .checkedGet(project)
+ .get(project)
+ .orElseThrow(illegalState(project))
.getConfig()
.getPluginConfig(PLUGIN_NAME)
.setString("enabled", "true");
