Merge branch 'dev' into issue2

Author: bcsorba

README.md

@@ -3,7 +3,10 @@ Piwik Java Tracker
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.piwik.java.tracking/piwik-java-tracker/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/org.piwik.java.tracking/piwik-java-tracker)
 [![Build Status](https://travis-ci.org/piwik/piwik-java-tracker.svg?branch=master)](https://travis-ci.org/piwik/piwik-java-tracker)
 
-Java implementation of the [Piwik Tracking HTTP API](http://developer.piwik.org/api-reference/tracking-api).
+Official Java implementation of the [Piwik Tracking HTTP API](http://developer.piwik.org/api-reference/tracking-api).
+
+## Javadoc
+The Javadoc for this project is hosted as a Github page for this repo.  The latest Javadoc can be found [here](http://piwik.github.io/piwik-java-tracker/javadoc/1.0.0/index.html).
 
 ## Using this API
 ### Create a Request
@@ -81,6 +84,21 @@ Clean this project using
 ```shell
 mvn clean
 ```
+
+## Dependencies
+All dependencies used to compile and test this project can be found in [lib/](lib).  Include these as needed in your project.
+
+## Contribute
+Have a fantastic feature idea?  Spot a bug?  We would absolutely love for you to contribute to this project!  Please feel free to:
+* Fork this project
+* Create a feature branch from the <strong>dev</strong> branch
+* Write awesome code that does awesome things
+* Write awesome test that test your awesome code
+* Verify that everything is working as it should by running <strong>ant test</strong>.  If everything passes, you may want to make sure that your tests are covering everything you think they are!  Run <strong>ant mutate</strong> to find out!
+* Commit this code to your repository
+* Submit a pull request from your branch to our dev branch and let us know why you made the changes you did
+* We'll take a look at your request and work to get it integrated with the repo!
+
 ## Contact
 brett.csorba@ge.com
 

src/main/java/org/piwik/java/tracking/PiwikRequest.java

@@ -6,6 +6,7 @@
  */
 package org.piwik.java.tracking;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
@@ -1464,7 +1465,11 @@ public String getUrlEncodedQueryString(){
             }
             sb.append(parameter.getKey());
             sb.append("=");
-            sb.append(URLEncoder.encode(parameter.getValue().toString()));
+            try {
+                sb.append(URLEncoder.encode(parameter.getValue().toString(), "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                System.err.println(e.getMessage());
+            }
         }
 
         return sb.toString();

src/main/java/org/piwik/java/tracking/PiwikTracker.java

@@ -17,7 +17,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 
 /**
  * A class that sends {@link PiwikRequest}s to a specified Piwik server.
@@ -103,6 +103,7 @@ public HttpResponse sendBulkRequest(Iterable<PiwikRequest> requests, String auth
      * @return a HTTP client
      */
     protected HttpClient getHttpClient(){
-        return new DefaultHttpClient();
+        HttpClient client = HttpClientBuilder.create().build();
+        return client;
     }
 }