Remove guava URL encode dependency

Change-Id: I7b76c7736f470dd5016370b61d3872300c3331a9

1 files changed, 10 insertions, 2 deletions

diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
index d3a988bea3..c139d5443c 100644
--- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
@@ -20,6 +20,8 @@ import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -37,7 +39,6 @@ import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
 import org.jsoup.parser.Tag;
 
-import com.google.gwt.thirdparty.guava.common.net.UrlEscapers;
 import com.vaadin.annotations.JavaScript;
 import com.vaadin.annotations.StyleSheet;
 import com.vaadin.annotations.Viewport;
@@ -227,7 +228,14 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
 
         @Override
         protected String encodeQueryStringParameterValue(String queryString) {
-            return UrlEscapers.urlFormParameterEscaper().escape(queryString);
+            String encodedString = null;
+            try {
+                encodedString = URLEncoder.encode(queryString, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                // should never happen
+                throw new RuntimeException("Could not find UTF-8", e);
+            }
+            return encodedString;
         }
     }