From 1c5cad8369480c3d450ee8a3e379a49bb326717b Mon Sep 17 00:00:00 2001
From: Gabriel Cunha <gabriel.cunha@fluig.com>
Date: Thu, 28 Sep 2017 08:26:58 -0300
Subject: [PATCH 1/2] Adding Locale object as parameter to
 DeliveryParameterBuilder

---
 .../delivery/DeliveryParameterBuilder.java            |  8 ++++++++
 .../delivery/DeliveryParameterBuilderTest.java        | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java b/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java
index 852f0998..14c029d8 100644
--- 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()));
+        }
+        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
index da65e569..a4be8398 100644
--- a/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java
+++ b/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java
@@ -271,9 +271,18 @@ 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 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());
     }
 }

From bad016656b9c7ad21d62e1032470b36280a3b69e Mon Sep 17 00:00:00 2001
From: Gabriel Cunha <gabriel.cunha@fluig.com>
Date: Thu, 28 Sep 2017 10:56:50 -0300
Subject: [PATCH 2/2] Replacing _ for -

---
 .../delivery/DeliveryParameterBuilder.java           |  2 +-
 .../delivery/DeliveryParameterBuilderTest.java       | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java b/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java
index 14c029d8..0814822b 100644
--- a/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java
+++ b/src/main/java/com/kenticocloud/delivery/DeliveryParameterBuilder.java
@@ -182,7 +182,7 @@ public DeliveryParameterBuilder language(String language) {
 
     public DeliveryParameterBuilder language(Locale language) {
         if (language != null) {
-            nameValuePairs.add(new BasicNameValuePair(LANGUAGE, language.toString()));
+            nameValuePairs.add(new BasicNameValuePair(LANGUAGE, language.toString().replace('_', '-')));
         }
         return this;
     }
diff --git a/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java b/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java
index a4be8398..4b833d91 100644
--- a/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java
+++ b/src/test/java/com/kenticocloud/delivery/DeliveryParameterBuilderTest.java
@@ -273,10 +273,18 @@ public void testLanguage() {
 
     @Test
     public void testLocaleLanguage() {
-        List<NameValuePair> params = DeliveryParameterBuilder.params().language(new Locale("pt-br")).build();
+        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());
+        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