Merge pull request #30 from cunhazera/issue-28

Adding Locale object as parameter to DeliveryParameterBuilder
kontent-ai · Sep 28, 2017 · 90e39fd · 90e39fd
2 parents d3f41d3 + bad0166
commit 90e39fd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java b/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java
@@ -29,6 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 public class DeliveryParameterBuilder {
 
@@ -179,6 +180,13 @@ public DeliveryParameterBuilder language(String language) {
         return this;
     }
 
+    public DeliveryParameterBuilder language(Locale language) {
+        if (language != null) {
+            nameValuePairs.add(new BasicNameValuePair(LANGUAGE, language.toString().replace('_', '-')));
+        }
+        return this;
+    }
+
     public List<NameValuePair> build() {
         return nameValuePairs;
     }

diff --git a/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java b/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java
@@ -271,9 +271,26 @@ public void testLanguage() {
         Assert.assertEquals("en-US", params.get(0).getValue());
     }
 
+    @Test
+    public void testLocaleLanguage() {
+        List<NameValuePair> params = DeliveryParameterBuilder.params().language(new Locale("pt", "br")).build();
+        Assert.assertEquals(1, params.size());
+        Assert.assertEquals("language", params.get(0).getName());
+        Assert.assertEquals("pt-BR", params.get(0).getValue());
+    }
+
+    @Test
+    public void testLocaleWithNoVariantLanguage() {
+        List<NameValuePair> params = DeliveryParameterBuilder.params().language(new Locale("en")).build();
+        Assert.assertEquals(1, params.size());
+        Assert.assertEquals("language", params.get(0).getName());
+        Assert.assertEquals("en", params.get(0).getValue());
+    }
+
     @Test
     public void testLanguageNull() {
-        List<NameValuePair> params = DeliveryParameterBuilder.params().language(null).build();
+        String nullValue = null;
+        List<NameValuePair> params = DeliveryParameterBuilder.params().language(nullValue).build();
         Assert.assertEquals(0, params.size());
     }
 }