Load balancing/ fallback refactoring

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

@@ -67,16 +67,8 @@ public <T> T execute(
 final Request request,
 final ResponseDeserializer<T> responseDeserializer,
 final HostHandle hostHandle) throws ArangoDBException {
-return execute(request, responseDeserializer, hostHandle, false);
-}
-
-public <T> T execute(
-final Request request,
-final ResponseDeserializer<T> responseDeserializer,
-final HostHandle hostHandle,
-final boolean closeConnection) throws ArangoDBException {
 try {
-final Response response = protocol.execute(request, hostHandle, closeConnection);
+final Response response = protocol.execute(request, hostHandle);
 return responseDeserializer.deserialize(response);
 } catch (final VPackException e) {
 throw new ArangoDBException(e);

src/main/java/com/arangodb/internal/http/HttpCommunication.java

@@ -123,24 +123,23 @@ public void disconnect() throws IOException {
 connectionPool.disconnect();
 }
 
-public Response execute(final Request request, final HostHandle hostHandle, final boolean closeConnection)
-throws ArangoDBException, IOException {
+public Response execute(final Request request, final HostHandle hostHandle) throws ArangoDBException, IOException {
 final HttpConnection connection = connectionPool.connection(hostHandle);
 try {
-return execute(request, connection, closeConnection);
+return execute(request, connection);
 } catch (final ArangoDBException e) {
 if (e instanceof ArangoDBRedirectException) {
 final String location = ArangoDBRedirectException.class.cast(e).getLocation();
 final Host host = HostUtils.createFromLocation(location);
 connectionPool.closeConnectionOnError(connection);
-return execute(request, new HostHandle().setHost(host), closeConnection);
+return execute(request, new HostHandle().setHost(host));
 } else {
 throw e;
 }
 }
 }
 
-protected Response execute(final Request request, final HttpConnection connection, final boolean closeConnection)
+protected Response execute(final Request request, final HttpConnection connection)
 throws ArangoDBException, IOException {
 return connection.execute(request);
 }

src/main/java/com/arangodb/internal/http/HttpProtocol.java

@@ -44,10 +44,9 @@ public HttpProtocol(final HttpCommunication httpCommunitaction) {
 }
 
 @Override
-public Response execute(final Request request, final HostHandle hostHandle, final boolean closeConnection)
-throws ArangoDBException {
+public Response execute(final Request request, final HostHandle hostHandle) throws ArangoDBException {
 try {
-return httpCommunitaction.execute(request, hostHandle, closeConnection);
+return httpCommunitaction.execute(request, hostHandle);
 } catch (final ClientProtocolException e) {
 throw new ArangoDBException(e);
 } catch (final IOException e) {

src/main/java/com/arangodb/internal/net/CommunicationProtocol.java

@@ -32,6 +32,6 @@
  */
 public interface CommunicationProtocol extends Closeable {
 
-Response execute(final Request request, HostHandle hostHandle, boolean closeConnection) throws ArangoDBException;
+Response execute(final Request request, HostHandle hostHandle) throws ArangoDBException;
 
 }

src/main/java/com/arangodb/internal/velocystream/VstCommunication.java

@@ -94,24 +94,23 @@ public void disconnect() throws IOException {
 connectionPool.disconnect();
 }
 
-public R execute(final Request request, final HostHandle hostHandle, final boolean closeConnection)
-throws ArangoDBException {
+public R execute(final Request request, final HostHandle hostHandle) throws ArangoDBException {
 final C connection = connectionPool.connection(hostHandle);
 try {
-return execute(request, connection, closeConnection);
+return execute(request, connection);
 } catch (final ArangoDBException e) {
 if (e instanceof ArangoDBRedirectException) {
 final String location = ArangoDBRedirectException.class.cast(e).getLocation();
 final Host host = HostUtils.createFromLocation(location);
 connectionPool.closeConnectionOnError(connection);
-return execute(request, new HostHandle().setHost(host), closeConnection);
+return execute(request, new HostHandle().setHost(host));
 } else {
 throw e;
 }
 }
 }
 
-protected abstract R execute(final Request request, C connection, boolean closeConnection) throws ArangoDBException;
+protected abstract R execute(final Request request, C connection) throws ArangoDBException;
 
 protected void checkError(final Response response) throws ArangoDBException {
 ResponseUtils.checkError(util, response);

src/main/java/com/arangodb/internal/velocystream/VstCommunicationSync.java

@@ -133,8 +133,7 @@ public ConnectionSync createConnection(final Host host) {
 }
 
 @Override
-protected Response execute(final Request request, final ConnectionSync connection, final boolean closeConnection)
-throws ArangoDBException {
+protected Response execute(final Request request, final ConnectionSync connection) throws ArangoDBException {
 connect(connection);
 try {
 final Message requestMessage = createMessage(request);
@@ -145,12 +144,7 @@ protected Response execute(final Request request, final ConnectionSync connectio
 return response;
 } catch (final VPackParserException e) {
 throw new ArangoDBException(e);
-} finally {
-if (closeConnection) {
-connection.close();
-}
 }
-
 }
 
 private Message send(final Message message, final ConnectionSync connection) throws ArangoDBException {
@@ -165,7 +159,7 @@ private Message send(final Message message, final ConnectionSync connection) thr
 protected void authenticate(final ConnectionSync connection) {
 final Response response = execute(
 new AuthenticationRequest(user, password != null ? password : "", ArangoDBConstants.ENCRYPTION_PLAIN),
-connection, false);
+connection);
 checkError(response);
 }
 

src/main/java/com/arangodb/internal/velocystream/VstProtocol.java

@@ -43,9 +43,8 @@ public VstProtocol(final VstCommunication<Response, ConnectionSync> communicatio
 }
 
 @Override
-public Response execute(final Request request, final HostHandle hostHandle, final boolean closeConnection)
-throws ArangoDBException {
-return communication.execute(request, hostHandle, closeConnection);
+public Response execute(final Request request, final HostHandle hostHandle) throws ArangoDBException {
+return communication.execute(request, hostHandle);
 }
 
 @Override