refactor extendedhostresolver

Author: BCaxelbecker

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

@@ -49,6 +49,7 @@ private ArangoDefaults() {
 	public static final int MAX_CONNECTIONS_HTTP_DEFAULT = 20;
 	public static final Protocol DEFAULT_NETWORK_PROTOCOL = Protocol.VST;
 	public static final boolean DEFAULT_ACQUIRE_HOST_LIST = false;
+	public static final int DEFAULT_ACQUIRE_HOST_LIST_INTERVAL = 60 * 60 * 1000; // hour
 	public static final LoadBalancingStrategy DEFAULT_LOAD_BALANCING_STRATEGY = LoadBalancingStrategy.NONE;
 
 }

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

@@ -74,6 +74,7 @@ public abstract class InternalArangoDBBuilder {
 	private static final String PROPERTY_KEY_MAX_CONNECTIONS = "arangodb.connections.max";
 	private static final String PROPERTY_KEY_CONNECTION_TTL = "arangodb.connections.ttl";
 	private static final String PROPERTY_KEY_ACQUIRE_HOST_LIST = "arangodb.acquireHostList";
+	private static final String PROPERTY_KEY_ACQUIRE_HOST_LIST_INTERVAL = "arangodb.acquireHostList.interval";
 	private static final String PROPERTY_KEY_LOAD_BALANCING_STRATEGY = "arangodb.loadBalancingStrategy";
 	private static final String DEFAULT_PROPERTY_FILE = "/arangodb.properties";
 
@@ -92,9 +93,12 @@ public abstract class InternalArangoDBBuilder {
 	protected ArangoSerializer serializer;
 	protected ArangoDeserializer deserializer;
 	protected Boolean acquireHostList;
+	protected Integer acquireHostListInterval;
 	protected LoadBalancingStrategy loadBalancingStrategy;
 	protected ArangoSerialization customSerializer;
 
+	
+
 	public InternalArangoDBBuilder() {
 		super();
 		vpackBuilder = new VPack.Builder();
@@ -133,6 +137,7 @@ protected void loadProperties(final Properties properties) {
 		maxConnections = loadMaxConnections(properties, maxConnections);
 		connectionTtl = loadConnectionTtl(properties, connectionTtl);
 		acquireHostList = loadAcquireHostList(properties, acquireHostList);
+		acquireHostListInterval = loadAcquireHostListInterval(properties, acquireHostListInterval);
 		loadBalancingStrategy = loadLoadBalancingStrategy(properties, loadBalancingStrategy);
 	}
 
@@ -196,7 +201,7 @@ protected HostResolver createHostResolver(final Collection<Host> hosts, final in
 
 		if(acquireHostList) {
 			LOGGER.debug("acquireHostList -> Use ExtendedHostResolver");
-			return new ExtendedHostResolver(new ArrayList<Host>(hosts), maxConnections, connectionFactory);
+			return new ExtendedHostResolver(new ArrayList<Host>(hosts), maxConnections, connectionFactory, acquireHostListInterval);
 		} else {
 			LOGGER.debug("Use SimpleHostResolver");
 			return new SimpleHostResolver(new ArrayList<Host>(hosts));
@@ -295,6 +300,11 @@ private static Boolean loadAcquireHostList(final Properties properties, final Bo
 			ArangoDefaults.DEFAULT_ACQUIRE_HOST_LIST));
 	}
 
+	private static int loadAcquireHostListInterval(final Properties properties, final Integer currentValue) {
+		return Integer.parseInt(getProperty(properties, PROPERTY_KEY_ACQUIRE_HOST_LIST_INTERVAL, currentValue,
+			ArangoDefaults.DEFAULT_ACQUIRE_HOST_LIST_INTERVAL));
+	}
+
 	private static LoadBalancingStrategy loadLoadBalancingStrategy(
 		final Properties properties,
 		final LoadBalancingStrategy currentValue) {

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

@@ -50,24 +50,26 @@ 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 HostSet hosts;
 
 	private final Integer maxConnections;
 	private final ConnectionFactory connectionFactory;
 
 	private long lastUpdate;
+	private Integer acquireHostListInterval;
 
 	private ArangoExecutorSync executor;
 	private ArangoSerialization arangoSerialization;
 
+
 	public ExtendedHostResolver(final List<Host> hosts, final Integer maxConnections,
-		final ConnectionFactory connectionFactory) {
-		super();
+		final ConnectionFactory connectionFactory, Integer acquireHostListInterval) {
+		
+		this.acquireHostListInterval = acquireHostListInterval;
 		this.hosts = new HostSet(hosts);
 		this.maxConnections = maxConnections;
 		this.connectionFactory = connectionFactory;
+		
 		lastUpdate = 0;
 	}
 
@@ -160,6 +162,7 @@ public Collection<String> deserialize(final Response response) throws VPackExcep
 	}
 
 	private boolean isExpired() {
-		return System.currentTimeMillis() > lastUpdate + MAX_CACHE_TIME;
+		return System.currentTimeMillis() > (lastUpdate + acquireHostListInterval);
 	}
+	
 }