Add http support

Author: mpv1989

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.arangodb</groupId>
 	<artifactId>arangodb-java-driver</artifactId>
-	<version>4.1.13-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<inceptionYear>2016</inceptionYear>
 	<packaging>jar</packaging>
 
@@ -27,6 +27,7 @@
 		<logback-classic.version>1.1.3</logback-classic.version>
 		<hamcrest-all.version>1.3</hamcrest-all.version>
 		<junit.version>4.12</junit.version>
+		<httpclient.version>4.5.1</httpclient.version>
 		<arangodb.velocypack.version>1.0.5</arangodb.velocypack.version>
 	</properties>
 
@@ -204,6 +205,11 @@
 	</build>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.arangodb</groupId>
 			<artifactId>velocypack</artifactId>
@@ -235,6 +241,11 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>${httpclient.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.arangodb</groupId>
 				<artifactId>velocypack</artifactId>

src/main/java/com/arangodb/ArangoCollection.java

@@ -50,6 +50,7 @@
 import com.arangodb.model.HashIndexOptions;
 import com.arangodb.model.PersistentIndexOptions;
 import com.arangodb.model.SkiplistIndexOptions;
+import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocystream.Response;
 
 /**
@@ -522,7 +523,7 @@ public Boolean documentExists(final String key) {
 	 */
 	public Boolean documentExists(final String key, final DocumentExistsOptions options) {
 		try {
-			executor.communication().execute(documentExistsRequest(key, options));
+			executor.execute(documentExistsRequest(key, options), VPackSlice.class);
 			return true;
 		} catch (final ArangoDBException e) {
 			return false;

src/main/java/com/arangodb/ArangoDB.java

@@ -40,24 +40,27 @@
 import com.arangodb.internal.ArangoExecutorSync;
 import com.arangodb.internal.CollectionCache;
 import com.arangodb.internal.CollectionCache.DBAccess;
+import com.arangodb.internal.CommunicationProtocol;
 import com.arangodb.internal.DocumentCache;
 import com.arangodb.internal.InternalArangoDB;
+import com.arangodb.internal.http.HttpCommunication;
+import com.arangodb.internal.http.HttpProtocol;
 import com.arangodb.internal.util.ArangoDeserializerImpl;
 import com.arangodb.internal.util.ArangoSerializerImpl;
 import com.arangodb.internal.util.ArangoUtilImpl;
 import com.arangodb.internal.velocypack.VPackDocumentModule;
 import com.arangodb.internal.velocypack.VPackDriverModule;
-import com.arangodb.internal.velocystream.Communication;
 import com.arangodb.internal.velocystream.CommunicationSync;
 import com.arangodb.internal.velocystream.ConnectionSync;
 import com.arangodb.internal.velocystream.DefaultHostHandler;
 import com.arangodb.internal.velocystream.Host;
+import com.arangodb.internal.velocystream.VelocyStreamProtocol;
 import com.arangodb.model.LogOptions;
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
 import com.arangodb.util.ArangoDeserializer;
-import com.arangodb.util.ArangoSerializer;
 import com.arangodb.util.ArangoSerialization;
+import com.arangodb.util.ArangoSerializer;
 import com.arangodb.velocypack.VPack;
 import com.arangodb.velocypack.VPackAnnotationFieldFilter;
 import com.arangodb.velocypack.VPackAnnotationFieldNaming;
@@ -95,6 +98,7 @@ public static class Builder {
 		private final VPackParser.Builder vpackParserBuilder;
 		private ArangoSerializer serializer;
 		private ArangoDeserializer deserializer;
+		private Protocol protocol;
 
 		public Builder() {
 			super();
@@ -202,6 +206,11 @@ public Builder maxConnections(final Integer maxConnections) {
 			return this;
 		}
 
+		public Builder useProtocol(final Protocol protocol) {
+			this.protocol = protocol;
+			return this;
+		}
+
 		public <T> Builder registerSerializer(final Class<T> clazz, final VPackSerializer<T> serializer) {
 			vpackBuilder.registerSerializer(clazz, serializer);
 			return this;
@@ -340,31 +349,56 @@ public synchronized ArangoDB build() {
 					new CommunicationSync.Builder(new DefaultHostHandler(new ArrayList<Host>(hosts))).timeout(timeout)
 							.user(user).password(password).useSsl(useSsl).sslContext(sslContext).chunksize(chunksize)
 							.maxConnections(maxConnections),
-					new ArangoUtilImpl(serializerTemp, deserializerTemp), collectionCache);
+					new HttpCommunication.Builder(new DefaultHostHandler(new ArrayList<Host>(hosts))).timeout(timeout)
+							.user(user).password(password).useSsl(useSsl).sslContext(sslContext),
+					new ArangoUtilImpl(serializerTemp, deserializerTemp), collectionCache, protocol);
 		}
 
 	}
 
-	public ArangoDB(final CommunicationSync.Builder commBuilder, final ArangoSerialization util,
-		final CollectionCache collectionCache) {
-		super(new ArangoExecutorSync(commBuilder.build(util, collectionCache), util, new DocumentCache(),
-				collectionCache), util);
-		final Communication<Response, ConnectionSync> cacheCom = commBuilder.build(util, collectionCache);
+	public ArangoDB(final CommunicationSync.Builder vstBuilder, final HttpCommunication.Builder httpBuilder,
+		final ArangoSerialization util, final CollectionCache collectionCache, final Protocol protocol) {
+		super(new ArangoExecutorSync(createProtocol(vstBuilder, httpBuilder, util, collectionCache, protocol), util,
+				new DocumentCache()), util);
+		final CommunicationProtocol cp = createProtocol(vstBuilder, httpBuilder, util, collectionCache, protocol);
 		collectionCache.init(new DBAccess() {
 			@Override
 			public ArangoDatabase db(final String name) {
-				return new ArangoDatabase(cacheCom, util, executor.documentCache(), null, name);
+				return new ArangoDatabase(cp, util, executor.documentCache(), name);
 			}
 		});
 	}
 
+	private static CommunicationProtocol createProtocol(
+		final CommunicationSync.Builder vstBuilder,
+		final HttpCommunication.Builder httpBuilder,
+		final ArangoSerialization util,
+		final CollectionCache collectionCache,
+		final Protocol protocol) {
+		return (protocol == null || Protocol.VST == protocol) ? createVST(vstBuilder, util, collectionCache)
+				: createHTTP(httpBuilder, util);
+	}
+
+	private static CommunicationProtocol createVST(
+		final CommunicationSync.Builder builder,
+		final ArangoSerialization util,
+		final CollectionCache collectionCache) {
+		return new VelocyStreamProtocol(builder.build(util, collectionCache));
+	}
+
+	private static CommunicationProtocol createHTTP(
+		final HttpCommunication.Builder builder,
+		final ArangoSerialization util) {
+		return new HttpProtocol(builder.build(util));
+	}
+
 	@Override
 	protected ArangoExecutorSync executor() {
 		return executor;
 	}
 
 	public void shutdown() {
-		executor.communication().disconnect();
+		executor.disconnect();
 	}
 
 	/**

src/main/java/com/arangodb/ArangoDatabase.java

@@ -39,10 +39,9 @@
 import com.arangodb.entity.TraversalEntity;
 import com.arangodb.internal.ArangoCursorExecute;
 import com.arangodb.internal.ArangoExecutorSync;
-import com.arangodb.internal.CollectionCache;
+import com.arangodb.internal.CommunicationProtocol;
 import com.arangodb.internal.DocumentCache;
 import com.arangodb.internal.InternalArangoDatabase;
-import com.arangodb.internal.velocystream.Communication;
 import com.arangodb.internal.velocystream.ConnectionSync;
 import com.arangodb.model.AqlFunctionCreateOptions;
 import com.arangodb.model.AqlFunctionDeleteOptions;
@@ -70,9 +69,9 @@ protected ArangoDatabase(final ArangoDB arangoDB, final String name) {
 		super(arangoDB, arangoDB.executor(), arangoDB.util(), name);
 	}
 
-	protected ArangoDatabase(final Communication<Response, ConnectionSync> communication, final ArangoSerialization util,
-		final DocumentCache documentCache, final CollectionCache collectionCache, final String name) {
-		super(null, new ArangoExecutorSync(communication, util, documentCache, collectionCache), util, name);
+	protected ArangoDatabase(final CommunicationProtocol protocol, final ArangoSerialization util,
+		final DocumentCache documentCache, final String name) {
+		super(null, new ArangoExecutorSync(protocol, util, documentCache), util, name);
 	}
 
 	/**

src/main/java/com/arangodb/Protocol.java

@@ -0,0 +1,29 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2016 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+package com.arangodb;
+
+/**
+ * @author Mark - mark at arangodb.com
+ *
+ */
+public enum Protocol {
+	VST, HTTP
+}

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

@@ -27,7 +27,7 @@
  * @author Mark - mark at arangodb.com
  *
  */
-public abstract class ArangoExecuteable<E extends ArangoExecutor<R, C>, R, C extends Connection> {
+public abstract class ArangoExecuteable<E extends ArangoExecutor, R, C extends Connection> {
 
 	protected final E executor;
 	private final ArangoSerialization util;

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

@@ -22,15 +22,13 @@
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Type;
-import java.net.URLEncoder;
 import java.util.Map;
 import java.util.regex.Pattern;
 
 import com.arangodb.ArangoDBException;
-import com.arangodb.internal.velocystream.Communication;
-import com.arangodb.internal.velocystream.Connection;
-import com.arangodb.util.ArangoSerializer;
+import com.arangodb.internal.util.EncodeUtils;
 import com.arangodb.util.ArangoSerialization;
+import com.arangodb.util.ArangoSerializer;
 import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Response;
@@ -39,7 +37,7 @@
  * @author Mark - mark at arangodb.com
  *
  */
-public abstract class ArangoExecutor<R, C extends Connection> {
+public abstract class ArangoExecutor {
 
 	private static final String SLASH = "/";
 
@@ -50,32 +48,19 @@ public static interface ResponseDeserializer<T> {
 	protected static final String REGEX_KEY = "[^/]+";
 	protected static final String REGEX_ID = "[^/]+/[^/]+";
 
-	private final Communication<R, C> communication;
 	private final DocumentCache documentCache;
-	private final CollectionCache collectionCache;
 	private final ArangoSerialization util;
 
-	protected ArangoExecutor(final Communication<R, C> communication, final ArangoSerialization util,
-		final DocumentCache documentCache, final CollectionCache collectionCache) {
+	protected ArangoExecutor(final ArangoSerialization util, final DocumentCache documentCache) {
 		super();
-		this.communication = communication;
 		this.documentCache = documentCache;
-		this.collectionCache = collectionCache;
 		this.util = util;
 	}
 
-	public Communication<R, C> communication() {
-		return communication;
-	}
-
 	public DocumentCache documentCache() {
 		return documentCache;
 	}
 
-	protected CollectionCache collectionCache() {
-		return collectionCache;
-	}
-
 	protected ArangoSerialization util() {
 		return util;
 	}
@@ -91,7 +76,7 @@ protected String createPath(final String... params) {
 				if (params[i].contains(SLASH)) {
 					param = createPath(params[i].split(SLASH));
 				} else {
-					param = encode(params[i]);
+					param = EncodeUtils.encodeURL(params[i]);
 				}
 				sb.append(param);
 			} catch (final UnsupportedEncodingException e) {
@@ -101,11 +86,6 @@ 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 validateIndexId(final String id) {
 		validateName("index id", REGEX_ID, id);
 	}

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

@@ -20,11 +20,10 @@
 
 package com.arangodb.internal;
 
+import java.io.IOException;
 import java.lang.reflect.Type;
 
 import com.arangodb.ArangoDBException;
-import com.arangodb.internal.velocystream.Communication;
-import com.arangodb.internal.velocystream.ConnectionSync;
 import com.arangodb.util.ArangoSerialization;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Request;
@@ -34,11 +33,14 @@
  * @author Mark - mark at arangodb.com
  *
  */
-public class ArangoExecutorSync extends ArangoExecutor<Response, ConnectionSync> {
+public class ArangoExecutorSync extends ArangoExecutor {
 
-	public ArangoExecutorSync(final Communication<Response, ConnectionSync> communication, final ArangoSerialization util,
-		final DocumentCache documentCache, final CollectionCache collectionCache) {
-		super(communication, util, documentCache, collectionCache);
+	private final CommunicationProtocol protocol;
+
+	public ArangoExecutorSync(final CommunicationProtocol protocol, final ArangoSerialization util,
+		final DocumentCache documentCache) {
+		super(util, documentCache);
+		this.protocol = protocol;
 	}
 
 	public <T> T execute(final Request request, final Type type) throws ArangoDBException {
@@ -53,10 +55,18 @@ public T deserialize(final Response response) throws VPackException {
 	public <T> T execute(final Request request, final ResponseDeserializer<T> responseDeserializer)
 			throws ArangoDBException {
 		try {
-			final Response response = communication().execute(request);
+			final Response response = protocol.execute(request);
 			return responseDeserializer.deserialize(response);
 		} catch (final VPackException e) {
 			throw new ArangoDBException(e);
 		}
 	}
+
+	public void disconnect() {
+		try {
+			protocol.close();
+		} catch (final IOException e) {
+			throw new ArangoDBException(e);
+		}
+	}
 }