Add support for setting all labels in a single request

Reviewed-by: ehelin
openjdk · Jan 28, 2021 · 53337ec · 53337ec · openjdk-notifier · Jan 28, 2021
1 parent 81faf24
commit 53337ec
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 2 deletions.
diff --git a/bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/JbsBackport.java b/bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/JbsBackport.java
@@ -83,8 +83,8 @@ public Issue createBackport(Issue primary, String fixVersion, String assignee) {
 
         // The backport should not have any labels set - if it does, clear them
         var labels = issue.labels();
-        for (var label : labels) {
-            issue.removeLabel(label);
+        if (!labels.isEmpty()) {
+            issue.setLabels(List.of());
         }
         return issue;
     }

diff --git a/bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryPullRequest.java b/bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryPullRequest.java
@@ -217,6 +217,11 @@ public void removeLabel(String label) {
         labels.remove(label);
     }
 
+    @Override
+    public void setLabels(List<String> labels) {
+        this.labels = new HashSet<>(labels);
+    }
+
     @Override
     public List<String> labels() {
         return new ArrayList<String>(labels);

diff --git a/forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java b/forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java
@@ -538,6 +538,19 @@ public void removeLabel(String label) {
                .execute();
     }
 
+    @Override
+    public void setLabels(List<String> labels) {
+        var labelArray = JSON.array();
+        for (var label : labels) {
+            labelArray.add(label);
+        }
+        var query = JSON.object().put("labels", labelArray);
+        request.put("issues/" + json.get("number").toString() + "/labels")
+               .body(query)
+               .execute();
+        this.labels = labels;
+    }
+
     @Override
     public List<String> labels() {
         if (labels == null) {

diff --git a/forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java b/forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java
@@ -646,6 +646,14 @@ public void removeLabel(String label) {
                .execute();
     }
 
+    @Override
+    public void setLabels(List<String> labels) {
+        request.put("")
+               .body("labels", String.join(",", labels))
+               .execute();
+        this.labels = labels;
+    }
+
     @Override
     public List<String> labels() {
         if (labels == null) {

diff --git a/issuetracker/src/main/java/org/openjdk/skara/issuetracker/Issue.java b/issuetracker/src/main/java/org/openjdk/skara/issuetracker/Issue.java
@@ -145,6 +145,11 @@ default boolean isResolved() {
      */
     void removeLabel(String label);
 
+    /**
+     * Set the given labels and remove any others.
+     */
+    void setLabels(List<String> labels);
+
     /**
      * Retrieves all the currently set labels.
      * @return

diff --git a/issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java b/issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java
@@ -250,6 +250,19 @@ public void removeLabel(String label) {
         request.put("").body(query).execute();
     }
 
+    @Override
+    public void setLabels(List<String> labels) {
+        var labelsArray = JSON.array();
+        for (var label : labels) {
+            labelsArray.add(label);
+        }
+        var query = JSON.object()
+                        .put("update", JSON.object()
+                                           .put("labels", JSON.array().add(JSON.object()
+                                                                               .put("set", labelsArray))));
+        request.put("").body(query).execute();
+    }
+
     @Override
     public List<String> labels() {
         return json.get("fields").get("labels").stream()

diff --git a/test/src/main/java/org/openjdk/skara/test/TestIssue.java b/test/src/main/java/org/openjdk/skara/test/TestIssue.java
@@ -163,6 +163,16 @@ public void removeLabel(String label) {
         data.lastUpdate = ZonedDateTime.now();
     }
 
+    @Override
+    public void setLabels(List<String> labels) {
+        data.labels.clear();
+        var now = ZonedDateTime.now();
+        for (var label : labels) {
+            data.labels.put(label, now);
+        }
+        data.lastUpdate = now;
+    }
+
     @Override
     public List<String> labels() {
         return new ArrayList<>(data.labels.keySet());