fixed URL encoding bug (#97)

Author: Mark

ChangeLog

@@ -7,6 +7,7 @@ v4.1.8 (2017-02-xx)
 * added ArangoCollection.drop(isSystem)
 * improved ArangoDBException with responseCode, errorNum, errorMessage
 * changed ArangoCollection.deleteDocuments() to work with keys and documents
+* fixed URL encoding bug (#97)
 
 v4.1.7 (2017-01-26)
 ---------------------------

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

@@ -20,7 +20,9 @@
 
 package com.arangodb.internal;
 
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Type;
+import java.net.URLEncoder;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -83,7 +85,17 @@ protected String createPath(final String... params) {
 			if (i > 0) {
 				sb.append("/");
 			}
-			sb.append(params[i]);
+			try {
+				final String param;
+				if (params[i].contains("/") || params[i].contains(" ")) {
+					param = params[i];
+				} else {
+					param = URLEncoder.encode(params[i], "UTF-8");
+				}
+				sb.append(param);
+			} catch (final UnsupportedEncodingException e) {
+				throw new ArangoDBException(e);
+			}
 		}
 		return sb.toString();
 	}

src/test/java/com/arangodb/ArangoCollectionTest.java

@@ -1660,4 +1660,12 @@ public void getRevision() {
 		assertThat(result.getRevision(), is(notNullValue()));
 	}
 
+	@Test
+	public void keyWithPunctuationCharacter() {
+		final String key = "myKey+";
+		db.collection(COLLECTION_NAME).insertDocument(new BaseDocument(key));
+		final BaseDocument doc = db.collection(COLLECTION_NAME).getDocument(key, BaseDocument.class);
+		assertThat(doc, is(notNullValue()));
+		assertThat(doc.getKey(), is(key));
+	}
 }