embedded edge properties

Author: rashtao

docker/jwtHeader

@@ -0,0 +1 @@
+Authorization: bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJhcmFuZ29kYiIsInNlcnZlcl9pZCI6ImZvbyJ9.QmuhPHkmRPJuHGxsEqggHGRyVXikV44tb5YU_yWEvEM

docker/jwtSecret

@@ -0,0 +1 @@
+Averysecretword

docker/server.pem

@@ -0,0 +1,60 @@
+Bag Attributes
+ friendlyName: arangotest
+ localKeyID: 54 69 6D 65 20 31 36 30 34 32 35 36 36 37 39 38 35 34 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1WiDnd4+uCmMG
+539ZNZB8NwI0RZF3sUSQGPx3lkqaFTZVEzMZL76HYvdc9Qg7difyKyQ09RLSpMAL
+X9euSseD7bZGnfQH52BnKcT09eQ3wh7aVQ5sN2omygdHLC7X9usntxAfv7Nzmvdo
+gNXoJQyY/hSZff7RIqWH8NnAUKkjqOe6Bf5LDbxHKESmrFBxOCOnhcpvZWetwpiR
+dJVPwUn5P82CAZzfiBfmBZnB7D0l+/6Cv4jMuH26uAIcixnVekBQzl1RgwczuiZf
+2MGO64vDMMJJWE9ClZF1uQuQrwXF6qwhuP1Hnkii6wNbTtPWlGSkqeutr004+Hzb
+f8KnRY4PAgMBAAECggEAKi1d/bdW2TldMpvgiFTm15zLjHCpllbKBWFqRj3T9+X7
+Duo6Nh9ehopD0YDDe2DNhYr3DsH4sLjUWVDfDpAhutMsU1wlBzmOuC+EuRv/CeDB
+4DFr+0sgCwlti+YAtwWcR05SF7A0Ai0GYW2lUipbtbFSBSjCfM08BlPDsPCRhdM8
+DhBn3S45aP7oC8BdhG/etg+DfXW+/nyNwEcMCYG97bzXNjzYpCQjo/bTHdh2UPYM
+4WEAqFzZ5jir8LVS3v7GqpqPmk6FnHJOJpfpOSZoPqnfpIw7SVlNsXHvDaHGcgYZ
+Xec7rLQlBuv4RZU7OlGJpK2Ng5kvS9q3nfqqn7YIMQKBgQDqSsYnE+k6CnrSpa2W
+B9W/+PChITgkA46XBUUjAueJ7yVZQQEOzl0VI6RoVBp3t66eO8uM9omO8/ogHXku
+Ei9UUIIfH4BsSP7G5A06UC/FgReDxwBfbRuS+lupnmc348vPDkFlJZ4hDgWflNev
+7tpUbljSAqUea1VhdBy146V4qwKBgQDGJ6iL1+A9uUM+1UklOAPpPhTQ8ZQDRCj7
+7IMVcbzWYvCMuVNXzOWuiz+VYr3IGCJZIbxbFDOHxGF4XKJnk0vm1qhQQME0PtAF
+i1jIfsxpj8KKJl9Uad+XLQCYRV8mIZlhsd/ErRJuz6FyqevKH3nFIb0ggF3x2d06
+odTHuj4ILQKBgCUsI/BDSne4/e+59aaeK52/w33tJVkhb1gqr+N0LIRH+ycEF0Tg
+HQijlQwwe9qOvBfC6PK+kuipcP/zbSyQGg5Ij7ycZOXJVxL7T9X2rv2pE7AGvNpn
+Fz7klfJ9fWbyr310h4+ivkoETYQaO3ZgcSeAMntvi/8djHhf0cZSDgjtAoGBAKvQ
+TUNcHjJGxfjgRLkB1dpSmwgEv7sJSaQOkiZw5TTauwq50nsJzYlHcg1cfYPW8Ulp
+iAFNBdVNwNn1MFgwjpqMO4rCawObBxIXnhbSYvmQzjStSvFNj7JsMdzWIcdVUMI1
+0fmdu6LbY3ihvzIVkqcMNwnMZCjFKB6jnXTElu7NAoGAS0gNPD/bfzWAhZBBYp9/
+SLGOvjHKrSVWGwDiqdAGuh6xg+1C3F+XpiITP6d3Wv3PCJ/Gia5isQPSMaXG+xTt
+6huBgFlksHqr0tsQA9dcgGW7BDr5VhRq5/WinaLhGGy1R+i2zbDmQXgHbCO+RH/s
+bD9F4LZ3RoXmGHLW0IUggPw=
+-----END PRIVATE KEY-----
+Bag Attributes
+ friendlyName: arangotest
+ localKeyID: 54 69 6D 65 20 31 36 30 34 32 35 36 36 37 39 38 35 34 
+subject=C = Unknown, ST = Unknown, L = Unknown, O = Unknown, OU = Unknown, CN = localhost
+
+issuer=C = Unknown, ST = Unknown, L = Unknown, O = Unknown, OU = Unknown, CN = localhost
+
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIEeDCzXzANBgkqhkiG9w0BAQsFADBuMRAwDgYDVQQGEwdV
+bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD
+VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRIwEAYDVQQDEwlsb2NhbGhv
+c3QwHhcNMjAxMTAxMTg1MTE5WhcNMzAxMDMwMTg1MTE5WjBuMRAwDgYDVQQGEwdV
+bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD
+VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRIwEAYDVQQDEwlsb2NhbGhv
+c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1WiDnd4+uCmMG539Z
+NZB8NwI0RZF3sUSQGPx3lkqaFTZVEzMZL76HYvdc9Qg7difyKyQ09RLSpMALX9eu
+SseD7bZGnfQH52BnKcT09eQ3wh7aVQ5sN2omygdHLC7X9usntxAfv7NzmvdogNXo
+JQyY/hSZff7RIqWH8NnAUKkjqOe6Bf5LDbxHKESmrFBxOCOnhcpvZWetwpiRdJVP
+wUn5P82CAZzfiBfmBZnB7D0l+/6Cv4jMuH26uAIcixnVekBQzl1RgwczuiZf2MGO
+64vDMMJJWE9ClZF1uQuQrwXF6qwhuP1Hnkii6wNbTtPWlGSkqeutr004+Hzbf8Kn
+RY4PAgMBAAGjITAfMB0GA1UdDgQWBBTBrv9Awynt3C5IbaCNyOW5v4DNkTANBgkq
+hkiG9w0BAQsFAAOCAQEAIm9rPvDkYpmzpSIhR3VXG9Y71gxRDrqkEeLsMoEyqGnw
+/zx1bDCNeGg2PncLlW6zTIipEBooixIE9U7KxHgZxBy0Et6EEWvIUmnr6F4F+dbT
+D050GHlcZ7eOeqYTPYeQC502G1Fo4tdNi4lDP9L9XZpf7Q1QimRH2qaLS03ZFZa2
+tY7ah/RQqZL8Dkxx8/zc25sgTHVpxoK853glBVBs/ENMiyGJWmAXQayewY3EPt/9
+wGwV4KmU3dPDleQeXSUGPUISeQxFjy+jCw21pYviWVJTNBA9l5ny3GhEmcnOT/gQ
+HCvVRLyGLMbaMZ4JrPwb+aAtBgrgeiK4xeSMMvrbhw==
+-----END CERTIFICATE-----

pom.xml

@@ -26,7 +26,7 @@
 <arangodb-java-driver.version>7.17.0</arangodb-java-driver.version>
 <tinkerpop.version>3.7.3</tinkerpop.version>
 <junit.version>4.13.1</junit.version>
-<logback-classic.version>1.2.13</logback-classic.version>
+<logback-classic.version>1.3.15</logback-classic.version>
 <commons-lang3.version>3.4</commons-lang3.version>
 </properties>
 
@@ -80,7 +80,7 @@
 <dependency>
 <groupId>org.mockito</groupId>
 <artifactId>mockito-core</artifactId>
-<version>2.13.0</version>
+<version>4.11.0</version>
 <scope>test</scope>
 </dependency>
 <dependency>

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBGraphClient.java

@@ -22,6 +22,8 @@
 
 import com.arangodb.config.ArangoConfigProperties;
 import com.arangodb.entity.*;
+import com.arangodb.model.*;
+import com.arangodb.tinkerpop.gremlin.structure.*;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.slf4j.Logger;
@@ -33,13 +35,7 @@
 import com.arangodb.ArangoDBException;
 import com.arangodb.ArangoDatabase;
 import com.arangodb.ArangoGraph;
-import com.arangodb.model.AqlQueryOptions;
-import com.arangodb.model.GraphCreateOptions;
 import com.arangodb.tinkerpop.gremlin.client.ArangoDBQueryBuilder.UniqueVertices;
-import com.arangodb.tinkerpop.gremlin.structure.ArangoDBEdge;
-import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
-import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraphVariables;
-import com.arangodb.tinkerpop.gremlin.structure.ArangoDBVertex;
 import com.arangodb.tinkerpop.gremlin.utils.ArangoDBUtil;
 
 /**
@@ -380,36 +376,6 @@ public void updateDocument(ArangoDBBaseDocument document) {
 document._rev(vertexEntity.getRev());
 }
 
-/**
- * Get an edge from the graph.
- *
- * @param <V>	the value type
- * @param id	the id (name) of the edge
- * @param collection	the collection from which the edge is retrieved
- * @param edgeClass	the edge's specialised class
- * @return the edge
- * @throws ArangoDBGraphException	If there was an error retrieving the edge
- */
-
-public <V extends ArangoDBBaseEdge> V getEdge(
-String id,
-String collection,
- Class<V> edgeClass) {
-logger.debug("Get edge {} from {}:{}", id, graph.name(), graph.getPrefixedCollectioName(collection));
-V result;
-try {
-result = db.graph(graph.name())
-.edgeCollection(graph.getPrefixedCollectioName(collection))
-.getEdge(id, edgeClass);
-} catch (ArangoDBException e) {
-logger.error("Failed to retrieve edge: {}", e.getErrorMessage());
- throw ArangoDBExceptions.getArangoDBException(e);
-}
-result.collection(collection);
-result.graph(graph);
-return result;
-}
-
 /**
  * Insert an edge in the graph. The edge is updated with the id, rev and name (if not
  * present)
@@ -437,46 +403,6 @@ public void insertEdge(ArangoDBBaseEdge edge) {
 edge._rev(insertEntity.getRev());
 edge.setPaired(true);
 }
-
-/**
- * Delete an edge from the graph.
- * @param edge	the edge
- * @throws ArangoDBGraphException	If there was an error deleting the edge
- */
-
-public void deleteEdge(ArangoDBBaseEdge edge) {
-logger.debug("Delete edge {} in {}", edge, graph.name());
-try {
-db.graph(graph.name())
-.edgeCollection(edge.collection())
-.deleteEdge(edge._key());
-} catch (ArangoDBException e) {
-logger.error("Failed to delete vertex: {}", e.getErrorMessage());
- throw ArangoDBExceptions.getArangoDBException(e);
-}
-edge.setPaired(false);
-}
-
-/**
- * Update the edge in the graph.
- * @param edge	the edge
- * @throws ArangoDBGraphException	If there was an error updating the edge
- */
-
-public void updateEdge(ArangoDBBaseEdge edge) {
-logger.debug("Update edge {} in {}", edge, graph.name());
-EdgeUpdateEntity edgeEntity;
-try {
-edgeEntity = db.graph(graph.name())
-.edgeCollection(edge.collection())
-.updateEdge(edge._key(), edge);
-} catch (ArangoDBException e) {
-logger.error("Failed to update vertex: {}", e.getErrorMessage());
- throw ArangoDBExceptions.getArangoDBException(e);
-}
-logger.info("Edge updated, new rev {}", edgeEntity.getRev());
-edge._rev(edgeEntity.getRev());
-}
 
 public ArangoDBGraphVariables getGraphVariables() {
 logger.debug("Get graph variables");
@@ -569,7 +495,7 @@ public void updateGraphVariables(ArangoDBGraphVariables document) {
 }
 
 /**
- * Create a query to get all the edges of a vertex. 
+ * Create a query to get all the edges of a vertex.
  *
  * @param vertex	the vertex
  * @param edgeLabels	a list of edge labels to follow, empty if all type of edges
@@ -578,27 +504,27 @@ public void updateGraphVariables(ArangoDBGraphVariables document) {
  * @throws ArangoDBException if there is an error executing the query
  */
 
-public ArangoCursor<ArangoDBEdge> getVertexEdges(
-ArangoDBVertex vertex,
-List<String> edgeLabels,
-Direction direction)
-throws ArangoDBException {
+public ArangoCursor<ArangoDBEdgeDocument> getVertexEdges(
+ArangoDBVertex vertex,
+List<String> edgeLabels,
+Direction direction)
+throws ArangoDBException {
 logger.debug("Get Vertex's {}:{} Edges, in {}, from collections {}", vertex, direction, graph.name(), edgeLabels);
 Map<String, Object> bindVars = new HashMap<>();
 ArangoDBQueryBuilder queryBuilder = new ArangoDBQueryBuilder();
 ArangoDBQueryBuilder.Direction arangoDirection = ArangoDBUtil.getArangoDirectionFromGremlinDirection(direction);
 logger.debug("Creating query");
 queryBuilder.iterateGraph(graph.name(), "v", Optional.of("e"),
-Optional.empty(), Optional.empty(), Optional.empty(),
-arangoDirection, vertex._id(), bindVars)
-.graphOptions(Optional.of(UniqueVertices.NONE), Optional.empty(), true)
-.filterSameCollections("e", edgeLabels, bindVars)
-.ret("e");
-
+Optional.empty(), Optional.empty(), Optional.empty(),
+arangoDirection, vertex._id(), bindVars)
+.graphOptions(Optional.of(UniqueVertices.NONE), Optional.empty(), true)
+.filterSameCollections("e", edgeLabels, bindVars)
+.ret("e");
+
 String query = queryBuilder.toString();
-return executeAqlQuery(query, bindVars, null, ArangoDBEdge.class);
+return executeAqlQuery(query, bindVars, null, ArangoDBEdgeDocument.class);
 }
-
+
 /**
  * Get all neighbours of a document.
  *
@@ -708,13 +634,9 @@ public ArangoCursor<ArangoDBVertex> getGraphVertices(
  * Get edges of a graph. If no ids are provided, get all edges.
  *
  * @param ids	the ids to match
- * @param collections	the collections to search within
  * @return ArangoDBBaseQuery	the query object
  */
-
-public ArangoCursor<ArangoDBEdge> getGraphEdges(
-List<String> ids,
-List<String> collections) {
+public ArangoCursor<ArangoDBEdgeDocument> getGraphEdges(List<String> ids) {
 logger.debug("Get all {} graph edges, filtered by ids: {}", graph.name(), ids);
 Map<String, Object> bindVars = new HashMap<>();
 ArangoDBQueryBuilder queryBuilder = new ArangoDBQueryBuilder();
@@ -725,21 +647,15 @@ public ArangoCursor<ArangoDBEdge> getGraphEdges(
 } else {
 queryBuilder.iterateCollection("e", prefixedColNames.get(0), bindVars);
 }
-}
-else {
- if (!collections.isEmpty()) {
- prefixedColNames = collections.stream().map(graph::getPrefixedCollectioName).collect(Collectors.toList());
- }
- queryBuilder.with(prefixedColNames, bindVars)
- .documentsById(ids, "e", bindVars);
-
+} else {
+ queryBuilder.with(prefixedColNames, bindVars).documentsById(ids, "e", bindVars);
 }
 queryBuilder.ret("e");
 String query = queryBuilder.toString();
 logger.debug("AQL {}", query);
-return executeAqlQuery(query, bindVars, null, ArangoDBEdge.class);
+return executeAqlQuery(query, bindVars, null, ArangoDBEdgeDocument.class);
 }
-
+
 /**
  * Gets the edge vertices.
  *
@@ -1182,4 +1098,63 @@ private void insertDocument(ArangoDBBaseDocument document, String colName) {
 //	}
 //	}
 
+public void insertEdge(ArangoDBEdgeDocument edge) {
+logger.debug("Insert edge {} in {} ", edge, graph.name());
+EdgeEntity insertEntity;
+String collection = graph.getPrefixedCollectioName(edge.getLabel());
+try {
+insertEntity = db.graph(graph.name())
+.edgeCollection(collection)
+.insertEdge(edge);
+} catch (ArangoDBException e) {
+logger.error("Failed to insert edge: {}", e.getErrorMessage());
+ArangoDBGraphException arangoDBException = ArangoDBExceptions.getArangoDBException(e);
+if (arangoDBException.getErrorCode() == 1210) {
+throw Graph.Exceptions.edgeWithIdAlreadyExists(collection + "/" + edge.getKey());
+}
+throw arangoDBException;
+}
+edge.setKey(insertEntity.getKey());
+edge.setRev(insertEntity.getRev());
+}
+
+//	public TinkerEdgeDocument getEdge(String key, String collection) {
+//	logger.debug("Get edge {} from {}:{}", key, graph.name(), graph.getPrefixedCollectioName(collection));
+//	try {
+//	return db.graph(graph.name())
+//	.edgeCollection(graph.getPrefixedCollectioName(collection))
+//	.getEdge(key, TinkerEdgeDocument.class);
+//	} catch (ArangoDBException e) {
+//	logger.error("Failed to retrieve edge: {}", e.getErrorMessage());
+//	throw ArangoDBExceptions.getArangoDBException(e);
+//	}
+//	}
+
+public void deleteEdge(ArangoDBEdgeDocument edge) {
+logger.debug("Delete edge {} in {}", edge, graph.name());
+try {
+db.graph(graph.name())
+.edgeCollection(graph.getPrefixedCollectioName(edge.getLabel()))
+.deleteEdge(edge.getKey());
+} catch (ArangoDBException e) {
+logger.error("Failed to delete vertex: {}", e.getErrorMessage());
+throw ArangoDBExceptions.getArangoDBException(e);
+}
+}
+
+public void updateEdge(ArangoDBEdgeDocument edge) {
+logger.debug("Update edge {} in {}", edge, graph.name());
+EdgeUpdateEntity updateEntity;
+try {
+updateEntity = db.graph(graph.name())
+.edgeCollection(graph.getPrefixedCollectioName(edge.getLabel()))
+.replaceEdge(edge.getKey(), edge);
+} catch (ArangoDBException e) {
+logger.error("Failed to update vertex: {}", e.getErrorMessage());
+throw ArangoDBExceptions.getArangoDBException(e);
+}
+logger.info("Edge updated, new rev {}", updateEntity.getRev());
+edge.setKey(updateEntity.getKey());
+edge.setRev(updateEntity.getRev());
+}
 }

src/main/java/com/arangodb/tinkerpop/gremlin/jsr223/ArangoDBGremlinPlugin.java

@@ -40,7 +40,8 @@ public class ArangoDBGremlinPlugin extends AbstractGremlinPlugin {
  ArangoDBPropertyIterator.class,
  ArangoDBQueryBuilder.class,
  ArangoDBEdge.class,
- ArangoDBEdgeProperty.class,
+ ArangoDBEdgeDocument.class,
+ ArangoDBProperty.class,
  ArangoDBElementProperty.class,
  ArangoDBGraph.class,
  ArangoDBGraphVariables.class,