more updates for new cursor API

Author: Achim Brandt

src/main/java/com/arangodb/ArangoDriver.java

@@ -10,9 +10,9 @@
  */
 public class BaseCursorProxy<T, S extends DocumentEntity<T>> implements Iterable<S> {
 
-	private BaseCursor<T, S> baseCursor;
+	private DocumentCursorResult<T, S> baseCursor;
 
-	public BaseCursorProxy(BaseCursor<T, S> baseCursor) {
+	public BaseCursorProxy(DocumentCursorResult<T, S> baseCursor) {
 		this.baseCursor = baseCursor;
 	}
 
@@ -97,35 +97,10 @@ public boolean isNotModified() {
 		return baseCursor.getEntity().isNotModified();
 	}
 
-	/**
-	 * If the request is unauthorized this returns true
-	 *
-	 * @return boolean
-	 */
-	public boolean isUnauthorized() {
-		return baseCursor.getEntity().isUnauthorized();
-	}
-
-	public boolean isError() {
-		return baseCursor.getEntity().isError();
-	}
-
 	public int getCode() {
 		return baseCursor.getEntity().getCode();
 	}
 
-	public int getErrorNumber() {
-		return baseCursor.getEntity().getErrorNumber();
-	}
-
-	public String getErrorMessage() {
-		return baseCursor.getEntity().getErrorMessage();
-	}
-
-	public long getEtag() {
-		return baseCursor.getEntity().getEtag();
-	}
-
 	public int getStatusCode() {
 		return baseCursor.getEntity().getStatusCode();
 	}

src/main/java/com/arangodb/BaseCursorProxy.java

@@ -7,7 +7,7 @@
  */
 public class BaseCursorTest<T> extends BaseCursorProxy<T, DocumentEntity<T>> {
 
-	public BaseCursorTest(BaseCursor<T, DocumentEntity<T>> baseCursor) {
+	public BaseCursorTest(DocumentCursorResult<T, DocumentEntity<T>> baseCursor) {
 		super(baseCursor);
 	}
 }

src/main/java/com/arangodb/BaseCursorTest.java

@@ -21,79 +21,52 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import com.arangodb.entity.BaseCursorEntity;
-import com.arangodb.entity.DocumentEntity;
+import com.arangodb.entity.CursorEntity;
 
 /**
  * @author tamtam180 - kirscheless at gmail.com
- * @author a-brandt
  *
  */
-public class BaseCursor<T, S extends DocumentEntity<T>> implements Iterable<S> {
+public class CursorResult<T> implements Iterable<T> {
 
 	private String database;
-	private transient InternalCursorDocumentDriver cursorDriver;
-	private transient Class<S> classDocumentEntity;
-	private transient Class<T> clazz;
-	private transient BaseCursorEntity<T, S> entity;
+	private transient InternalCursorDriver cursorDriver;
+	private transient Class<?>[] clazz;
+	private transient CursorEntity<T> entity;
 	private transient int pos;
 	private int count;
+	private CursorIterator iter;
 
-	public BaseCursor(String database, InternalCursorDocumentDriver cursorDriver, BaseCursorEntity<T, S> entity,
-		Class<S> classDocumentEntity, Class<T> clazz) {
+	public CursorResult(String database, InternalCursorDriver cursorDriver, CursorEntity<T> entity, Class<?>... clazz) {
 		this.database = database;
 		this.cursorDriver = cursorDriver;
-		this.classDocumentEntity = classDocumentEntity;
 		this.clazz = clazz;
 		this.entity = entity;
 		this.count = entity == null ? 0 : entity.getCount();
 		this.pos = 0;
+		this.iter = null;
 	}
 
 	@Override
-	public Iterator<S> iterator() {
-		return new DocumentEntityIterator();
-	}
-
-	/**
-	 * Returns an iterator over a entity set of elements of type T.
-	 * 
-	 * @return an Iterator.
-	 */
-	public Iterator<T> entityIterator() {
-		return new EntityIterator();
-	}
-
-	/**
-	 * Returns the DocumentEntity objects as a list
-	 * 
-	 * @return list of DocumentEntity objects
-	 */
-	public List<S> asList() {
-		List<S> result = new ArrayList<S>();
-		Iterator<S> iterator = iterator();
-
-		while (iterator.hasNext()) {
-			result.add(iterator.next());
+	public Iterator<T> iterator() {
+		if (iter == null) {
+			iter = new CursorIterator();
 		}
 
-		return result;
+		return iter;
 	}
 
 	/**
-	 * Returns the entities of DocumentEntity objects as a list
+	 * Returns the objects as a list
 	 * 
 	 * @return list of DocumentEntity objects
 	 */
-	public List<T> asEntityList() {
+	public List<T> asList() {
 		List<T> result = new ArrayList<T>();
-		Iterator<S> iterator = iterator();
+		Iterator<T> iterator = iterator();
 
 		while (iterator.hasNext()) {
-			T e = iterator.next().getEntity();
-			if (e != null) {
-				result.add(e);
-			}
+			result.add(iterator.next());
 		}
 
 		return result;
@@ -119,7 +92,7 @@ public int getCount() {
 	}
 
 	/**
-	 * et total number of results for queries with LIMIT clause
+	 * Get total number of results for queries with LIMIT clause
 	 * 
 	 * @return total number of results
 	 */
@@ -136,7 +109,7 @@ public int getFullCount() {
 	 * 
 	 * @return the single result or null
 	 */
-	public S getUniqueResult() {
+	public T getUniqueResult() {
 		return entity.getUniqueResult();
 	}
 
@@ -147,55 +120,23 @@ public S getUniqueResult() {
 	 */
 	private void updateEntity() throws ArangoException {
 		long cursorId = entity.getCursorId();
-		this.entity = cursorDriver.continueBaseCursorEntityQuery(database, cursorId, classDocumentEntity, clazz);
+		this.entity = cursorDriver.continueQuery(database, cursorId, this.clazz);
 		this.pos = 0;
 	}
 
 	/**
-	 * internal DocumentEntity iterator
+	 * Returns the CursorEntity object
+	 * 
+	 * @return CursorEntity
 	 */
-	public class DocumentEntityIterator implements Iterator<S> {
-
-		@Override
-		public boolean hasNext() {
-			if (entity == null) {
-				return false;
-			}
-			if (pos < entity.size()) {
-				return true;
-			}
-			if (entity.hasMore()) {
-				return true;
-			}
-			return false;
-		}
-
-		@Override
-		public S next() {
-			if (hasNext()) {
-				if (pos >= entity.size()) {
-					try {
-						updateEntity();
-					} catch (ArangoException e) {
-						throw new IllegalStateException(e);
-					}
-				}
-				return entity.get(pos++);
-			}
-			throw new NoSuchElementException();
-		}
-
-		@Override
-		public void remove() {
-			throw new UnsupportedOperationException("remove is not supported");
-		}
-
+	public CursorEntity<T> getEntity() {
+		return entity;
 	}
 
 	/**
-	 * internal DocumentEntity iterator
+	 * internal iterator
 	 */
-	public class EntityIterator implements Iterator<T> {
+	public class CursorIterator implements Iterator<T> {
 
 		@Override
 		public boolean hasNext() {
@@ -221,25 +162,16 @@ public T next() {
 						throw new IllegalStateException(e);
 					}
 				}
-				return entity.get(pos++).getEntity();
+				return entity.get(pos++);
 			}
 			throw new NoSuchElementException();
 		}
 
 		@Override
 		public void remove() {
-			throw new UnsupportedOperationException("remove is not supported");
+			throw new UnsupportedOperationException("remove is not supported!");
 		}
 
 	}
 
-	/**
-	 * Returns the BaseCursorEntity object
-	 * 
-	 * @return BaseCursorEntity
-	 */
-	public BaseCursorEntity<T, S> getEntity() {
-		return entity;
-	}
-
 }

src/main/java/com/arangodb/BaseCursor.java renamed to src/main/java/com/arangodb/CursorResult.java

@@ -7,7 +7,7 @@
  */
 public class DocumentCursor<T> extends BaseCursorProxy<T, DocumentEntity<T>> {
 
-	public DocumentCursor(BaseCursor<T, DocumentEntity<T>> baseCursor) {
+	public DocumentCursor(DocumentCursorResult<T, DocumentEntity<T>> baseCursor) {
 		super(baseCursor);
 	}
 }

src/main/java/com/arangodb/DocumentCursor.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2012 tamtam180
+ *
+ * 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.
+ */
+
+package com.arangodb;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.arangodb.entity.CursorEntity;
+import com.arangodb.entity.DocumentEntity;
+
+/**
+ * @author tamtam180 - kirscheless at gmail.com
+ * @author a-brandt
+ *
+ */
+public class DocumentCursorResult<T, S extends DocumentEntity<T>> extends CursorResult<S> {
+
+	public DocumentCursorResult(String database, InternalCursorDriver cursorDriver, CursorEntity<S> entity, Class<?>... clazz) {
+		super(database, cursorDriver, entity, clazz);
+	}
+
+	/**
+	 * Returns an iterator over a entity set of elements of type T.
+	 * 
+	 * @return an Iterator.
+	 */
+	public Iterator<T> entityIterator() {
+		return new EntityIterator();
+	}
+
+	/**
+	 * Returns the entities of DocumentEntity objects as a list
+	 * 
+	 * @return list of DocumentEntity objects
+	 */
+	public List<T> asEntityList() {
+		List<T> result = new ArrayList<T>();
+		Iterator<S> iterator = iterator();
+
+		while (iterator.hasNext()) {
+			T e = iterator.next().getEntity();
+			if (e != null) {
+				result.add(e);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * internal entity iterator
+	 */
+	public class EntityIterator implements Iterator<T> {
+
+		private Iterator<S> iterator;
+
+		public EntityIterator() {
+			iterator = iterator();
+		}
+
+		@Override
+		public boolean hasNext() {
+			return iterator.hasNext();
+		}
+
+		@Override
+		public T next() {
+			return iterator.next().getEntity();
+		}
+
+		@Override
+		public void remove() {
+			iterator.remove();
+		}
+
+	}
+}

src/main/java/com/arangodb/DocumentCursorResult.java

@@ -7,7 +7,7 @@
  */
 public class EdgeCursor<T> extends BaseCursorProxy<T, EdgeEntity<T>> {
 
-	public EdgeCursor(BaseCursor<T, EdgeEntity<T>> baseCursor) {
+	public EdgeCursor(DocumentCursorResult<T, EdgeEntity<T>> baseCursor) {
 		super(baseCursor);
 	}
 }