From 2a2c6849d1c9d94c935da076506dc22c1c3f22ea Mon Sep 17 00:00:00 2001
From: Chris Howe <cjhowe@dhcdata.com>
Date: Thu, 12 Oct 2017 12:50:52 -0500
Subject: [PATCH 1/4] support labels with name

---
 .../trello/impl/domaininternal/Label.java     | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/julienvey/trello/impl/domaininternal/Label.java b/src/main/java/com/julienvey/trello/impl/domaininternal/Label.java
index 5478cc0..1b8c8e1 100644
--- a/src/main/java/com/julienvey/trello/impl/domaininternal/Label.java
+++ b/src/main/java/com/julienvey/trello/impl/domaininternal/Label.java
@@ -1,20 +1,32 @@
 package com.julienvey.trello.impl.domaininternal;
 
 public class Label {
-    private String value;
+    // private String value;
+    private String color;
+    private String name;
 
     public Label() {
     }
 
     public Label(String value) {
-        this.value = value;
+      String[] parts = value.split(",", 2);
+      color = parts[0].trim();
+      if(parts.length>1) name = parts[1].trim();
     }
 
-    public String getValue() {
-        return value;
+    public String getColor() {
+      return color;
     }
 
-    public void setValue(String value) {
-        this.value = value;
+    public String getName() {
+      return name;
+    }
+
+    public void setColor(String color) {
+      this.color = color;
+    }
+
+    public void setName(String name){
+      this.name = name;
     }
 }

From e6f748ce9bcd58a449601bb6d682938f5f12e30a Mon Sep 17 00:00:00 2001
From: Chris Howe <cjhowe@dhcdata.com>
Date: Thu, 12 Oct 2017 13:10:26 -0500
Subject: [PATCH 2/4] support labels with name

---
 .../com/julienvey/trello/domain/Label.java    |  9 ++++++
 .../com/julienvey/trello/impl/TrelloImpl.java |  2 +-
 .../trello/impl/domaininternal/Label.java     | 32 -------------------
 3 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/java/com/julienvey/trello/impl/domaininternal/Label.java

diff --git a/src/main/java/com/julienvey/trello/domain/Label.java b/src/main/java/com/julienvey/trello/domain/Label.java
index de81a8a..e9f962d 100644
--- a/src/main/java/com/julienvey/trello/domain/Label.java
+++ b/src/main/java/com/julienvey/trello/domain/Label.java
@@ -8,6 +8,15 @@ public class Label extends TrelloEntity {
     private String color;
     private String name;
 
+    public Label() {
+    }
+
+    public Label(String value) {
+      String[] parts = value.split(",", 2);
+      color = parts[0].trim();
+      if(parts.length>1) name = parts[1].trim();
+    }
+
     /* Accessors */
     public String getColor() {
         return color;
diff --git a/src/main/java/com/julienvey/trello/impl/TrelloImpl.java b/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
index 2a64455..f268d8e 100644
--- a/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
+++ b/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
@@ -4,7 +4,7 @@
 import com.julienvey.trello.TrelloHttpClient;
 import com.julienvey.trello.domain.*;
 import com.julienvey.trello.impl.domaininternal.Comment;
-import com.julienvey.trello.impl.domaininternal.Label;
+import com.julienvey.trello.domain.Label;
 import com.julienvey.trello.impl.http.RestTemplateHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/julienvey/trello/impl/domaininternal/Label.java b/src/main/java/com/julienvey/trello/impl/domaininternal/Label.java
deleted file mode 100644
index 1b8c8e1..0000000
--- a/src/main/java/com/julienvey/trello/impl/domaininternal/Label.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.julienvey.trello.impl.domaininternal;
-
-public class Label {
-    // private String value;
-    private String color;
-    private String name;
-
-    public Label() {
-    }
-
-    public Label(String value) {
-      String[] parts = value.split(",", 2);
-      color = parts[0].trim();
-      if(parts.length>1) name = parts[1].trim();
-    }
-
-    public String getColor() {
-      return color;
-    }
-
-    public String getName() {
-      return name;
-    }
-
-    public void setColor(String color) {
-      this.color = color;
-    }
-
-    public void setName(String name){
-      this.name = name;
-    }
-}

From 0b030b6f1a5d0e3efba795f5170bf5670684a2be Mon Sep 17 00:00:00 2001
From: Chris Howe <cjhowe@dhcdata.com>
Date: Fri, 20 Oct 2017 06:21:38 -0500
Subject: [PATCH 3/4] add getBoardLabels

---
 src/main/java/com/julienvey/trello/Trello.java          | 2 ++
 src/main/java/com/julienvey/trello/impl/TrelloImpl.java | 9 +++++++++
 src/main/java/com/julienvey/trello/impl/TrelloUrl.java  | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/julienvey/trello/Trello.java b/src/main/java/com/julienvey/trello/Trello.java
index 9959d69..ed5c371 100644
--- a/src/main/java/com/julienvey/trello/Trello.java
+++ b/src/main/java/com/julienvey/trello/Trello.java
@@ -19,6 +19,8 @@ public interface Trello {
 
     List<TList> getBoardLists(String boardId, Argument... args);
 
+    List<Label> getBoardLabels(String boardId, Argument... args);
+
     List<Member> getBoardMembers(String boardId, Argument... args);
 
     List<Card> getBoardMemberCards(String boardId, String memberId, Argument... args);
diff --git a/src/main/java/com/julienvey/trello/impl/TrelloImpl.java b/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
index f268d8e..8a5e61c 100644
--- a/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
+++ b/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
@@ -93,6 +93,15 @@ public List<TList> getBoardLists(String boardId, Argument... args) {
         return tLists;
     }
 
+    @Override
+    public List<Label> getBoardLabels(String boardId, Argument... args) {
+        List<Label> labels = Arrays.asList(get(createUrl(GET_BOARD_LABELS).params(args).asString(), Label[].class, boardId));
+        for (Label label : labels) {
+            label.setInternalTrello(this);
+        }
+        return labels;
+    }
+
     @Override
     public List<Member> getBoardMembers(String boardId, Argument... args) {
         List<Member> members = Arrays.asList(get(createUrl(GET_BOARD_MEMBERS).params(args).asString(), Member[].class, boardId));
diff --git a/src/main/java/com/julienvey/trello/impl/TrelloUrl.java b/src/main/java/com/julienvey/trello/impl/TrelloUrl.java
index d0ab936..38631fe 100644
--- a/src/main/java/com/julienvey/trello/impl/TrelloUrl.java
+++ b/src/main/java/com/julienvey/trello/impl/TrelloUrl.java
@@ -15,6 +15,7 @@ public class TrelloUrl {
     public static final String GET_BOARD_MEMBERS = "/boards/{boardId}/members?";
     public static final String GET_BOARD_MEMBER_CARDS = "/boards/{boardId}/members/{memberId}/cards?";
     public static final String GET_BOARD_LISTS = "/boards/{boardId}/lists?";
+    public static final String GET_BOARD_LABELS = "/boards/{boardId}/labels?";
     public static final String GET_BOARD_MEMBERS_INVITED = "/boards/{boardId}/membersInvited?";
     public static final String GET_BOARD_MYPREFS = "/boards/{boardId}/myPrefs?";
     public static final String GET_BOARD_ORGANIZATION = "/boards/{boardId}/organization?";
@@ -77,4 +78,4 @@ public String asString() {
         }
         return builder.toString();
     }
-}
\ No newline at end of file
+}

From 80425b75353c57fbbddc57c31cd4d7f6e23ee16e Mon Sep 17 00:00:00 2001
From: Chris Howe <cjhowe@dhcdata.com>
Date: Fri, 20 Oct 2017 06:41:55 -0500
Subject: [PATCH 4/4] remove duplicate import

---
 src/main/java/com/julienvey/trello/impl/TrelloImpl.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/julienvey/trello/impl/TrelloImpl.java b/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
index 8a5e61c..dc3a239 100644
--- a/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
+++ b/src/main/java/com/julienvey/trello/impl/TrelloImpl.java
@@ -4,7 +4,6 @@
 import com.julienvey.trello.TrelloHttpClient;
 import com.julienvey.trello.domain.*;
 import com.julienvey.trello.impl.domaininternal.Comment;
-import com.julienvey.trello.domain.Label;
 import com.julienvey.trello.impl.http.RestTemplateHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;