Massaging the changes.

kohsuke · kohsuke · commit 9a1bb09c9fe1 · 2018-11-06T08:14:12.000-08:00
In particular, avoid the kind of addLabel() method that has lots of side
effect and do multiple things.
diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java
@@ -30,6 +30,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -218,70 +219,64 @@ public void setLabels(String... labels) throws IOException {
     }
 
     /**
-     * Adds a label to the issue. If it does not exist in the {@link GHRepository}, it will be
-     * created with the specified color. If either {@code name} or {@code color} is null, it will
-     * be a <a href="https://en.wikipedia.org/wiki/NOP">NOP</a>.
+     * Adds labels to the issue.
      *
-     * @param name  Name of the label
-     * @param color Hex code of the label, without #
+     * @param names Names of the label
      */
-    public void addLabel(String name, String color) throws IOException {
-      if (name != null && color != null) {
-        // All labels that we have seen
-        Set<String> repoLabels = new HashSet<String>();
-        Set<String> seenLabels = new HashSet<String>();
-
-        // Check if label already exists
-        for (GHLabel repoLabel : getRepository().listLabels().asSet()) {
-          repoLabels.add(repoLabel.getName());
-        }
+    public void addLabels(String... names) throws IOException {
+        _addLabels(Arrays.asList(names));
+    }
 
-        // Label does not exist
-        if (!repoLabels.contains(name)) {
-          GHLabel newLabel = getRepository().createLabel(name, color);
-          repoLabels.add(newLabel.getName());
-          seenLabels.add(newLabel.getName());
-        }
+    public void addLabels(GHLabel... labels) throws IOException {
+        addLabels(Arrays.asList(labels));
+    }
 
-        // See if label exists on issue already
-        boolean foundInIssue = false;
+    public void addLabels(Collection<GHLabel> labels) throws IOException {
+        _addLabels(GHLabel.toNames(labels));
+    }
 
-        for (GHLabel existingIssueLabel : getLabels()) {
-          if (existingIssueLabel.getName().equalsIgnoreCase(name)) {
-            foundInIssue = true;
-          }
+    private void _addLabels(Collection<String> names) throws IOException {
+        List<String> newLabels = new ArrayList<String>();
 
-          seenLabels.add(existingIssueLabel.getName());
+        for (GHLabel label : getLabels()) {
+            newLabels.add(label.getName());
         }
-
-        // If the label doesn't exist in the issue, add it
-        if (!foundInIssue) {
-          seenLabels.add(name);
-          setLabels(seenLabels.toArray(new String[0]));
+        for (String name : names) {
+            if (!newLabels.contains(name)) {
+                newLabels.add(name);
+            }
         }
-      }
+        setLabels(newLabels.toArray(new String[0]));
     }
 
     /**
-     * @see #removeLabel(String)
+     * Remove a given label by name from this issue.
      */
-    public void removeLabel(Label label) throws IOException {
-      removeLabel(label.getName());
+    public void removeLabels(String... names) throws IOException {
+        _removeLabels(Arrays.asList(names));
     }
 
     /**
-     * Remove a given label by name from this issue.
+     * @see #removeLabels(String...)
      */
-    public void removeLabel(String name) throws IOException {
-      Set<String> newLabels = new HashSet<String>();
+    public void removeLabels(GHLabel... labels) throws IOException {
+        removeLabels(Arrays.asList(labels));
+    }
 
-      for (Label existingLabel : labels) {
-        if (!existingLabel.getName().equalsIgnoreCase(name)) {
-          newLabels.add(existingLabel.getName());
+    public void removeLabels(Collection<GHLabel> labels) throws IOException {
+        _removeLabels(GHLabel.toNames(labels));
+    }
+
+    private void _removeLabels(Collection<String> names) throws IOException {
+        List<String> newLabels = new ArrayList<String>();
+
+        for (GHLabel l : getLabels()) {
+            if (!names.contains(l.getName())) {
+                newLabels.add(l.getName());
+            }
         }
-      }
 
-      setLabels(newLabels.toArray(new String[0]));
+        setLabels(newLabels.toArray(new String[0]));
     }
 
     /**
diff --git a/src/main/java/org/kohsuke/github/GHLabel.java b/src/main/java/org/kohsuke/github/GHLabel.java
@@ -1,6 +1,9 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -42,4 +45,12 @@ public void delete() throws IOException {
     public void setColor(String newColor) throws IOException {
         repo.root.retrieve().method("PATCH").with("name", name).with("color", newColor).to(url);
     }
+
+    /*package*/ static Collection<String> toNames(Collection<GHLabel> labels) {
+        List<String> r = new ArrayList<String>();
+        for (GHLabel l : labels) {
+            r.add(l.getName());
+        }
+        return r;
+    }
 }
