Merge remote-tracking branch 'origin/4.1'

Author: Mark

ChangeLog

@@ -1,3 +1,32 @@
+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 ArangoDB.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</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.1.7-SNAPSHOT</version>
 	<inceptionYear>2016</inceptionYear>
 	<packaging>jar</packaging>
 

src/main/java/com/arangodb/ArangoCollection.java

@@ -30,16 +30,18 @@
 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;
-import com.arangodb.internal.InternalArangoCollection;
 import com.arangodb.internal.ArangoExecutorSync;
+import com.arangodb.internal.InternalArangoCollection;
 import com.arangodb.internal.velocystream.ConnectionSync;
 import com.arangodb.model.CollectionPropertiesOptions;
 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;
@@ -135,6 +137,61 @@ public <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertDocuments(
 			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 DocumentImportEntity importDocuments(final Collection<?> values) throws ArangoDBException {
+		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 DocumentImportEntity importDocuments(final Collection<?> values, final DocumentImportOptions options)
+			throws ArangoDBException {
+		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 DocumentImportEntity importDocuments(final String values) throws ArangoDBException {
+		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 DocumentImportEntity importDocuments(final String values, final DocumentImportOptions options)
+			throws ArangoDBException {
+		return executor.execute(importDocumentsRequest(values, options), DocumentImportEntity.class);
+	}
+
 	/**
 	 * Reads a single document
 	 * 

src/main/java/com/arangodb/ArangoDB.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;
 
@@ -46,10 +47,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.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.Response;
@@ -169,6 +175,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;
@@ -179,6 +199,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 <A extends Annotation> Builder annotationFieldFilter(
+			final Class<A> type,
+			final VPackAnnotationFieldFilter<A> fieldFilter) {
+			vpackBuilder.annotationFieldFilter(type, fieldFilter);
+			return this;
+		}
+
+		public <A extends Annotation> Builder annotationFieldNaming(
+			final Class<A> type,
+			final VPackAnnotationFieldNaming<A> fieldNaming) {
+			vpackBuilder.annotationFieldNaming(type, fieldNaming);
+			return this;
+		}
+
 		public ArangoDB build() {
 			return new ArangoDB(
 					new CommunicationSync.Builder().host(host).port(port).timeout(timeout).user(user).password(password)
@@ -457,4 +517,5 @@ public LogLevelEntity getLogLevel() throws ArangoDBException {
 	public LogLevelEntity setLogLevel(final LogLevelEntity entity) throws ArangoDBException {
 		return executor.execute(setLogLevelRequest(entity), LogLevelEntity.class);
 	}
+
 }

src/main/java/com/arangodb/entity/BaseEdgeDocument.java

@@ -47,6 +47,12 @@ public BaseEdgeDocument(final String from, final String to) {
 		this.to = to;
 	}
 
+	public BaseEdgeDocument(final String key, final String from, final String to) {
+		super(key);
+		this.from = from;
+		this.to = to;
+	}
+
 	public BaseEdgeDocument(final Map<String, Object> properties) {
 		super(properties);
 		final Object tmpFrom = properties.remove(DocumentField.Type.FROM.getSerializeName());

src/main/java/com/arangodb/entity/DocumentImportEntity.java

@@ -0,0 +1,112 @@
+/*
+ * 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.entity;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * @author Mark - mark at arangodb.com
+ *
+ */
+public class DocumentImportEntity {
+
+	private Integer created;
+	private Integer errors;
+	private Integer empty;
+	private Integer updated;
+	private Integer ignored;
+	private Collection<String> details;
+
+	public DocumentImportEntity() {
+		super();
+		details = new ArrayList<String>();
+	}
+
+	/**
+	 * @return number of documents imported.
+	 */
+	public Integer getCreated() {
+		return created;
+	}
+
+	public void setCreated(final Integer created) {
+		this.created = created;
+	}
+
+	/**
+	 * @return number of documents that were not imported due to an error.
+	 */
+	public Integer getErrors() {
+		return errors;
+	}
+
+	public void setErrors(final Integer errors) {
+		this.errors = errors;
+	}
+
+	/**
+	 * @return number of empty lines found in the input (will only contain a value greater zero for types documents or
+	 *         auto).
+	 */
+	public Integer getEmpty() {
+		return empty;
+	}
+
+	public void setEmpty(final Integer empty) {
+		this.empty = empty;
+	}
+
+	/**
+	 * @return number of updated/replaced documents (in case onDuplicate was set to either update or replace).
+	 */
+	public Integer getUpdated() {
+		return updated;
+	}
+
+	public void setUpdated(final Integer updated) {
+		this.updated = updated;
+	}
+
+	/**
+	 * @return number of failed but ignored insert operations (in case onDuplicate was set to ignore).
+	 */
+	public Integer getIgnored() {
+		return ignored;
+	}
+
+	public void setIgnored(final Integer ignored) {
+		this.ignored = ignored;
+	}
+
+	/**
+	 * @return if query parameter details is set to true, the result contain details with more detailed information
+	 *         about which documents could not be inserted.
+	 */
+	public Collection<String> getDetails() {
+		return details;
+	}
+
+	public void setDetails(final Collection<String> details) {
+		this.details = details;
+	}
+
+}

src/main/java/com/arangodb/entity/GraphEntity.java

@@ -30,14 +30,18 @@
 public class GraphEntity {
 
 	private String name;
+	/**
+	 * Special case where <code>_key</code> is used instead of <code>name</code>.
+	 */
+	private String _key;
 	private Collection<EdgeDefinition> edgeDefinitions;
 	private Collection<String> orphanCollections;
 	private Boolean isSmart;
 	private Integer numberOfShards;
 	private String smartGraphAttribute;
 
 	public String getName() {
-		return name;
+		return name != null ? name : _key;
 	}
 
 	public Collection<EdgeDefinition> getEdgeDefinitions() {

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

@@ -58,6 +58,7 @@ public class ArangoDBConstants {
 	public static final String PATH_API_ADMIN_LOG = "/_admin/log";
 	public static final String PATH_API_ADMIN_LOG_LEVEL = "/_admin/log/level";
 	public static final String PATH_API_ADMIN_ROUTING_RELOAD = "/_admin/routing/reload";
+	public static final String PATH_API_IMPORT = "/_api/import";
 
 	public static final String ENCRYPTION_PLAIN = "plain";
 
@@ -101,4 +102,12 @@ public class ArangoDBConstants {
 	public static final String VERTEX = "vertex";
 	public static final String EDGE = "edge";
 	public static final String ERROR = "error";
+	public static final String FROM_PREFIX = "fromPrefix";
+	public static final String TO_PREFIX = "toPrefix";
+	public static final String OVERWRITE = "overwrite";
+	public static final String ON_DUPLICATE = "onDuplicate";
+	public static final String COMPLETE = "complete";
+	public static final String DETAILS = "details";
+	public static final String TYPE = "type";
+
 }