Merge branch 'master' into 2.2

Author: gschwab

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

@@ -226,9 +226,8 @@ <T> DocumentEntity<T> createVertex(
    * @param collectionName
    * @param key
    * @param clazz
-   * @param rev
-   * @param ifNoneMatchRevision
    * @param ifMatchRevision
+   * @param ifNoneMatchRevision
    * @return
    * @throws ArangoException
    */
@@ -238,9 +237,8 @@ <T> DocumentEntity<T> getVertex(
     String collectionName,
     String key,
     Class<?> clazz,
-    Long rev,
-    Long ifNoneMatchRevision,
-    Long ifMatchRevision) throws ArangoException;
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException;
 
   /**
    * Replaces a vertex with the given key by the content in the body. This will
@@ -252,8 +250,8 @@ <T> DocumentEntity<T> getVertex(
    * @param key
    * @param vertex
    * @param waitForSync
-   * @param rev
    * @param ifMatchRevision
+   * @param ifNoneMatchRevision
    * @return <T> DocumentEntity<T>
    * @throws ArangoException
    */
@@ -264,8 +262,8 @@ <T> DocumentEntity<T> replaceVertex(
     String key,
     Object vertex,
     Boolean waitForSync,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException;
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException;
 
   /**
    * Updates a vertex with the given key by adding the content in the body. This
@@ -278,9 +276,9 @@ <T> DocumentEntity<T> replaceVertex(
    * @param vertex
    * @param keepNull
    * @param waitForSync
-   * @param rev
    * @param ifMatchRevision
-   * @return <T> DocumentEntity<T>
+   * @param ifNoneMatchRevision
+   * @return
    * @throws ArangoException
    */
   <T> DocumentEntity<T> updateVertex(
@@ -291,8 +289,8 @@ <T> DocumentEntity<T> updateVertex(
     Object vertex,
     Boolean keepNull,
     Boolean waitForSync,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException;
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException;
 
   /**
    * Deletes a vertex with the given key, if it is contained within the graph.
@@ -303,9 +301,9 @@ <T> DocumentEntity<T> updateVertex(
    * @param collectionName
    * @param key
    * @param waitForSync
-   * @param rev
    * @param ifMatchRevision
-   * @return DeletedEntity
+   * @param ifNoneMatchRevision
+   * @return
    * @throws ArangoException
    */
   DeletedEntity deleteVertex(
@@ -314,8 +312,30 @@ DeletedEntity deleteVertex(
     String collectionName,
     String key,
     Boolean waitForSync,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException;
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException;
+
+  /**
+   * 
+   * 
+   * @param database
+   * @param graphName
+   * @param edgeCollectionName
+   * @param fromHandle
+   * @param toHandle
+   * @param value
+   * @param waitForSync
+   * @return <T> EdgeEntity<T>
+   * @throws ArangoException
+   */
+  <T> EdgeEntity<T> createEdge(
+    String database,
+    String graphName,
+    String edgeCollectionName,
+    String fromHandle,
+    String toHandle,
+    Object value,
+    Boolean waitForSync) throws ArangoException;
 
   /**
    * 
@@ -361,9 +381,8 @@ <T> EdgeEntity<T> getEdge(
     String edgeCollectionName,
     String key,
     Class<?> clazz,
-    Long rev,
-    Long ifNoneMatchRevision,
-    Long ifMatchRevision) throws ArangoException;
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException;
 
   /**
    * Deletes an edge with the given id, if it is contained within the graph.
@@ -397,8 +416,8 @@ DeletedEntity deleteEdge(
    * @param key
    * @param value
    * @param waitForSync
-   * @param rev
    * @param ifMatchRevision
+   * @param ifNoneMatchRevision
    * @return <T> EdgeEntity<T>
    * @throws ArangoException
    */
@@ -409,8 +428,8 @@ <T> EdgeEntity<T> replaceEdge(
     String key,
     Object value,
     Boolean waitForSync,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException;
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException;
 
   /**
    * Updates an edge with the given key by adding the content in the body. This
@@ -423,8 +442,8 @@ <T> EdgeEntity<T> replaceEdge(
    * @param value
    * @param waitForSync
    * @param keepNull
-   * @param rev
    * @param ifMatchRevision
+   * @param ifNoneMatchRevision
    * @return <T> EdgeEntity<T>
    * @throws ArangoException
    */
@@ -436,8 +455,8 @@ <T> EdgeEntity<T> updateEdge(
     Object value,
     Boolean waitForSync,
     Boolean keepNull,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException;
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException;
 
   <T> CursorEntity<EdgeEntity<T>> getEdges(
     String database,

src/main/java/com/arangodb/InternalGraphDriver.java

@@ -13,6 +13,8 @@ public interface InternalIndexDriver  extends BaseDriverInterface {
 
   IndexEntity createCappedIndex(String database, String collectionName, int size) throws ArangoException;
 
+  IndexEntity createCappedByDocumentSizeIndex(String database, String collectionName, int byteSize) throws ArangoException;
+
   IndexEntity createFulltextIndex(String database, String collectionName, Integer minLength, String... fields) throws ArangoException;
 
   IndexEntity deleteIndex(String database, String indexHandle) throws ArangoException;

src/main/java/com/arangodb/InternalIndexDriver.java

@@ -16,7 +16,7 @@ public interface InternalTransactionDriver extends BaseDriverInterface {
   TransactionEntity createTransaction (String action);
 
 
-  <T> T  executeTransaction(String database, TransactionEntity transactionEntity, Class clazz) throws ArangoException;
+  TransactionResultEntity  executeTransaction(String database, TransactionEntity transactionEntity) throws ArangoException;
 
 
 }

src/main/java/com/arangodb/InternalTransactionDriver.java

@@ -21,14 +21,25 @@
 import java.util.List;
 
 /**
+ *
+ * A entity defining admin logs
+ *
  * @author tamtam180 - kirscheless at gmail.com
  *
  */
 public class AdminLogEntity extends BaseEntity {
 
+  /**
+   * The total amount of log entries
+   */
   int totalAmount;
+
+  /**
+   * A list of log entries
+   * @see com.arangodb.entity.AdminLogEntity.LogEntry
+   */
   List<LogEntry> logs;
-  
+
   public int getTotalAmount() {
     return totalAmount;
   }
@@ -43,10 +54,27 @@ public void setLogs(List<LogEntry> logs) {
   }
 
   public static class LogEntry implements Serializable {
+
+    /**
+     * The log id
+     */
     int lid;
+
+    /**
+     * The integer representation of a log level
+     */
     int level;
+
+    /**
+     * The timestamp of the log entry
+     */
     Date timestamp;
+
+    /**
+     * The log message
+     */
     String text;
+
     public int getLid() {
       return lid;
     }

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

@@ -20,11 +20,16 @@
 import java.util.Map;
 
 /**
+ * An entity wrapping a list of AQL functions
+ *
  * @author Florian Bartels - [email protected]
  *
  */
 public class AqlFunctionsEntity extends BaseEntity {
-  
+
+  /**
+   * A map containing the function name as key and the function as value
+   */
   Map<String, String> aqlFunctions;
 
   public AqlFunctionsEntity () {

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

@@ -17,13 +17,26 @@
 package com.arangodb.entity;
 
 /**
+ * An entity representing the arango server time
+ *
  * @author tamtam180 - kirscheless at gmail.com
  *
  */
 public class ArangoUnixTime extends BaseEntity {
 
+  /**
+   * the unix timestamp as double
+   */
   double time;
+
+  /**
+   * the unix timestamp as integer
+   */
   int second;
+
+  /**
+   * the microseconds part of the unix timestamp
+   */
   int microsecond;
 
   public long getTimeMillis() {

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

@@ -19,12 +19,22 @@
 
 
 /**
+ *
+ * An entity representing the ArangoDB version
+ *
  * @author tamtam180 - kirscheless at gmail.com
  *
  */
 public class ArangoVersion extends BaseEntity {
-  
+
+  /**
+   * Name of the server
+   */
   String server;
+
+  /**
+   * The current version
+   */
   String version;
 
   public String getServer() {

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

@@ -25,32 +25,81 @@
  *
  */
 public abstract class BaseEntity implements Serializable {
-  
+
+  /**
+   * If true an error occurred while creating this entity
+   */
   @Exclude(deserialize=false)
   boolean error;
+
+  /**
+   * The http response code of the response
+   */
   @Exclude(deserialize=false)
   int code;
+
+  /**
+   * The Arango error number of the error
+   */
   @Exclude(deserialize=false)
   int errorNumber;
+
+  /**
+   * If an error occurred this is the error message
+   */
   @Exclude(deserialize=false)
   String errorMessage;
+
+  /**
+   * The http status code of the response
+   */
   @Exclude(deserialize=false)
   int statusCode;
+
+  /**
+   * The check sum of the requested resource
+   */
   @Exclude(deserialize=false)
   long etag;
+
+  /**
+   * The requestId, this attribute is only used for batch requests.
+   */
   @Exclude(deserialize=false)
   String requestId;
-  
+
+  /**
+   * If the resource has been modified it returns true
+   *
+   * @return boolean
+   */
   public boolean isNotModified() {
     return statusCode == 304; //HttpStatus.SC_NOT_MODIFIED;
   }
+
+  /**
+   * If the request is unauthorized this returns true
+   *
+   * @return boolean
+   */
   public boolean isUnauthorized() {
     return statusCode == 401;
   }
+
+  /**
+   * If the requested resource has not been modified it returns true
+   *
+   * @return boolean
+   */
   public boolean isNotFound() {
     return statusCode == 404;
   }
 
+  /**
+   * If this is the response of a batch request it returns true
+   *
+   * @return boolean
+   */
   public boolean isBatchResponseEntity() {
     return statusCode == 206;
   }