Merge remote-tracking branch 'origin/4.1'

Author: Mark

ChangeLog

@@ -1,3 +1,36 @@
+v4.1.7 (2017-01-26)
+---------------------------
+* fixed importDocuments, insertDocuments to work with raw Jsons (issue #91)
+
+v4.1.6 (2017-01-18)
+---------------------------
+* added serializer support for enclosing types
+
+v4.1.5 (2017-01-12)
+---------------------------
+* fixed VPack String serialization (UTF-8 encoding)
+* fixed VPack parsing of fields of type Object
+* fixed VPack serializing of array with null values (issue #88)
+* added configuration for custom annotations within VPack de-/serialization
+* added support of transient modifier within VPack de-/serialization
+
+v4.1.4 (2016-12-19)
+---------------------------
+* added VPack serializer/de-serializer for java.util.UUID
+* fixed VPack parsing (issue #65, #80, #82)
+
+v4.1.3 (2016-11-22)
+---------------------------
+* fixed error while serializing long values with VPackBuilder
+* added bulk import API
+
+v4.1.2 (2016-11-10)
+---------------------------
+* fixed GraphEntity for ArangoDatabase.getGraphs() (field name is null)
+* added VelocyPack UTC_DATE parsing to Json String (ISO 8601)
+* added configuration methods for VPackParser in ArangoDBAsync.Builder
+* added VPackJsonSerializer for VPackParser
+
 v4.1.1 (2016-11-09)
 ---------------------------
 * changed json parsing of VelocyPack types not known in json

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.arangodb</groupId>
 	<artifactId>arangodb-java-driver-async</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.1.8-SNAPSHOT</version>
 	<inceptionYear>2016</inceptionYear>
 	<packaging>jar</packaging>
 
@@ -211,7 +211,7 @@
 			<dependency>
 				<groupId>com.arangodb</groupId>
 				<artifactId>arangodb-java-driver</artifactId>
-				<version>4.1.1</version>
+				<version>4.1.7</version>
 			</dependency>
 			<dependency>
 				<groupId>ch.qos.logback</groupId>

src/main/java/com/arangodb/ArangoCollectionAsync.java

@@ -29,6 +29,7 @@
 import com.arangodb.entity.CollectionRevisionEntity;
 import com.arangodb.entity.DocumentCreateEntity;
 import com.arangodb.entity.DocumentDeleteEntity;
+import com.arangodb.entity.DocumentImportEntity;
 import com.arangodb.entity.DocumentUpdateEntity;
 import com.arangodb.entity.IndexEntity;
 import com.arangodb.entity.MultiDocumentEntity;
@@ -39,6 +40,7 @@
 import com.arangodb.model.DocumentCreateOptions;
 import com.arangodb.model.DocumentDeleteOptions;
 import com.arangodb.model.DocumentExistsOptions;
+import com.arangodb.model.DocumentImportOptions;
 import com.arangodb.model.DocumentReadOptions;
 import com.arangodb.model.DocumentReplaceOptions;
 import com.arangodb.model.DocumentUpdateOptions;
@@ -137,6 +139,63 @@ public <T> CompletableFuture<MultiDocumentEntity<DocumentCreateEntity<T>>> inser
 			insertDocumentsResponseDeserializer(values, params));
 	}
 
+	/**
+	 * Imports documents
+	 * 
+	 * @param values
+	 *            a list of Objects that will be stored as documents
+	 * @return information about the import
+	 * @throws ArangoDBException
+	 */
+	public CompletableFuture<DocumentImportEntity> importDocuments(final Collection<?> values) {
+		return importDocuments(values, new DocumentImportOptions());
+	}
+
+	/**
+	 * Imports documents
+	 * 
+	 * @param values
+	 *            a list of Objects that will be stored as documents
+	 * @param options
+	 *            Additional options, can be null
+	 * @return information about the import
+	 * @throws ArangoDBException
+	 */
+	public CompletableFuture<DocumentImportEntity> importDocuments(
+		final Collection<?> values,
+		final DocumentImportOptions options) {
+		return executor.execute(importDocumentsRequest(values, options), DocumentImportEntity.class);
+	}
+
+	/**
+	 * Imports documents
+	 * 
+	 * @param values
+	 *            JSON-encoded array of objects that will be stored as documents
+	 * @return information about the import
+	 * @throws ArangoDBException
+	 */
+	public CompletableFuture<DocumentImportEntity> importDocuments(final String values) {
+		return executor.execute(importDocumentsRequest(values, new DocumentImportOptions()),
+			DocumentImportEntity.class);
+	}
+
+	/**
+	 * Imports documents
+	 * 
+	 * @param values
+	 *            JSON-encoded array of objects that will be stored as documents
+	 * @param options
+	 *            Additional options, can be null
+	 * @return information about the import
+	 * @throws ArangoDBException
+	 */
+	public CompletableFuture<DocumentImportEntity> importDocuments(
+		final String values,
+		final DocumentImportOptions options) {
+		return executor.execute(importDocumentsRequest(values, options), DocumentImportEntity.class);
+	}
+
 	/**
 	 * Reads a single document
 	 * 

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

@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
@@ -49,10 +50,15 @@
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
 import com.arangodb.velocypack.VPack;
+import com.arangodb.velocypack.VPackAnnotationFieldFilter;
+import com.arangodb.velocypack.VPackAnnotationFieldNaming;
 import com.arangodb.velocypack.VPackDeserializer;
 import com.arangodb.velocypack.VPackInstanceCreator;
+import com.arangodb.velocypack.VPackJsonDeserializer;
+import com.arangodb.velocypack.VPackJsonSerializer;
 import com.arangodb.velocypack.VPackParser;
 import com.arangodb.velocypack.VPackSerializer;
+import com.arangodb.velocypack.ValueType;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.Response;
 
@@ -172,6 +178,20 @@ public <T> Builder registerSerializer(final Class<T> clazz, final VPackSerialize
 			return this;
 		}
 
+		/**
+		 * Register a special serializer for a member class which can only be identified by its enclosing class.
+		 * 
+		 * @param clazz
+		 *            type of the enclosing class
+		 * @param serializer
+		 *            serializer to register
+		 * @return builder
+		 */
+		public <T> Builder registerEnclosingSerializer(final Class<T> clazz, final VPackSerializer<T> serializer) {
+			vpackBuilder.registerEnclosingSerializer(clazz, serializer);
+			return this;
+		}
+
 		public <T> Builder registerDeserializer(final Class<T> clazz, final VPackDeserializer<T> deserializer) {
 			vpackBuilder.registerDeserializer(clazz, deserializer);
 			return this;
@@ -182,6 +202,46 @@ public <T> Builder registerInstanceCreator(final Class<T> clazz, final VPackInst
 			return this;
 		}
 
+		public Builder registerJsonDeserializer(final ValueType type, final VPackJsonDeserializer deserializer) {
+			vpackParser.registerDeserializer(type, deserializer);
+			return this;
+		}
+
+		public Builder registerJsonDeserializer(
+			final String attribute,
+			final ValueType type,
+			final VPackJsonDeserializer deserializer) {
+			vpackParser.registerDeserializer(attribute, type, deserializer);
+			return this;
+		}
+
+		public <T> Builder registerJsonSerializer(final Class<T> clazz, final VPackJsonSerializer<T> serializer) {
+			vpackParser.registerSerializer(clazz, serializer);
+			return this;
+		}
+
+		public <T> Builder registerJsonSerializer(
+			final String attribute,
+			final Class<T> clazz,
+			final VPackJsonSerializer<T> serializer) {
+			vpackParser.registerSerializer(attribute, clazz, serializer);
+			return this;
+		}
+
+		public <T extends Annotation> Builder annotationFieldFilter(
+			final Class<T> type,
+			final VPackAnnotationFieldFilter<T> fieldFilter) {
+			vpackBuilder.annotationFieldFilter(type, fieldFilter);
+			return this;
+		}
+
+		public <T extends Annotation> Builder annotationFieldNaming(
+			final Class<T> type,
+			final VPackAnnotationFieldNaming<T> fieldNaming) {
+			vpackBuilder.annotationFieldNaming(type, fieldNaming);
+			return this;
+		}
+
 		public ArangoDBAsync build() {
 			return new ArangoDBAsync(asyncBuilder(), vpackBuilder.build(),
 					vpackBuilder.serializeNullValues(true).build(), vpackParser, collectionCache, syncBuilder());