Fix ArangoDB.aquireHostList(true) with authentication

Author: mpv1989

ChangeLog

@@ -1,6 +1,7 @@
-v4.5.1 (xxxx-xx-xx)
+v4.5.1 (2018-06-21)
 ---------------------------
 * fixed exists() method in ArangoDatabase, ArangoCollection, ArangoGraph: check for ArangoDB error num
+* fixed ArangoDB.aquireHostList(true) with authentication
 
 v4.5.0 (2018-06-11)
 ---------------------------

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

@@ -211,7 +211,7 @@ public Response execute(final Request request) throws ArangoDBException, IOExcep
 response = buildResponse(client.execute(httpRequest));
 checkError(response);
 hostHandler.success();
-hostHandler.opened();
+hostHandler.confirm();
 return response;
 } catch (final SocketException e) {
 hostHandler.fail();

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

@@ -65,8 +65,8 @@ public void reset() {
 }
 
 @Override
-public void opened() {
-hostHandler.opened();
+public void confirm() {
+hostHandler.confirm();
 }
 
 }

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

@@ -70,7 +70,7 @@ public void reset() {
 }
 
 @Override
-public void opened() {
+public void confirm() {
 if (firstOpened) {
 // after first successful established connection, update host list
 resolver.resolve(false, false);

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

@@ -36,6 +36,6 @@ public interface HostHandler {
 
 void reset();
 
-void opened();
+void confirm();
 
 }

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

@@ -74,7 +74,7 @@ public void reset() {
 }
 
 @Override
-public void opened() {
+public void confirm() {
 }
 
 }

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

@@ -68,7 +68,7 @@ public void reset() {
 }
 
 @Override
-public void opened() {
+public void confirm() {
 }
 
 }

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

@@ -1,154 +1,155 @@
-/*
- * 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.internal.velocystream;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.net.ssl.SSLContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.arangodb.ArangoDBException;
-import com.arangodb.internal.ArangoDBConstants;
-import com.arangodb.internal.Host;
-import com.arangodb.internal.net.ArangoDBRedirectException;
-import com.arangodb.internal.net.ConnectionPool;
-import com.arangodb.internal.net.HostHandle;
-import com.arangodb.internal.util.HostUtils;
-import com.arangodb.internal.util.ResponseUtils;
-import com.arangodb.internal.velocystream.internal.Chunk;
-import com.arangodb.internal.velocystream.internal.Message;
-import com.arangodb.internal.velocystream.internal.VstConnection;
-import com.arangodb.util.ArangoSerialization;
-import com.arangodb.velocypack.VPackSlice;
-import com.arangodb.velocypack.exception.VPackParserException;
-import com.arangodb.velocystream.Request;
-import com.arangodb.velocystream.Response;
-
-/**
- * @author Mark Vollmary
- *
- */
-public abstract class VstCommunication<R, C extends VstConnection> {
-
-private static final Logger LOGGER = LoggerFactory.getLogger(VstCommunication.class);
-
-protected static final AtomicLong mId = new AtomicLong(0L);
-protected final ArangoSerialization util;
-protected final ConnectionPool<C> connectionPool;
-
-protected final String user;
-protected final String password;
-
-protected final Integer chunksize;
-
-protected VstCommunication(final Integer timeout, final String user, final String password, final Boolean useSsl,
-final SSLContext sslContext, final ArangoSerialization util, final Integer chunksize,
-final ConnectionPool<C> connectionPool) {
-this.user = user;
-this.password = password;
-this.util = util;
-this.connectionPool = connectionPool;
-this.chunksize = chunksize != null ? chunksize : ArangoDBConstants.CHUNK_DEFAULT_CONTENT_SIZE;
-}
-
-protected synchronized void connect(final C connection) {
-if (!connection.isOpen()) {
-try {
-connection.open();
-if (user != null) {
-authenticate(connection);
-}
-} catch (final IOException e) {
-LOGGER.error(e.getMessage(), e);
-throw new ArangoDBException(e);
-}
-}
-}
-
-protected abstract void authenticate(final C connection);
-
-public void disconnect() throws IOException {
-connectionPool.disconnect();
-}
-
-public R execute(final Request request, final HostHandle hostHandle) throws ArangoDBException {
-final C connection = connectionPool.connection(hostHandle);
-try {
-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));
-} else {
-throw e;
-}
-}
-}
-
-protected abstract R execute(final Request request, C connection) throws ArangoDBException;
-
-protected void checkError(final Response response) throws ArangoDBException {
-ResponseUtils.checkError(util, response);
-}
-
-protected Response createResponse(final Message message) throws VPackParserException {
-final Response response = util.deserialize(message.getHead(), Response.class);
-if (message.getBody() != null) {
-response.setBody(message.getBody());
-}
-return response;
-}
-
-protected Message createMessage(final Request request) throws VPackParserException {
-final long id = mId.incrementAndGet();
-return new Message(id, util.serialize(request), request.getBody());
-}
-
-protected Collection<Chunk> buildChunks(final Message message) {
-final Collection<Chunk> chunks = new ArrayList<Chunk>();
-final VPackSlice head = message.getHead();
-int size = head.getByteSize();
-final VPackSlice body = message.getBody();
-if (body != null) {
-size += body.getByteSize();
-}
-final int n = size / chunksize;
-final int numberOfChunks = (size % chunksize != 0) ? (n + 1) : n;
-int off = 0;
-for (int i = 0; size > 0; i++) {
-final int len = Math.min(chunksize, size);
-final long messageLength = (i == 0 && numberOfChunks > 1) ? size : -1L;
-final Chunk chunk = new Chunk(message.getId(), i, numberOfChunks, messageLength, off, len);
-size -= len;
-off += len;
-chunks.add(chunk);
-}
-return chunks;
-}
-
-}
+/*
+ * 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.internal.velocystream;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.net.ssl.SSLContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.arangodb.ArangoDBException;
+import com.arangodb.internal.ArangoDBConstants;
+import com.arangodb.internal.Host;
+import com.arangodb.internal.net.ArangoDBRedirectException;
+import com.arangodb.internal.net.ConnectionPool;
+import com.arangodb.internal.net.HostHandle;
+import com.arangodb.internal.util.HostUtils;
+import com.arangodb.internal.util.ResponseUtils;
+import com.arangodb.internal.velocystream.internal.Chunk;
+import com.arangodb.internal.velocystream.internal.Message;
+import com.arangodb.internal.velocystream.internal.VstConnection;
+import com.arangodb.util.ArangoSerialization;
+import com.arangodb.velocypack.VPackSlice;
+import com.arangodb.velocypack.exception.VPackParserException;
+import com.arangodb.velocystream.Request;
+import com.arangodb.velocystream.Response;
+
+/**
+ * @author Mark Vollmary
+ *
+ */
+public abstract class VstCommunication<R, C extends VstConnection> {
+
+private static final Logger LOGGER = LoggerFactory.getLogger(VstCommunication.class);
+
+protected static final AtomicLong mId = new AtomicLong(0L);
+protected final ArangoSerialization util;
+protected final ConnectionPool<C> connectionPool;
+
+protected final String user;
+protected final String password;
+
+protected final Integer chunksize;
+
+protected VstCommunication(final Integer timeout, final String user, final String password, final Boolean useSsl,
+final SSLContext sslContext, final ArangoSerialization util, final Integer chunksize,
+final ConnectionPool<C> connectionPool) {
+this.user = user;
+this.password = password;
+this.util = util;
+this.connectionPool = connectionPool;
+this.chunksize = chunksize != null ? chunksize : ArangoDBConstants.CHUNK_DEFAULT_CONTENT_SIZE;
+}
+
+protected synchronized void connect(final C connection) {
+if (!connection.isOpen()) {
+try {
+connection.open();
+if (user != null) {
+authenticate(connection);
+}
+connection.confirm();
+} catch (final IOException e) {
+LOGGER.error(e.getMessage(), e);
+throw new ArangoDBException(e);
+}
+}
+}
+
+protected abstract void authenticate(final C connection);
+
+public void disconnect() throws IOException {
+connectionPool.disconnect();
+}
+
+public R execute(final Request request, final HostHandle hostHandle) throws ArangoDBException {
+final C connection = connectionPool.connection(hostHandle);
+try {
+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));
+} else {
+throw e;
+}
+}
+}
+
+protected abstract R execute(final Request request, C connection) throws ArangoDBException;
+
+protected void checkError(final Response response) throws ArangoDBException {
+ResponseUtils.checkError(util, response);
+}
+
+protected Response createResponse(final Message message) throws VPackParserException {
+final Response response = util.deserialize(message.getHead(), Response.class);
+if (message.getBody() != null) {
+response.setBody(message.getBody());
+}
+return response;
+}
+
+protected Message createMessage(final Request request) throws VPackParserException {
+final long id = mId.incrementAndGet();
+return new Message(id, util.serialize(request), request.getBody());
+}
+
+protected Collection<Chunk> buildChunks(final Message message) {
+final Collection<Chunk> chunks = new ArrayList<Chunk>();
+final VPackSlice head = message.getHead();
+int size = head.getByteSize();
+final VPackSlice body = message.getBody();
+if (body != null) {
+size += body.getByteSize();
+}
+final int n = size / chunksize;
+final int numberOfChunks = (size % chunksize != 0) ? (n + 1) : n;
+int off = 0;
+for (int i = 0; size > 0; i++) {
+final int len = Math.min(chunksize, size);
+final long messageLength = (i == 0 && numberOfChunks > 1) ? size : -1L;
+final Chunk chunk = new Chunk(message.getId(), i, numberOfChunks, messageLength, off, len);
+size -= len;
+off += len;
+chunks.add(chunk);
+}
+return chunks;
+}
+
+}

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

@@ -187,7 +187,10 @@ public Void call() throws Exception {
 return null;
 }
 });
-hostHandler.opened();
+}
+
+public void confirm() {
+hostHandler.confirm();
 }
 
 @Override