Merge pull request #18 from maxmind/greg/correctly-encode-string-entities

Correctly encode non-ASCII string entities.

Author: andyjack

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.1.1 (2016-10-12)
+------------------
+
+* Non-ASCII characters are now correctly encoded as UTF-8 in the request body.
+  Reported by Julien Guery. GitHub #17.
+
 1.1.0 (2016-10-10)
 ------------------
 

src/main/java/com/maxmind/minfraud/WebServiceClient.java

@@ -31,6 +31,8 @@
 import java.net.*;
 import java.util.*;
 
+import static org.apache.http.entity.ContentType.APPLICATION_JSON;
+
 /**
  * Client for MaxMind minFraud Score, Insights, and Factors
  */
@@ -309,8 +311,7 @@ private HttpPost requestFor(Transaction transaction, URL url)
 
         String requestBody = transaction.toJson();
 
-        StringEntity input = new StringEntity(requestBody);
-        input.setContentType("application/json");
+        StringEntity input = new StringEntity(requestBody, APPLICATION_JSON);
 
         request.setEntity(input);
         return request;

src/test/java/com/maxmind/minfraud/WebServiceClientTest.java

@@ -2,6 +2,8 @@
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.maxmind.minfraud.exception.*;
+import com.maxmind.minfraud.request.Device;
+import com.maxmind.minfraud.request.Shipping;
 import com.maxmind.minfraud.request.Transaction;
 import com.maxmind.minfraud.response.FactorsResponse;
 import com.maxmind.minfraud.response.InsightsResponse;
@@ -14,6 +16,8 @@
 import org.junit.runner.RunWith;
 import org.skyscreamer.jsonassert.JSONAssert;
 
+import java.net.InetAddress;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.jcabi.matchers.RegexMatchers.matchesPattern;
 import static com.maxmind.minfraud.request.RequestTestHelper.*;
@@ -70,6 +74,23 @@ public void testFullFactorsTransaction() throws Exception {
         }
     }
 
+    @Test
+    public void testRequestEncoding() throws Exception {
+        try (WebServiceClient client = createSuccessClient("insights", "{}")) {
+            Transaction request = new Transaction.Builder(
+                    new Device.Builder(InetAddress.getByName("1.1.1.1")).build()
+            ).shipping(
+                    new Shipping.Builder()
+                            .firstName("Allan dias á s maia")
+                            .build()
+            ).build();
+            client.insights(request);
+
+            verify(postRequestedFor(urlMatching("/minfraud/v2.0/insights"))
+                    .withRequestBody(equalToJson("{\"device\":{\"ip_address\":\"1.1.1.1\"},\"shipping\":{\"first_name\":\"Allan dias á s maia\"}}")));
+        }
+    }
+
     @Test
     public void test200WithNoBody() throws Exception {
         try (WebServiceClient client = createSuccessClient("insights", "")) {

src/test/java/com/maxmind/minfraud/request/RequestTestHelper.java

@@ -128,6 +128,6 @@ public static void verifyRequestFor(String service) throws IOException, URISynta
 
         verify(postRequestedFor(urlMatching("/minfraud/v2.0/" + service))
                 .withRequestBody(equalToJson(requestBody))
-                .withHeader("Content-Type", matching("application/json")));
+                .withHeader("Content-Type", matching("application/json; charset=UTF-8")));
     }
 }