Merge branch 'feature/java-scala-0.2.2'

Author: alexanderdean

java-scala/CHANGELOG

@@ -1,3 +1,7 @@
+Version 0.2.2 (2014-07-23)
+--------------------------
+Fixed Java referer-parser doesn't work on Hadoop (#76)
+
 Version 0.2.1 (2014-07-16)
 --------------------------
 Updated build process for local Maven publishing (#72)

java-scala/project/BuildSettings.scala

@@ -22,7 +22,7 @@ object BuildSettings {
   // Basic settings for our app
   lazy val basicSettings = Seq[Setting[_]](
     organization  := "com.snowplowanalytics",
-    version       := "0.2.1",
+    version       := "0.2.2",
     description   := "Library for extracting marketing attribution data from referer URLs",
     scalaVersion  := "2.9.1",
     crossScalaVersions := Seq("2.9.1", "2.10.4", "2.11.1"),

java-scala/src/main/java/com/snowplowanalytics/refererparser/Parser.java

@@ -117,7 +117,7 @@ public Referer parse(URI refererUri, String pageHost, List<String> internalDomai
   }
 
   public Referer parse(URL refererUrl, String pageHost){
-    if(refererUrl == null) { return null; }
+    if (refererUrl == null) { return null; }
     return parse(refererUrl.getProtocol(), refererUrl.getHost(), refererUrl.getPath(), refererUrl.getQuery(), pageHost);
   }
 
@@ -202,9 +202,12 @@ private String extractSearchTerm(String query, List<String> possibleParameters)
 
     List<NameValuePair> params;
     try {
-      params = URLEncodedUtils.parse(query, Charset.forName("UTF-8"));
+      params = URLEncodedUtils.parse(new URI("http://localhost?" + query), "UTF-8");
+      // params = URLEncodedUtils.parse(query, Charset.forName("UTF-8")); because https://github.com/snowplow/referer-parser/issues/76
     } catch (IllegalArgumentException iae) {
       return null;
+    } catch (URISyntaxException use) { // For new URI
+      return null;
     }
 
     for (NameValuePair pair : params) {