Refactored list chart params into class

Author: mroloux

src/main/java/seatsio/charts/ChartListParams.java

@@ -0,0 +1,45 @@
+package seatsio.charts;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ChartListParams {
+
+    private String filter;
+    private String tag;
+    private Boolean expandEvents;
+
+    public ChartListParams withFilter(String filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    public ChartListParams withTag(String tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    public ChartListParams withExpandEvents(Boolean expandEvents) {
+        this.expandEvents = expandEvents;
+        return this;
+    }
+
+    public Map<String, Object> asMap() {
+        Map<String, Object> chartListParams = new HashMap<>();
+
+        if (filter != null) {
+            chartListParams.put("filter", filter);
+        }
+
+        if (tag != null) {
+            chartListParams.put("tag", tag);
+        }
+
+        if (expandEvents != null && expandEvents) {
+            chartListParams.put("expand", "events");
+        }
+
+        return chartListParams;
+    }
+
+}

src/main/java/seatsio/charts/Charts.java

@@ -9,7 +9,6 @@
 import seatsio.util.PageFetcher;
 
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -189,57 +188,39 @@ public List<String> listAllTags() {
     }
 
     public Stream<Chart> listAll() {
-        return listAll(null, null, null);
+        return listAll(new ChartListParams());
     }
 
-    public Stream<Chart> listAll(String filter, String tag, Boolean expandEvents) {
-        return list().all(chartListParams(filter, tag, expandEvents));
+    public Stream<Chart> listAll(ChartListParams chartListParams) {
+        return list().all(chartListParams.asMap());
     }
 
     public Page<Chart> listFirstPage() {
-        return listFirstPage(null, null, null, null);
+        return listFirstPage(new ChartListParams(), null);
     }
 
-    public Page<Chart> listFirstPage(String filter, String tag, Boolean expandEvents, Integer pageSize) {
-        return list().firstPage(chartListParams(filter, tag, expandEvents), pageSize);
+    public Page<Chart> listFirstPage(ChartListParams chartListParams, Integer pageSize) {
+        return list().firstPage(chartListParams.asMap(), pageSize);
     }
 
     public Page<Chart> listPageAfter(long id) {
-        return listPageAfter(id, null, null, null, null);
+        return listPageAfter(id, new ChartListParams(), null);
     }
 
-    public Page<Chart> listPageAfter(long id, String filter, String tag, Boolean expandEvents, Integer pageSize) {
-        return list().pageAfter(id, chartListParams(filter, tag, expandEvents), pageSize);
+    public Page<Chart> listPageAfter(long id, ChartListParams chartListParams, Integer pageSize) {
+        return list().pageAfter(id, chartListParams.asMap(), pageSize);
     }
 
     public Page<Chart> listPageBefore(long id) {
-        return listPageBefore(id, null, null, null, null);
+        return listPageBefore(id, new ChartListParams(), null);
     }
 
-    public Page<Chart> listPageBefore(long id, String filter, String tag, Boolean expandEvents, Integer pageSize) {
-        return list().pageBefore(id, chartListParams(filter, tag, expandEvents), pageSize);
+    public Page<Chart> listPageBefore(long id, ChartListParams chartListParams, Integer pageSize) {
+        return list().pageBefore(id, chartListParams.asMap(), pageSize);
     }
 
     private Lister<Chart> list() {
         return new Lister<>(new PageFetcher<>(baseUrl, "/charts", secretKey, Chart.class));
     }
 
-    private Map<String, Object> chartListParams(String filter, String tag, Boolean expandEvents) {
-        Map<String, Object> chartListParams = new HashMap<>();
-
-        if (filter != null) {
-            chartListParams.put("filter", filter);
-        }
-
-        if (tag != null) {
-            chartListParams.put("tag", tag);
-        }
-
-        if (expandEvents != null && expandEvents) {
-            chartListParams.put("expand", "events");
-        }
-
-        return chartListParams;
-    }
-
 }

src/test/java/seatsio/charts/ListChartsTest.java

@@ -29,7 +29,7 @@ public void filter() {
         Chart chart2 = client.charts.create("bar");
         Chart chart3 = client.charts.create("foofoo");
 
-        Stream<Chart> charts = client.charts.listAll("foo", null, null);
+        Stream<Chart> charts = client.charts.listAll(new ChartListParams().withFilter("foo"));
 
         assertThat(charts)
                 .extracting(chart -> chart.key)
@@ -46,7 +46,7 @@ public void tag() {
         Chart chart3 = client.charts.create();
         client.charts.addTag(chart3.key, "foo");
 
-        Stream<Chart> charts = client.charts.listAll(null, "foo", null);
+        Stream<Chart> charts = client.charts.listAll(new ChartListParams().withTag("foo"));
 
         assertThat(charts)
                 .extracting(chart -> chart.key)
@@ -66,7 +66,7 @@ public void tagAndFilter() {
 
         Chart chart4 = client.charts.create("bar");
 
-        Stream<Chart> charts = client.charts.listAll("bar", "foo", null);
+        Stream<Chart> charts = client.charts.listAll(new ChartListParams().withFilter("bar").withTag("foo"));
 
         assertThat(charts)
                 .extracting(chart -> chart.key)
@@ -79,7 +79,7 @@ public void expand() {
         Event event1 = client.events.create(chart.key);
         Event event2 = client.events.create(chart.key);
 
-        Chart retrievedChart = client.charts.listAll(null, null, true).findFirst().get();
+        Chart retrievedChart = client.charts.listAll(new ChartListParams().withExpandEvents(true)).findFirst().get();
 
         assertThat(retrievedChart.events)
                 .extracting(event -> event.id)