extracted VelocyPack implementation

see https://github.com/arangodb/java-velocypack

Author: mpv1989

ChangeLog

@@ -4,6 +4,7 @@ v4.1.11 (2017-03-xx)
 * added convenience methods (ArangoCollection.getIndex(String), .deleteIndex(key))
 * fixed exception handling in Connection (issue #110)
 * added connection pooling (issue #103)
+* extracted VelocyPack implementation to https://github.com/arangodb/java-velocypack
 
 v4.1.10 (2017-02-22)
 ---------------------------

pom.xml

@@ -27,6 +27,7 @@
 		<logback-classic.version>1.1.3</logback-classic.version>
 		<hamcrest-all.version>1.3</hamcrest-all.version>
 		<junit.version>4.12</junit.version>
+		<arangodb.velocypack.version>1.0.1</arangodb.velocypack.version>
 	</properties>
 
 	<developers>
@@ -196,6 +197,10 @@
 	</build>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.arangodb</groupId>
+			<artifactId>velocypack</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -223,6 +228,11 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>com.arangodb</groupId>
+				<artifactId>velocypack</artifactId>
+				<version>${arangodb.velocypack.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>

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

@@ -41,7 +41,7 @@
 import com.arangodb.internal.CollectionCache.DBAccess;
 import com.arangodb.internal.DocumentCache;
 import com.arangodb.internal.InternalArangoDB;
-import com.arangodb.internal.velocypack.VPackConfigure;
+import com.arangodb.internal.velocypack.VPackDriverModule;
 import com.arangodb.internal.velocystream.Communication;
 import com.arangodb.internal.velocystream.CommunicationSync;
 import com.arangodb.internal.velocystream.ConnectionSync;
@@ -57,6 +57,7 @@
 import com.arangodb.velocypack.VPackInstanceCreator;
 import com.arangodb.velocypack.VPackJsonDeserializer;
 import com.arangodb.velocypack.VPackJsonSerializer;
+import com.arangodb.velocypack.VPackModule;
 import com.arangodb.velocypack.VPackParser;
 import com.arangodb.velocypack.VPackSerializer;
 import com.arangodb.velocypack.ValueType;
@@ -83,14 +84,15 @@ public static class Builder {
 		private Integer maxConnections;
 		private final VPack.Builder vpackBuilder;
 		private final CollectionCache collectionCache;
-		private final VPackParser vpackParser;
+		private final VPackParser.Builder vpackParser;
 
 		public Builder() {
 			super();
 			vpackBuilder = new VPack.Builder();
 			collectionCache = new CollectionCache();
-			vpackParser = new VPackParser();
-			VPackConfigure.configure(vpackBuilder, vpackParser, collectionCache);
+			vpackParser = new VPackParser.Builder();
+			vpackBuilder.registerModule(new VPackDriverModule(collectionCache));
+			vpackParser.registerModule(new VPackDriverModule(collectionCache));
 			host = new Host(ArangoDBConstants.DEFAULT_HOST, ArangoDBConstants.DEFAULT_PORT);
 			hosts = new ArrayList<Host>();
 			loadProperties(ArangoDB.class.getResourceAsStream(DEFAULT_PROPERTY_FILE));
@@ -260,6 +262,16 @@ public <A extends Annotation> Builder annotationFieldNaming(
 			return this;
 		}
 
+		public Builder registerModule(final VPackModule module) {
+			vpackBuilder.registerModule(module);
+			return this;
+		}
+
+		public Builder registerModules(final VPackModule... modules) {
+			vpackBuilder.registerModules(modules);
+			return this;
+		}
+
 		public ArangoDB build() {
 			if (hosts.isEmpty()) {
 				hosts.add(host);
@@ -268,7 +280,8 @@ public ArangoDB build() {
 					new CommunicationSync.Builder(new DefaultHostHandler(hosts)).timeout(timeout).user(user)
 							.password(password).useSsl(useSsl).sslContext(sslContext).chunksize(chunksize)
 							.maxConnections(maxConnections),
-					vpackBuilder.build(), vpackBuilder.serializeNullValues(true).build(), vpackParser, collectionCache);
+					vpackBuilder.build(), vpackBuilder.serializeNullValues(true).build(), vpackParser.build(),
+					collectionCache);
 		}
 
 	}

…/internal/velocypack/VPackConfigure.java …ternal/velocypack/VPackDriverModule.javasrc/main/java/com/arangodb/internal/velocypack/VPackConfigure.java renamed to src/main/java/com/arangodb/internal/velocypack/VPackDriverModule.java src/main/java/com/arangodb/internal/velocypack/VPackConfigure.java renamed to src/main/java/com/arangodb/internal/velocypack/VPackDriverModule.java

@@ -35,12 +35,14 @@
 import com.arangodb.internal.CollectionCache;
 import com.arangodb.internal.velocystream.AuthenticationRequest;
 import com.arangodb.model.TraversalOptions;
-import com.arangodb.velocypack.VPack;
 import com.arangodb.velocypack.VPackDeserializationContext;
 import com.arangodb.velocypack.VPackDeserializer;
 import com.arangodb.velocypack.VPackFieldNamingStrategy;
 import com.arangodb.velocypack.VPackJsonDeserializer;
-import com.arangodb.velocypack.VPackParser;
+import com.arangodb.velocypack.VPackModule;
+import com.arangodb.velocypack.VPackParserModule;
+import com.arangodb.velocypack.VPackParserSetupContext;
+import com.arangodb.velocypack.VPackSetupContext;
 import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocypack.ValueType;
 import com.arangodb.velocypack.exception.VPackException;
@@ -52,16 +54,19 @@
  * @author Mark - mark at arangodb.com
  *
  */
-public class VPackConfigure {
+public class VPackDriverModule implements VPackModule, VPackParserModule {
 
 	private static final String ID = "_id";
+	private final CollectionCache collectionCache;
 
-	public static void configure(
-		final VPack.Builder builder,
-		final VPackParser vpackParser,
-		final CollectionCache cache) {
+	public VPackDriverModule(final CollectionCache collectionCache) {
+		super();
+		this.collectionCache = collectionCache;
+	}
 
-		builder.fieldNamingStrategy(new VPackFieldNamingStrategy() {
+	@Override
+	public <C extends VPackSetupContext<C>> void setup(final C context) {
+		context.fieldNamingStrategy(new VPackFieldNamingStrategy() {
 			@Override
 			public String translateName(final Field field) {
 				final DocumentField annotation = field.getAnnotation(DocumentField.class);
@@ -71,7 +76,7 @@ public String translateName(final Field field) {
 				return field.getName();
 			}
 		});
-		builder.registerDeserializer(ID, String.class, new VPackDeserializer<String>() {
+		context.registerDeserializer(ID, String.class, new VPackDeserializer<String>() {
 			@Override
 			public String deserialize(
 				final VPackSlice parent,
@@ -81,7 +86,7 @@ public String deserialize(
 				if (vpack.isCustom()) {
 					final long idLong = NumberUtil.toLong(vpack.getBuffer(), vpack.getStart() + 1,
 						vpack.getByteSize() - 1);
-					final String collectionName = cache.getCollectionName(idLong);
+					final String collectionName = collectionCache.getCollectionName(idLong);
 					if (collectionName != null) {
 						final VPackSlice key = parent.get("_key");
 						id = String.format("%s/%s", collectionName, key.getAsString());
@@ -94,7 +99,26 @@ public String deserialize(
 				return id;
 			}
 		});
-		vpackParser.registerDeserializer(ID, ValueType.CUSTOM, new VPackJsonDeserializer() {
+		context.registerSerializer(Request.class, VPackSerializers.REQUEST);
+		context.registerSerializer(AuthenticationRequest.class, VPackSerializers.AUTH_REQUEST);
+		context.registerSerializer(CollectionType.class, VPackSerializers.COLLECTION_TYPE);
+		context.registerSerializer(BaseDocument.class, VPackSerializers.BASE_DOCUMENT);
+		context.registerSerializer(BaseEdgeDocument.class, VPackSerializers.BASE_EDGE_DOCUMENT);
+		context.registerSerializer(TraversalOptions.Order.class, VPackSerializers.TRAVERSAL_ORDER);
+		context.registerSerializer(LogLevel.class, VPackSerializers.LOG_LEVEL);
+
+		context.registerDeserializer(Response.class, VPackDeserializers.RESPONSE);
+		context.registerDeserializer(CollectionType.class, VPackDeserializers.COLLECTION_TYPE);
+		context.registerDeserializer(CollectionStatus.class, VPackDeserializers.COLLECTION_STATUS);
+		context.registerDeserializer(BaseDocument.class, VPackDeserializers.BASE_DOCUMENT);
+		context.registerDeserializer(BaseEdgeDocument.class, VPackDeserializers.BASE_EDGE_DOCUMENT);
+		context.registerDeserializer(QueryEntity.PROPERTY_STARTED, Date.class, VPackDeserializers.DATE_STRING);
+		context.registerDeserializer(LogLevel.class, VPackDeserializers.LOG_LEVEL);
+	}
+
+	@Override
+	public <C extends VPackParserSetupContext<C>> void setup(final C context) {
+		context.registerDeserializer(ID, ValueType.CUSTOM, new VPackJsonDeserializer() {
 			@Override
 			public void deserialize(
 				final VPackSlice parent,
@@ -103,7 +127,7 @@ public void deserialize(
 				final StringBuilder json) throws VPackException {
 				final String id;
 				final long idLong = NumberUtil.toLong(vpack.getBuffer(), vpack.getStart() + 1, vpack.getByteSize() - 1);
-				final String collectionName = cache.getCollectionName(idLong);
+				final String collectionName = collectionCache.getCollectionName(idLong);
 				if (collectionName != null) {
 					final VPackSlice key = parent.get("_key");
 					id = String.format("%s/%s", collectionName, key.getAsString());
@@ -113,22 +137,6 @@ public void deserialize(
 				json.append(JSONValue.toJSONString(id));
 			}
 		});
-
-		builder.registerSerializer(Request.class, VPackSerializers.REQUEST);
-		builder.registerSerializer(AuthenticationRequest.class, VPackSerializers.AUTH_REQUEST);
-		builder.registerSerializer(CollectionType.class, VPackSerializers.COLLECTION_TYPE);
-		builder.registerSerializer(BaseDocument.class, VPackSerializers.BASE_DOCUMENT);
-		builder.registerSerializer(BaseEdgeDocument.class, VPackSerializers.BASE_EDGE_DOCUMENT);
-		builder.registerSerializer(TraversalOptions.Order.class, VPackSerializers.TRAVERSAL_ORDER);
-		builder.registerSerializer(LogLevel.class, VPackSerializers.LOG_LEVEL);
-
-		builder.registerDeserializer(Response.class, VPackDeserializers.RESPONSE);
-		builder.registerDeserializer(CollectionType.class, VPackDeserializers.COLLECTION_TYPE);
-		builder.registerDeserializer(CollectionStatus.class, VPackDeserializers.COLLECTION_STATUS);
-		builder.registerDeserializer(BaseDocument.class, VPackDeserializers.BASE_DOCUMENT);
-		builder.registerDeserializer(BaseEdgeDocument.class, VPackDeserializers.BASE_EDGE_DOCUMENT);
-		builder.registerDeserializer(QueryEntity.PROPERTY_STARTED, Date.class, VPackDeserializers.DATE_STRING);
-		builder.registerDeserializer(LogLevel.class, VPackDeserializers.LOG_LEVEL);
 	}
 
 }