Add cursor initializer (only for intern use)

Author: mpv1989

src/main/java/com/arangodb/ArangoCursor.java

@@ -51,10 +51,18 @@ protected ArangoCursor(final InternalArangoDatabase<?, ?, ?, ?> db, final Arango
 		super();
 		this.execute = execute;
 		this.type = type;
-		iterator = new ArangoCursorIterator<T>(this, execute, db, result);
+		iterator = createIterator(this, db, execute, result);
 		id = result.getId();
 	}
 
+	protected ArangoCursorIterator<T> createIterator(
+		final ArangoCursor<T> cursor,
+		final InternalArangoDatabase<?, ?, ?, ?> db,
+		final ArangoCursorExecute execute,
+		final CursorEntity result) {
+		return new ArangoCursorIterator<T>(cursor, execute, db, result);
+	}
+
 	/**
 	 * @return id of temporary cursor created on the server
 	 */

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

@@ -58,6 +58,7 @@
 import com.arangodb.model.LogOptions;
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
+import com.arangodb.util.ArangoCursorInitializer;
 import com.arangodb.util.ArangoDeserializer;
 import com.arangodb.util.ArangoSerialization;
 import com.arangodb.util.ArangoSerializer;
@@ -359,6 +360,8 @@ public synchronized ArangoDB build() {
 
 	}
 
+	private ArangoCursorInitializer cursorInitializer;
+
 	public ArangoDB(final VstCommunicationSync.Builder vstBuilder, final HttpCommunication.Builder httpBuilder,
 		final ArangoSerialization util, final CollectionCache collectionCache, final Protocol protocol) {
 		super(new ArangoExecutorSync(createProtocol(vstBuilder, httpBuilder, util, collectionCache, protocol), util,
@@ -367,7 +370,8 @@ public ArangoDB(final VstCommunicationSync.Builder vstBuilder, final HttpCommuni
 		collectionCache.init(new DBAccess() {
 			@Override
 			public ArangoDatabase db(final String name) {
-				return new ArangoDatabase(cp, util, executor.documentCache(), name);
+				return new ArangoDatabase(cp, util, executor.documentCache(), name)
+						.setCursorInitializer(cursorInitializer);
 			}
 		});
 	}
@@ -421,7 +425,7 @@ public ArangoDatabase db() {
 	 * @return database handler
 	 */
 	public ArangoDatabase db(final String name) {
-		return new ArangoDatabase(this, name);
+		return new ArangoDatabase(this, name).setCursorInitializer(cursorInitializer);
 	}
 
 	/**
@@ -662,4 +666,8 @@ public LogLevelEntity setLogLevel(final LogLevelEntity entity) throws ArangoDBEx
 		return executor.execute(setLogLevelRequest(entity), LogLevelEntity.class);
 	}
 
+	public ArangoDB _setCursorInitializer(final ArangoCursorInitializer cursorInitializer) {
+		this.cursorInitializer = cursorInitializer;
+		return this;
+	}
 }

src/main/java/com/arangodb/ArangoDatabase.java

@@ -54,6 +54,7 @@
 import com.arangodb.model.GraphCreateOptions;
 import com.arangodb.model.TransactionOptions;
 import com.arangodb.model.TraversalOptions;
+import com.arangodb.util.ArangoCursorInitializer;
 import com.arangodb.util.ArangoSerialization;
 import com.arangodb.velocypack.Type;
 import com.arangodb.velocystream.Request;
@@ -65,6 +66,8 @@
  */
 public class ArangoDatabase extends InternalArangoDatabase<ArangoDB, ArangoExecutorSync, Response, ConnectionSync> {
 
+	private ArangoCursorInitializer cursorInitializer;
+
 	protected ArangoDatabase(final ArangoDB arangoDB, final String name) {
 		super(arangoDB, arangoDB.executor(), arangoDB.util(), name);
 	}
@@ -283,7 +286,7 @@ public <T> ArangoCursor<T> cursor(final String cursorId, final Class<T> type) th
 	}
 
 	private <T> ArangoCursor<T> createCursor(final CursorEntity result, final Class<T> type) {
-		return new ArangoCursor<T>(this, new ArangoCursorExecute() {
+		final ArangoCursorExecute execute = new ArangoCursorExecute() {
 			@Override
 			public CursorEntity next(final String id) {
 				return executor.execute(queryNextRequest(id), CursorEntity.class);
@@ -293,7 +296,9 @@ public CursorEntity next(final String id) {
 			public void close(final String id) {
 				executor.execute(queryCloseRequest(id), Void.class);
 			}
-		}, type, result);
+		};
+		return cursorInitializer != null ? cursorInitializer.createInstance(this, execute, type, result)
+				: new ArangoCursor<T>(this, execute, type, result);
 	}
 
 	/**
@@ -675,4 +680,9 @@ public void reloadRouting() throws ArangoDBException {
 		executor.execute(reloadRoutingRequest(), Void.class);
 	}
 
+	protected ArangoDatabase setCursorInitializer(final ArangoCursorInitializer cursorInitializer) {
+		this.cursorInitializer = cursorInitializer;
+		return this;
+	}
+
 }

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

@@ -25,6 +25,7 @@
 
 import com.arangodb.ArangoCursor;
 import com.arangodb.entity.CursorEntity;
+import com.arangodb.velocypack.VPackSlice;
 
 /**
  * @author Mark Vollmary
@@ -68,7 +69,11 @@ public T next() {
 		if (!hasNext()) {
 			throw new NoSuchElementException();
 		}
-		return db.util().deserialize(result.getResult().get(pos++), cursor.getType());
+		return deserialize(result.getResult().get(pos++), cursor.getType());
+	}
+
+	protected <R> R deserialize(final VPackSlice result, final Class<R> type) {
+		return db.util().deserialize(result, type);
 	}
 
 	@Override

src/main/java/com/arangodb/util/ArangoCursorInitializer.java

@@ -0,0 +1,40 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2017 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.util;
+
+import com.arangodb.ArangoCursor;
+import com.arangodb.entity.CursorEntity;
+import com.arangodb.internal.ArangoCursorExecute;
+import com.arangodb.internal.InternalArangoDatabase;
+
+/**
+ * @author Mark Vollmary
+ *
+ */
+public interface ArangoCursorInitializer {
+
+	<T> ArangoCursor<T> createInstance(
+		final InternalArangoDatabase<?, ?, ?, ?> db,
+		final ArangoCursorExecute execute,
+		final Class<T> type,
+		final CursorEntity result);
+
+}