Reintroduce Jira URL normalization
Fix a regression introduced in v2.16 where the existing configurations
were broken because the code was assuming that all URLs are ending with
'/'.
Apparently the condition was covered by tests, but the normalization of
the URL, instead of being present in the plugin code, was done in the tests
making them ineffective.
Bug: Issue 11308
Change-Id: Ie1d25e7207e3ef862e848d94d14f224470d629e0
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraURL.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraURL.java
index ed0cac6..0de96d8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraURL.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraURL.java
@@ -16,6 +16,7 @@
import static java.util.Objects.requireNonNull;
+import com.google.common.base.CharMatcher;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -36,7 +37,7 @@
private final URL url;
public JiraURL(String spec) throws MalformedURLException {
- this.url = new URL(spec);
+ this.url = new URL(CharMatcher.is('/').trimFrom(spec) + "/");
}
private JiraURL(URL url) {
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApiTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApiTest.java
index 1fa7f6a..d3b4812 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApiTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraRestApiTest.java
@@ -19,7 +19,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
-import com.google.common.base.CharMatcher;
import java.io.ByteArrayOutputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -39,7 +38,7 @@
private JiraRestApi restApi;
private void setURL(String jiraUrl) throws MalformedURLException {
- url = new JiraURL(CharMatcher.is('/').trimFrom(jiraUrl) + "/");
+ url = new JiraURL(jiraUrl);
}
@Test
