Merge pull request kontent-ai#56 from Kentico/delivery-sdk-java-46

kontent-ai#46 Add methods to DeliveryParamBuilder to take collections
Banbeucmas · Feb 6, 2018 · d3894c3 · d3894c3
2 parents e605d66 + 1759750
commit d3894c3
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java b/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java
@@ -28,6 +28,7 @@
 import org.apache.http.message.BasicNameValuePair;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 
@@ -108,6 +109,10 @@ public DeliveryParameterBuilder filterIn(String attribute, String... values) {
         return this;
     }
 
+    public DeliveryParameterBuilder filterIn(String attribute, Collection<String> values) {
+        return filterIn(attribute, values.toArray(new String[values.size()]));
+    }
+
     public DeliveryParameterBuilder filterContains(String attribute, String value) {
         if (attribute != null) {
             nameValuePairs.add(new BasicNameValuePair(String.format("%s%s", attribute, CONTAINS), value));
@@ -122,13 +127,21 @@ public DeliveryParameterBuilder filterAny(String attribute, String... values) {
         return this;
     }
 
+    public DeliveryParameterBuilder filterAny(String attribute, Collection<String> values) {
+        return filterAny(attribute, values.toArray(new String[values.size()]));
+    }
+
     public DeliveryParameterBuilder filterAll(String attribute, String... values) {
         if (attribute != null) {
             nameValuePairs.add(new BasicNameValuePair(String.format("%s%s", attribute, ALL), String.join(",", values)));
         }
         return this;
     }
 
+    public DeliveryParameterBuilder filterAll(String attribute, Collection<String> values) {
+        return filterAll(attribute, values.toArray(new String[values.size()]));
+    }
+
     public DeliveryParameterBuilder orderByAsc(String attribute) {
         if (attribute != null) {
             nameValuePairs.add(new BasicNameValuePair(ORDER, String.format("%s%s", attribute, ASC)));

diff --git a/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java b/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java
@@ -28,6 +28,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
@@ -125,6 +126,17 @@ public void testIn() {
         Assert.assertEquals("bar,foobar", params.get(0).getValue());
     }
 
+    @Test
+    public void testInCollection() {
+        List<String> values = new ArrayList<>();
+        values.add("bar");
+        values.add("foobar");
+        List<NameValuePair> params = DeliveryParameterBuilder.params().filterIn("foo", values).build();
+        Assert.assertEquals(1, params.size());
+        Assert.assertEquals("foo[in]", params.get(0).getName());
+        Assert.assertEquals("bar,foobar", params.get(0).getValue());
+    }
+
     @Test
     public void testInNullAttr() {
         List<NameValuePair> params = DeliveryParameterBuilder.params().filterIn(null, null, null).build();
@@ -153,6 +165,17 @@ public void testAny() {
         Assert.assertEquals("bar,foobar", params.get(0).getValue());
     }
 
+    @Test
+    public void testAnyCollection() {
+        List<String> values = new ArrayList<>();
+        values.add("bar");
+        values.add("foobar");
+        List<NameValuePair> params = DeliveryParameterBuilder.params().filterAny("foo", values).build();
+        Assert.assertEquals(1, params.size());
+        Assert.assertEquals("foo[any]", params.get(0).getName());
+        Assert.assertEquals("bar,foobar", params.get(0).getValue());
+    }
+
     @Test
     public void testAnyNullAttr() {
         List<NameValuePair> params = DeliveryParameterBuilder.params().filterAny(null, null, null).build();
@@ -167,6 +190,17 @@ public void testAll() {
         Assert.assertEquals("bar,foobar", params.get(0).getValue());
     }
 
+    @Test
+    public void testAllCollection() {
+        List<String> values = new ArrayList<>();
+        values.add("bar");
+        values.add("foobar");
+        List<NameValuePair> params = DeliveryParameterBuilder.params().filterAll("foo", values).build();
+        Assert.assertEquals(1, params.size());
+        Assert.assertEquals("foo[all]", params.get(0).getName());
+        Assert.assertEquals("bar,foobar", params.get(0).getValue());
+    }
+
     @Test
     public void testAllNullAttr() {
         List<NameValuePair> params = DeliveryParameterBuilder.params().filterAll(null, null, null).build();