changed Object to T

Author: Achim Brandt

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

@@ -23,7 +23,50 @@
 import java.util.List;
 import java.util.Map;
 
-import com.arangodb.entity.*;
+import com.arangodb.entity.AdminLogEntity;
+import com.arangodb.entity.AqlFunctionsEntity;
+import com.arangodb.entity.ArangoUnixTime;
+import com.arangodb.entity.ArangoVersion;
+import com.arangodb.entity.BaseDocument;
+import com.arangodb.entity.BatchResponseEntity;
+import com.arangodb.entity.BooleanResultEntity;
+import com.arangodb.entity.CollectionEntity;
+import com.arangodb.entity.CollectionKeyOption;
+import com.arangodb.entity.CollectionOptions;
+import com.arangodb.entity.CollectionsEntity;
+import com.arangodb.entity.CursorEntity;
+import com.arangodb.entity.DatabaseEntity;
+import com.arangodb.entity.DefaultEntity;
+import com.arangodb.entity.DeletedEntity;
+import com.arangodb.entity.DocumentEntity;
+import com.arangodb.entity.DocumentResultEntity;
+import com.arangodb.entity.EdgeDefinitionEntity;
+import com.arangodb.entity.EdgeEntity;
+import com.arangodb.entity.Endpoint;
+import com.arangodb.entity.GraphEntity;
+import com.arangodb.entity.GraphsEntity;
+import com.arangodb.entity.ImportResultEntity;
+import com.arangodb.entity.IndexEntity;
+import com.arangodb.entity.IndexType;
+import com.arangodb.entity.IndexesEntity;
+import com.arangodb.entity.JobsEntity;
+import com.arangodb.entity.PlainEdgeEntity;
+import com.arangodb.entity.Policy;
+import com.arangodb.entity.ReplicationApplierConfigEntity;
+import com.arangodb.entity.ReplicationApplierStateEntity;
+import com.arangodb.entity.ReplicationInventoryEntity;
+import com.arangodb.entity.ReplicationLoggerConfigEntity;
+import com.arangodb.entity.ReplicationLoggerStateEntity;
+import com.arangodb.entity.ReplicationSyncEntity;
+import com.arangodb.entity.RestrictType;
+import com.arangodb.entity.ScalarExampleEntity;
+import com.arangodb.entity.SimpleByResultEntity;
+import com.arangodb.entity.StatisticsDescriptionEntity;
+import com.arangodb.entity.StatisticsEntity;
+import com.arangodb.entity.StringsResultEntity;
+import com.arangodb.entity.TransactionEntity;
+import com.arangodb.entity.TransactionResultEntity;
+import com.arangodb.entity.UserEntity;
 import com.arangodb.http.BatchHttpManager;
 import com.arangodb.http.BatchPart;
 import com.arangodb.http.HttpManager;
@@ -3657,7 +3700,7 @@ public GraphEntity graphDeleteEdgeDefinition(String graphName, String edgeCollec
    *         vertex document.
    * @throws ArangoException
    */
-  public <T> DocumentEntity<T> graphGetVertex(String graphName, String collectionName, String key, Class<?> clazz)
+  public <T> DocumentEntity<T> graphGetVertex(String graphName, String collectionName, String key, Class<T> clazz)
       throws ArangoException {
     return graphDriver.getVertex(getDefaultDatabase(), graphName, collectionName, key, clazz, null, null);
   }
@@ -3680,7 +3723,7 @@ public <T> DocumentEntity<T> graphGetVertex(
     String graphName,
     String collectionName,
     String key,
-    Class<?> clazz,
+    Class<T> clazz,
     Long ifNoneMatchRevision,
     Long ifMatchRevision) throws ArangoException {
     return graphDriver.getVertex(
@@ -3765,7 +3808,7 @@ public DeletedEntity graphDeleteVertex(
    * @return DocumentEntity<T>
    * @throws ArangoException
    */
-  public <T> DocumentEntity<T> graphReplaceVertex(String graphName, String collectionName, String key, Object vertex)
+  public <T> DocumentEntity<T> graphReplaceVertex(String graphName, String collectionName, String key, T vertex)
       throws ArangoException {
     return graphDriver.replaceVertex(getDefaultDatabase(), graphName, collectionName, key, vertex, null, null, null);
   }
@@ -3790,7 +3833,7 @@ public <T> DocumentEntity<T> graphReplaceVertex(
     String graphName,
     String collectionName,
     String key,
-    Object vertex,
+    T vertex,
     Boolean waitForSync,
     Long ifMatchRevision,
     Long ifNoneMatchRevision) throws ArangoException {
@@ -4385,7 +4428,7 @@ public TransactionResultEntity executeTransaction(TransactionEntity transactionE
   public <T> EdgeEntity<T> createEdge(
       String databaseName,
       String collectionName,
-      Object object,
+      T object,
       String from,
       String to,
       Boolean createCollection,

src/main/java/com/arangodb/BaseArangoDriver.java

@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import com.arangodb.entity.BaseDocument;
 import com.arangodb.entity.BaseEntity;
 import com.arangodb.entity.DefaultEntity;
 import com.arangodb.entity.DocumentEntity;
@@ -178,7 +177,7 @@ protected ReplicationDumpHeader toReplicationDumpHeader(HttpResponseEntity res)
    */
   protected <T extends BaseEntity> T createEntity(
     HttpResponseEntity res,
-    Class<? extends BaseEntity> clazz,
+    Class<T> clazz,
     Class<?>[] pclazz,
     boolean validate) throws ArangoException {
     if (res == null) {
@@ -302,7 +301,7 @@ protected <T extends BaseEntity> T createEntity(HttpResponseEntity res, Class<T>
 
   protected <T extends BaseEntity> T createEntity(
     HttpResponseEntity res,
-    Class<? extends BaseEntity> clazz,
+    Class<T> clazz,
     Class<?>... pclazz) throws ArangoException {
     return createEntity(res, clazz, pclazz, true);
   }

src/main/java/com/arangodb/InternalEdgeDriver.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
+ * Copyright 2004-2015 triAGENS 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
@@ -16,31 +16,21 @@
  *
  * @author fbartels
  * @author gschwab
- * @author Copyright 2014, triAGENS GmbH, Cologne, Germany
+ * @author a-brandt
+ * @author Copyright 2015, triAGENS GmbH, Cologne, Germany
  */
 
 package com.arangodb;
 
-import java.util.Collection;
-import java.util.List;
-
-import com.arangodb.entity.CursorEntity;
-import com.arangodb.entity.DeletedEntity;
-import com.arangodb.entity.Direction;
-import com.arangodb.entity.DocumentEntity;
-import com.arangodb.entity.EdgeDefinitionEntity;
 import com.arangodb.entity.EdgeEntity;
-import com.arangodb.entity.FilterCondition;
-import com.arangodb.entity.GraphEntity;
-import com.arangodb.entity.GraphsEntity;
 import com.arangodb.impl.BaseDriverInterface;
 
 public interface InternalEdgeDriver extends BaseDriverInterface {
 
    <T> EdgeEntity<T> createEdge(
       String databaseName,
       String collectionName,
-      Object object,
+      T object,
       String from,
       String to,
       Boolean createCollection,

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

@@ -236,7 +236,7 @@ <T> DocumentEntity<T> getVertex(
     String graphName,
     String collectionName,
     String key,
-    Class<?> clazz,
+    Class<T> clazz,
     Long ifMatchRevision,
     Long ifNoneMatchRevision) throws ArangoException;
 
@@ -260,7 +260,7 @@ <T> DocumentEntity<T> replaceVertex(
     String graphName,
     String collectionName,
     String key,
-    Object vertex,
+ T vertex,
     Boolean waitForSync,
     Long ifMatchRevision,
     Long ifNoneMatchRevision) throws ArangoException;

src/main/java/com/arangodb/impl/InternalEdgeDriverImpl.java

@@ -40,7 +40,7 @@ public class InternalEdgeDriverImpl extends BaseArangoDriverWithCursorImpl imple
   public <T> EdgeEntity<T> createEdge(
       String databaseName,
       String collectionName,
-      Object object,
+      T object,
       String from,
       String to,
       Boolean createCollection,
@@ -63,7 +63,7 @@ public <T> EdgeEntity<T> createEdge(
         body);
 
     EdgeEntity<T> edgeEntity = createEntity(response, EdgeEntity.class);
-    edgeEntity.setEntity((T) object);
+    edgeEntity.setEntity(object);
     return edgeEntity;
   }
 

src/main/java/com/arangodb/impl/InternalGraphDriverImpl.java

@@ -39,7 +39,6 @@
 import com.arangodb.entity.GraphEntity;
 import com.arangodb.entity.GraphGetCollectionsResultEntity;
 import com.arangodb.entity.GraphsEntity;
-import com.arangodb.entity.marker.VertexEntity;
 import com.arangodb.http.HttpManager;
 import com.arangodb.http.HttpResponseEntity;
 import com.arangodb.util.MapBuilder;
@@ -119,7 +118,6 @@ public GraphEntity getGraph(String databaseName, String graphName) throws Arango
       createEndpointUrl(baseUrl, databaseName, "/_api/gharial", StringUtils.encodeUrl(graphName)),
       new MapBuilder().get(),
       null);
-    GraphEntity g = createEntity(res, GraphEntity.class);
     return createEntity(res, GraphEntity.class);
 
   }
@@ -341,7 +339,7 @@ public <T> DocumentEntity<T> createVertex(
     if (!res.isJsonResponse()) {
       throw new ArangoException("unknown error");
     }
-    DocumentEntity<T> result = createEntity(res, VertexEntity.class, vertex.getClass());
+    DocumentEntity<T> result = createEntity(res, DocumentEntity.class, vertex.getClass());
     result.setEntity(vertex);
     return result;
   }
@@ -352,7 +350,7 @@ public <T> DocumentEntity<T> getVertex(
     String graphName,
     String collectionName,
     String key,
-    Class<?> clazz,
+    Class<T> clazz,
     Long ifMatchRevision,
     Long ifNoneMatchRevision) throws ArangoException {
 
@@ -369,8 +367,7 @@ public <T> DocumentEntity<T> getVertex(
       new MapBuilder().put("If-Match", ifMatchRevision, true).put("If-None-Match", ifNoneMatchRevision, true).get(),
       new MapBuilder().get());
 
-    return createEntity(res, VertexEntity.class, clazz);
-
+    return createEntity(res, DocumentEntity.class, clazz);
   }
 
   @Override
@@ -379,7 +376,7 @@ public <T> DocumentEntity<T> replaceVertex(
     String graphName,
     String collectionName,
     String key,
-    Object vertex,
+    T vertex,
     Boolean waitForSync,
     Long ifMatchRevision,
     Long ifNoneMatchRevision) throws ArangoException {
@@ -398,8 +395,7 @@ public <T> DocumentEntity<T> replaceVertex(
       new MapBuilder().put("waitForSync", waitForSync).get(),
       EntityFactory.toJsonString(vertex));
 
-    return createEntity(res, VertexEntity.class, vertex.getClass());
-
+    return createEntity(res, DocumentEntity.class, vertex.getClass());
   }
 
   @Override
@@ -428,7 +424,7 @@ public <T> DocumentEntity<T> updateVertex(
       new MapBuilder().put("keepNull", keepNull).put("waitForSync", waitForSync).get(),
       EntityFactory.toJsonString(vertex, keepNull != null && !keepNull));
 
-    return createEntity(res, VertexEntity.class, vertex.getClass());
+    return createEntity(res, DocumentEntity.class, vertex.getClass());
   }
 
   @Override