added support for multiple hosts as fallbacks

Author: Mark

ChangeLog

@@ -1,3 +1,14 @@
+v4.1.10 (2017-02-xx)
+---------------------------
+* changed velocystream message sending to async
+* changed return value of getVertex/getEdge to null if not exists
+* added support for multiple hosts as fallbacks
+* added support serializing collections with null elements
+* added support serializing non-generic classes that extend collections
+* added support serializing/deserializing byte and Byte
+* fixed serialization of additionalFields for objects and maps
+* added default value "root" for user
+
 v4.1.9 (2017-02-10)
 ---------------------------
 * added missing IndexType.edge

src/main/java/com/arangodb/ArangoDBAsync.java

@@ -23,7 +23,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 
@@ -46,6 +48,9 @@
 import com.arangodb.internal.velocystream.CommunicationSync;
 import com.arangodb.internal.velocystream.ConnectionAsync;
 import com.arangodb.internal.velocystream.ConnectionSync;
+import com.arangodb.internal.velocystream.DefaultHostHandler;
+import com.arangodb.internal.velocystream.Host;
+import com.arangodb.internal.velocystream.HostHandler;
 import com.arangodb.model.LogOptions;
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
@@ -70,17 +75,8 @@ public class ArangoDBAsync extends InternalArangoDB<ArangoExecutorAsync, Complet
 
 	public static class Builder {
 
-		private static final String PROPERTY_KEY_HOST = "arangodb.host";
-		private static final String PROPERTY_KEY_PORT = "arangodb.port";
-		private static final String PROPERTY_KEY_TIMEOUT = "arangodb.timeout";
-		private static final String PROPERTY_KEY_USER = "arangodb.user";
-		private static final String PROPERTY_KEY_PASSWORD = "arangodb.password";
-		private static final String PROPERTY_KEY_USE_SSL = "arangodb.usessl";
-		private static final String PROPERTY_KEY_V_STREAM_CHUNK_CONTENT_SIZE = "arangodb.chunksize";
-		private static final String DEFAULT_PROPERTY_FILE = "/arangodb.properties";
-
-		private String host;
-		private Integer port;
+		private final List<Host> hosts;
+		private Host host;
 		private Integer timeout;
 		private String user;
 		private String password;
@@ -98,6 +94,8 @@ public Builder() {
 			vpackParser = new VPackParser();
 			VPackConfigure.configure(vpackBuilder, vpackParser, collectionCache);
 			VPackConfigureAsync.configure(vpackBuilder);
+			host = new Host(ArangoDBConstants.DEFAULT_HOST, ArangoDBConstants.DEFAULT_PORT);
+			hosts = new ArrayList<>();
 			loadProperties(ArangoDBAsync.class.getResourceAsStream(DEFAULT_PROPERTY_FILE));
 		}
 
@@ -106,40 +104,57 @@ public Builder loadProperties(final InputStream in) {
 				final Properties properties = new Properties();
 				try {
 					properties.load(in);
-					host = getProperty(properties, PROPERTY_KEY_HOST, host, ArangoDBConstants.DEFAULT_HOST);
-					port = Integer
-							.parseInt(getProperty(properties, PROPERTY_KEY_PORT, port, ArangoDBConstants.DEFAULT_PORT));
-					timeout = Integer.parseInt(
-						getProperty(properties, PROPERTY_KEY_TIMEOUT, timeout, ArangoDBConstants.DEFAULT_TIMEOUT));
-					user = getProperty(properties, PROPERTY_KEY_USER, user, null);
-					password = getProperty(properties, PROPERTY_KEY_PASSWORD, password, null);
-					useSsl = Boolean.parseBoolean(
-						getProperty(properties, PROPERTY_KEY_USE_SSL, useSsl, ArangoDBConstants.DEFAULT_USE_SSL));
-					chunksize = Integer.parseInt(getProperty(properties, PROPERTY_KEY_V_STREAM_CHUNK_CONTENT_SIZE,
-						chunksize, ArangoDBConstants.CHUNK_DEFAULT_CONTENT_SIZE));
+					loadHosts(properties, this.hosts);
+					final String host = loadHost(properties, this.host.getHost());
+					final int port = loadPort(properties, this.host.getPort());
+					this.host = new Host(host, port);
+					timeout = loadTimeout(properties, timeout);
+					user = loadUser(properties, user);
+					password = loadPassword(properties, password);
+					useSsl = loadUseSsl(properties, useSsl);
+					chunksize = loadChunkSize(properties, chunksize);
 				} catch (final IOException e) {
 					throw new ArangoDBException(e);
 				}
 			}
 			return this;
 		}
 
-		private <T> String getProperty(
-			final Properties properties,
-			final String key,
-			final T currentValue,
-			final T defaultValue) {
-			return properties.getProperty(key,
-				currentValue != null ? currentValue.toString() : defaultValue != null ? defaultValue.toString() : null);
-		}
-
+		/**
+		 * @deprecated will be removed in version 4.2.0 use {@link #host(String, int)} instead
+		 * 
+		 * @param host
+		 * @return
+		 */
+		@Deprecated
 		public Builder host(final String host) {
-			this.host = host;
+			this.host = new Host(host, this.host.getPort());
 			return this;
 		}
 
+		/**
+		 * @deprecated will be removed in version 4.2.0 use {@link #host(String, int)} instead
+		 * 
+		 * @param port
+		 * @return
+		 */
+		@Deprecated
 		public Builder port(final Integer port) {
-			this.port = port;
+			host = new Host(host.getHost(), port);
+			return this;
+		}
+
+		/**
+		 * Adds a host to connect to. Multiple hosts can be added to provide fallbacks.
+		 * 
+		 * @param host
+		 *            address of the host
+		 * @param port
+		 *            port of the host
+		 * @return {@link ArangoDB.Builder}
+		 */
+		public Builder host(final String host, final int port) {
+			hosts.add(new Host(host, port));
 			return this;
 		}
 
@@ -243,17 +258,22 @@ public <T extends Annotation> Builder annotationFieldNaming(
 		}
 
 		public ArangoDBAsync build() {
-			return new ArangoDBAsync(asyncBuilder(), vpackBuilder.build(),
-					vpackBuilder.serializeNullValues(true).build(), vpackParser, collectionCache, syncBuilder());
+			if (hosts.isEmpty()) {
+				hosts.add(host);
+			}
+			final HostHandler hostHandler = new DefaultHostHandler(hosts);
+			return new ArangoDBAsync(asyncBuilder(hostHandler), vpackBuilder.build(),
+					vpackBuilder.serializeNullValues(true).build(), vpackParser, collectionCache,
+					syncBuilder(hostHandler));
 		}
 
-		private CommunicationAsync.Builder asyncBuilder() {
-			return new CommunicationAsync.Builder().host(host).port(port).timeout(timeout).user(user).password(password)
+		private CommunicationAsync.Builder asyncBuilder(final HostHandler hostHandler) {
+			return new CommunicationAsync.Builder(hostHandler).timeout(timeout).user(user).password(password)
 					.useSsl(useSsl).sslContext(sslContext).chunksize(chunksize);
 		}
 
-		private CommunicationSync.Builder syncBuilder() {
-			return new CommunicationSync.Builder().host(host).port(port).timeout(timeout).user(user).password(password)
+		private CommunicationSync.Builder syncBuilder(final HostHandler hostHandler) {
+			return new CommunicationSync.Builder(hostHandler).timeout(timeout).user(user).password(password)
 					.useSsl(useSsl).sslContext(sslContext).chunksize(chunksize);
 		}
 

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

@@ -48,27 +48,18 @@ public class CommunicationAsync extends Communication<CompletableFuture<Response
 	private static final Logger LOGGER = LoggerFactory.getLogger(CommunicationAsync.class);
 
 	public static class Builder {
-		private String host;
-		private Integer port;
+
+		private final HostHandler hostHandler;
 		private Integer timeout;
 		private String user;
 		private String password;
 		private Boolean useSsl;
 		private SSLContext sslContext;
 		private Integer chunksize;
 
-		public Builder() {
+		public Builder(final HostHandler hostHandler) {
 			super();
-		}
-
-		public Builder host(final String host) {
-			this.host = host;
-			return this;
-		}
-
-		public Builder port(final Integer port) {
-			this.port = port;
-			return this;
+			this.hostHandler = hostHandler;
 		}
 
 		public Builder timeout(final Integer timeout) {
@@ -104,16 +95,16 @@ public Builder chunksize(final Integer chunksize) {
 		public Communication<CompletableFuture<Response>, ConnectionAsync> build(
 			final VPack vpack,
 			final CollectionCache collectionCache) {
-			return new CommunicationAsync(host, port, timeout, user, password, useSsl, sslContext, vpack,
+			return new CommunicationAsync(hostHandler, timeout, user, password, useSsl, sslContext, vpack,
 					collectionCache, chunksize);
 		}
 	}
 
-	private CommunicationAsync(final String host, final Integer port, final Integer timeout, final String user,
+	private CommunicationAsync(final HostHandler hostHandler, final Integer timeout, final String user,
 		final String password, final Boolean useSsl, final SSLContext sslContext, final VPack vpack,
 		final CollectionCache collectionCache, final Integer chunksize) {
-		super(host, port, timeout, user, password, useSsl, sslContext, vpack, collectionCache, chunksize,
-				new ConnectionAsync.Builder(new MessageStore()).host(host).port(port).timeout(timeout).useSsl(useSsl)
+		super(timeout, user, password, useSsl, sslContext, vpack, collectionCache, chunksize,
+				new ConnectionAsync.Builder(hostHandler, new MessageStore()).timeout(timeout).useSsl(useSsl)
 						.sslContext(sslContext).build());
 	}