refactor extendedhostresolver

Author: BCaxelbecker

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

@@ -616,6 +616,7 @@ public synchronized ArangoDB build() {
 final Collection<Host> hostList = createHostList(max, connectionFactory);
 final HostResolver hostResolver = createHostResolver(hostList, max, connectionFactory);
 final HostHandler hostHandler = createHostHandler(hostResolver);
+
 return new ArangoDBImpl(
 new VstCommunicationSync.Builder(hostHandler).timeout(timeout).user(user).password(password)
 .useSsl(useSsl).sslContext(sslContext).chunksize(chunksize).maxConnections(maxConnections)

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

@@ -21,10 +21,7 @@
 package com.arangodb.internal;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
 
 import com.arangodb.ArangoDB;
 import com.arangodb.ArangoDBException;
@@ -42,7 +39,6 @@
 import com.arangodb.internal.net.CommunicationProtocol;
 import com.arangodb.internal.net.HostHandle;
 import com.arangodb.internal.net.HostResolver;
-import com.arangodb.internal.net.HostResolver.EndpointResolver;
 import com.arangodb.internal.util.ArangoSerializationFactory;
 import com.arangodb.internal.util.ArangoSerializationFactory.Serializer;
 import com.arangodb.internal.velocystream.VstCommunicationSync;
@@ -52,10 +48,8 @@
 import com.arangodb.model.UserUpdateOptions;
 import com.arangodb.util.ArangoCursorInitializer;
 import com.arangodb.util.ArangoSerialization;
-import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Request;
-import com.arangodb.velocystream.RequestType;
 import com.arangodb.velocystream.Response;
 
 /**
@@ -71,58 +65,30 @@ public class ArangoDBImpl extends InternalArangoDB<ArangoExecutorSync> implement
 public ArangoDBImpl(final VstCommunicationSync.Builder vstBuilder, final HttpCommunication.Builder httpBuilder,
 final ArangoSerializationFactory util, final Protocol protocol, final HostResolver hostResolver,
 final ArangoContext context) {
-super(new ArangoExecutorSync(createProtocol(vstBuilder, httpBuilder, util.get(Serializer.INTERNAL), protocol),
-util, new DocumentCache()), util, context);
-cp = createProtocol(new VstCommunicationSync.Builder(vstBuilder).maxConnections(1),
-new HttpCommunication.Builder(httpBuilder), util.get(Serializer.INTERNAL), protocol);
-hostResolver.init(new EndpointResolver() {
-@Override
-public Collection<String> resolve(final boolean closeConnections) throws ArangoDBException {
-Collection<String> response;
-try {
-response = executor.execute(new Request(ArangoRequestParam.SYSTEM, RequestType.GET, PATH_ENDPOINTS),
-new ResponseDeserializer<Collection<String>>() {
-@Override
-public Collection<String> deserialize(final Response response) throws VPackException {
-final VPackSlice field = response.getBody().get("endpoints");
-Collection<String> endpoints;
-if (field.isNone()) {
-endpoints = Collections.<String> emptyList();
-} else {
-final Collection<Map<String, String>> tmp = util().deserialize(field,
-Collection.class);
-endpoints = new ArrayList<String>();
-for (final Map<String, String> map : tmp) {
-for (final String value : map.values()) {
-endpoints.add(value);
-}
-}
-}
-return endpoints;
-}
-}, null);
-} catch (final ArangoDBException e) {
-final Integer responseCode = e.getResponseCode();
-if (responseCode != null && responseCode == 403) {
-response = Collections.<String> emptyList();
-} else {
-throw e;
-}
-} finally {
-if (closeConnections) {
-ArangoDBImpl.this.shutdown();
-}
-}
-return response;
-}
-});
+
+super(new ArangoExecutorSync(
+createProtocol(vstBuilder, httpBuilder, util.get(Serializer.INTERNAL), protocol),
+util, 
+new DocumentCache()), 
+util, 
+context);
+
+cp = createProtocol(
+new VstCommunicationSync.Builder(vstBuilder).maxConnections(1),
+new HttpCommunication.Builder(httpBuilder), 
+util.get(Serializer.INTERNAL), 
+protocol);
+
+hostResolver.init(this.executor(), util());
+
 }
 
 private static CommunicationProtocol createProtocol(
 final VstCommunicationSync.Builder vstBuilder,
 final HttpCommunication.Builder httpBuilder,
 final ArangoSerialization util,
 final Protocol protocol) {
+
 return (protocol == null || Protocol.VST == protocol) ? createVST(vstBuilder, util)
 : createHTTP(httpBuilder, util);
 }

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

@@ -54,7 +54,7 @@ public abstract class InternalArangoDB<E extends ArangoExecutor> extends ArangoE
 private static final String PATH_API_ADMIN_LOG = "/_admin/log";
 private static final String PATH_API_ADMIN_LOG_LEVEL = "/_admin/log/level";
 private static final String PATH_API_ROLE = "/_admin/server/role";
-protected static final String PATH_ENDPOINTS = "/_api/cluster/endpoints";
+private static final String PATH_ENDPOINTS = "/_api/cluster/endpoints";
 private static final String PATH_API_USER = "/_api/user";
 
 protected InternalArangoDB(final E executor, final ArangoSerializationFactory util, final ArangoContext context) {

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

@@ -20,33 +20,48 @@
 
 package com.arangodb.internal.net;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.arangodb.ArangoDBException;
+import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
+import com.arangodb.internal.ArangoExecutorSync;
+import com.arangodb.internal.ArangoRequestParam;
 import com.arangodb.internal.util.HostUtils;
+import com.arangodb.util.ArangoSerialization;
+import com.arangodb.velocypack.VPackSlice;
+import com.arangodb.velocypack.exception.VPackException;
+import com.arangodb.velocystream.Request;
+import com.arangodb.velocystream.RequestType;
+import com.arangodb.velocystream.Response;
 
 /**
  * @author Mark Vollmary
  *
  */
 public class ExtendedHostResolver implements HostResolver {
-
+
 private static final Logger LOGGER = LoggerFactory.getLogger(ExtendedHostResolver.class);
 
 private static final long MAX_CACHE_TIME = 60 * 60 * 1000;
-
-private EndpointResolver resolver;
+
 private HostSet hosts;
-
+
 private final Integer maxConnections;
 private final ConnectionFactory connectionFactory;
-
+
 private long lastUpdate;
 
+private ArangoExecutorSync executor;
+private ArangoSerialization arangoSerialization;
+
 public ExtendedHostResolver(final List<Host> hosts, final Integer maxConnections,
 final ConnectionFactory connectionFactory) {
 super();
@@ -57,52 +72,93 @@ public ExtendedHostResolver(final List<Host> hosts, final Integer maxConnections
 }
 
 @Override
-public void init(final EndpointResolver resolver) {
-this.resolver = resolver;
+public void init(ArangoExecutorSync executor, ArangoSerialization arangoSerialization) {
+this.executor = executor;
+this.arangoSerialization = arangoSerialization;
 }
 
 @Override
 
 public HostSet resolve(final boolean initial, final boolean closeConnections) {
-
+
 if (!initial && isExpired()) {
-
+
 lastUpdate = System.currentTimeMillis();
-
-final Collection<String> endpoints = resolver.resolve(closeConnections);
+
+final Collection<String> endpoints = resolveFromServer();
 LOGGER.debug("Resolve " + endpoints.size() + " Endpoints");
 LOGGER.debug("Endpoints " + Arrays.deepToString(endpoints.toArray()));
-
+
 if (!endpoints.isEmpty()) {
 hosts.clear();
 }
-
+
 for (final String endpoint : endpoints) {
 LOGGER.debug("Create HOST from " + endpoint);
-
+
 if (endpoint.matches(".*://.+:[0-9]+")) {
-
+
 final String[] s = endpoint.replaceAll(".*://", "").split(":");
 if (s.length == 2) {
 final HostDescription description = new HostDescription(s[0], Integer.valueOf(s[1]));
 hosts.addHost(HostUtils.createHost(description, maxConnections, connectionFactory));
 } else if (s.length == 4) {
- // IPV6 Address - TODO: we need a proper function to resolve AND support IPV4 & IPV6 functions globally
+// IPV6 Address - TODO: we need a proper function to resolve AND support IPV4 & IPV6 functions
+// globally
 final HostDescription description = new HostDescription("127.0.0.1", Integer.valueOf(s[3]));
 hosts.addHost(HostUtils.createHost(description, maxConnections, connectionFactory));
 } else {
 LOGGER.warn("Skip Endpoint (Missing Port)" + endpoint);
 }
-
+
 } else {
 LOGGER.warn("Skip Endpoint (Format)" + endpoint);
 }
 }
 }
-
+
 return hosts;
 }
 
+private Collection<String> resolveFromServer() throws ArangoDBException {
+
+Collection<String> response;
+
+try {
+
+response = executor.execute(
+new Request(ArangoRequestParam.SYSTEM, RequestType.GET, "/_api/cluster/endpoints"),
+new ResponseDeserializer<Collection<String>>() {
+@Override
+public Collection<String> deserialize(final Response response) throws VPackException {
+final VPackSlice field = response.getBody().get("endpoints");
+Collection<String> endpoints;
+if (field.isNone()) {
+endpoints = Collections.<String> emptyList();
+} else {
+final Collection<Map<String, String>> tmp = arangoSerialization.deserialize(field, Collection.class);
+endpoints = new ArrayList<String>();
+for (final Map<String, String> map : tmp) {
+for (final String value : map.values()) {
+endpoints.add(value);
+}
+}
+}
+return endpoints;
+}
+}, null);
+} catch (final ArangoDBException e) {
+final Integer responseCode = e.getResponseCode();
+if (responseCode != null && responseCode == 403) {
+response = Collections.<String> emptyList();
+} else {
+throw e;
+}
+}
+
+return response;
+}
+
 private boolean isExpired() {
 return System.currentTimeMillis() > lastUpdate + MAX_CACHE_TIME;
 }

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

@@ -20,21 +20,16 @@
 
 package com.arangodb.internal.net;
 
-import java.util.Collection;
-
-import com.arangodb.ArangoDBException;
+import com.arangodb.internal.ArangoExecutorSync;
+import com.arangodb.util.ArangoSerialization;
 
 /**
  * @author Mark Vollmary
  *
  */
 public interface HostResolver {
 
-public interface EndpointResolver {
-Collection<String> resolve(boolean closeConnections) throws ArangoDBException;
-}
-
-void init(final EndpointResolver resolver);
+void init(ArangoExecutorSync executorSync, ArangoSerialization arangoSerialization);
 
 HostSet resolve(boolean initial, boolean closeConnections);
 

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

@@ -22,21 +22,25 @@
 
 import java.util.List;
 
+import com.arangodb.internal.ArangoExecutorSync;
+import com.arangodb.util.ArangoSerialization;
+
 /**
  * @author Mark Vollmary
  *
  */
 public class SimpleHostResolver implements HostResolver {
 
 private final List<Host> hosts;
-
+
 public SimpleHostResolver(final List<Host> hosts) {
 super();
 this.hosts = hosts;
 }
 
 @Override
-public void init(final EndpointResolver resolver) {
+public void init(ArangoExecutorSync executor, ArangoSerialization arangoSerialization) {
+
 }
 
 @Override

src/test/java/com/arangodb/internal/HostHandlerTest.java

@@ -37,6 +37,7 @@
 import com.arangodb.internal.net.HostSet;
 import com.arangodb.internal.net.RandomHostHandler;
 import com.arangodb.internal.net.RoundRobinHostHandler;
+import com.arangodb.util.ArangoSerialization;
 
 /**
  * @author Mark Vollmary
@@ -59,7 +60,7 @@ public HostSet resolve(final boolean initial, final boolean closeConnections) {
 }
 
 @Override
-public void init(final EndpointResolver resolver) {
+public void init(ArangoExecutorSync executor, ArangoSerialization arangoSerialization) {
 
 }
 
@@ -78,7 +79,7 @@ public HostSet resolve(final boolean initial, final boolean closeConnections) {
 }
 
 @Override
-public void init(final EndpointResolver resolver) {
+public void init(ArangoExecutorSync executor, ArangoSerialization arangoSerialization) {
 
 }