Corrected malformed bulk trackind request body

Author: bcsorba

src/com/ge/corporate/piwik/tracking/PiwikTracker.java

@@ -84,7 +84,7 @@ public HttpResponse sendBulkRequest(Iterable<PiwikRequest> requests, String auth
         JsonArrayBuilder ab = Json.createArrayBuilder();
 
         for (PiwikRequest request : requests){
-            ab.add(request.getQueryString());
+            ab.add("?"+request.getQueryString());
         }
 
         ob.add(REQUESTS, ab);
@@ -95,7 +95,8 @@ public HttpResponse sendBulkRequest(Iterable<PiwikRequest> requests, String auth
 
         HttpClient client = getHttpClient();
         HttpPost post = new HttpPost(uriBuilder.build());
-        post.setEntity(new StringEntity(ob.build().toString(), ContentType.APPLICATION_JSON));
+        post.setEntity(new StringEntity(ob.build().toString(),
+                ContentType.APPLICATION_JSON));
 
         return client.execute(post);
     }

test/com/ge/corporate/piwik/tracking/PiwikTrackerTest.java

@@ -139,7 +139,7 @@ public void testSendBulkRequest_Iterable_StringFF() throws Exception{
         doReturn("query").when(request).getQueryString();
         requests.add(request);        
         doReturn(client).when(piwikTracker).getHttpClient();
-        doReturn(response).when(client).execute(argThat(new CorrectPostRequest("{\"requests\":[\"query\"]}")));
+        doReturn(response).when(client).execute(argThat(new CorrectPostRequest("{\"requests\":[\"?query\"]}")));
 
         assertEquals(response, piwikTracker.sendBulkRequest(requests, null));
     }
@@ -153,7 +153,7 @@ public void testSendBulkRequest_Iterable_StringFT() throws Exception{
         doReturn("query").when(request).getQueryString();
         requests.add(request);        
         doReturn(client).when(piwikTracker).getHttpClient();
-        doReturn(response).when(client).execute(argThat(new CorrectPostRequest("{\"requests\":[\"query\"],\"token_auth\":\"12345678901234567890123456789012\"}")));
+        doReturn(response).when(client).execute(argThat(new CorrectPostRequest("{\"requests\":[\"?query\"],\"token_auth\":\"12345678901234567890123456789012\"}")));
 
         assertEquals(response, piwikTracker.sendBulkRequest(requests, "12345678901234567890123456789012"));
     }