SLING-8712 - VersionClient does not correctly identify fixed and unresolved issues
* switched to checking if the resolution field is empty or not
diff --git a/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java b/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java
index ec11e51..0980375 100644
--- a/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java
+++ b/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java
@@ -175,11 +175,11 @@
}
public List<Issue> findUnresolvedIssues(Release release) throws IOException {
- return findIssues("Unresolved", release);
+ return findIssues("is empty", release);
}
public List<Issue> findFixedIssues(Release release) throws IOException {
- return findIssues("Fixed", release);
+ return findIssues("is not empty", release);
}
private List<Issue> findIssues(String resolution, Release release) throws IOException {
@@ -187,7 +187,7 @@
HttpGet get = newGet("search");
URIBuilder builder = new URIBuilder(get.getURI());
builder.addParameter("jql",
- String.format("project = %s AND resolution = %s AND fixVersion = \"%s\"", PROJECT_KEY, resolution, release.getName()));
+ String.format("project = %s AND resolution %s AND fixVersion = \"%s\"", PROJECT_KEY, resolution, release.getName()));
builder.addParameter("fields", "summary");
get.setURI(builder.build());
diff --git a/src/test/java/org/apache/sling/cli/impl/jira/IssuesSearchJiraAction.java b/src/test/java/org/apache/sling/cli/impl/jira/IssuesSearchJiraAction.java
index 5ef6e6c..13bed5d 100644
--- a/src/test/java/org/apache/sling/cli/impl/jira/IssuesSearchJiraAction.java
+++ b/src/test/java/org/apache/sling/cli/impl/jira/IssuesSearchJiraAction.java
@@ -28,8 +28,8 @@
public class IssuesSearchJiraAction implements JiraAction {
- private static final String UNRESOLVED_QUERY = "project = SLING AND resolution = Unresolved AND fixVersion = \"Committer CLI 1.0.0\"";
- private static final String FIXED_QUERY = "project = SLING AND resolution = Fixed AND fixVersion = \"Committer CLI 1.0.0\"";
+ private static final String UNRESOLVED_QUERY = "project = SLING AND resolution is empty AND fixVersion = \"Committer CLI 1.0.0\"";
+ private static final String FIXED_QUERY = "project = SLING AND resolution is not empty AND fixVersion = \"Committer CLI 1.0.0\"";
@Override
public boolean tryHandle(HttpExchange ex) throws IOException {
