fixed URI encoding

Author: Mark

ChangeLog

@@ -1,6 +1,7 @@
 v4.1.9 (2017-02-xx)
 ---------------------------
 * added missing IndexType.edge
+* fixed URI encoding
 
 v4.1.8 (2017-02-03)
 ---------------------------

src/main/java/com/arangodb/internal/ArangoExecutor.java

@@ -92,7 +92,7 @@ protected String createPath(final String... params) {
 				if (params[i].contains(SLASH)) {
 					param = createPath(params[i].split(SLASH));
 				} else {
-					param = URLEncoder.encode(params[i], "UTF-8");
+					param = encode(params[i]);
 				}
 				sb.append(param);
 			} catch (final UnsupportedEncodingException e) {
@@ -102,6 +102,11 @@ protected String createPath(final String... params) {
 		return sb.toString();
 	}
 
+	private String encode(final String value) throws UnsupportedEncodingException {
+		return URLEncoder.encode(value, "UTF-8").replaceAll("\\+", "%20").replaceAll("\\%21", "!")
+				.replaceAll("\\%27", "'").replaceAll("\\%28", "(").replaceAll("\\%29", ")").replaceAll("\\%7E", "~");
+	}
+
 	public void validateDocumentKey(final String key) throws ArangoDBException {
 		validateName("document key", REGEX_DOCUMENT_KEY, key);
 	}