Skip to content

Commit 1a08e51

Browse files
author
Mark
committed
changed Revision from long to String
1 parent 055aa13 commit 1a08e51

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+612
-665
lines changed

‎ChangeLog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
v3.1.0 (2016-09-XX)
22
* removed Methods with collectionId (long) from ArangoDriver (Id is only for internal usage)
3+
* changed Revision from long to String
34

45
v3.0.1 (2016-07-08)
56
---------------------------

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

Lines changed: 33 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -504,18 +504,6 @@ public CollectionEntity getCollectionProperties(final String name) throws Arango
504504
return collectionDriver.getCollectionProperties(getDefaultDatabase(), name);
505505
}
506506

507-
/**
508-
* Returns a collection from ArangoDB including revision by name
509-
*
510-
* @param name
511-
* the name of the collection.
512-
* @return CollectionEntity - the requested collectionEntity.
513-
* @throws ArangoException
514-
*/
515-
public CollectionEntity getCollectionRevision(final String name) throws ArangoException {
516-
return collectionDriver.getCollectionRevision(getDefaultDatabase(), name);
517-
}
518-
519507
/**
520508
* Returns a collection from ArangoDB by name including the document count
521509
*
@@ -831,7 +819,7 @@ public DocumentEntity<?> replaceDocument(
831819
final String collectionName,
832820
final long documentId,
833821
final Object value,
834-
final Long rev,
822+
final String rev,
835823
final Boolean waitForSync) throws ArangoException {
836824
return replaceDocument(createDocumentHandle(collectionName, String.valueOf(documentId)), value, rev,
837825
waitForSync);
@@ -861,7 +849,7 @@ public DocumentEntity<?> replaceDocument(
861849
final String collectionName,
862850
final String documentKey,
863851
final Object value,
864-
final Long rev,
852+
final String rev,
865853
final Boolean waitForSync) throws ArangoException {
866854
return replaceDocument(createDocumentHandle(collectionName, documentKey), value, rev, waitForSync);
867855
}
@@ -887,7 +875,7 @@ public DocumentEntity<?> replaceDocument(
887875
public <T> DocumentEntity<T> replaceDocument(
888876
final String documentHandle,
889877
final T value,
890-
final Long rev,
878+
final String rev,
891879
final Boolean waitForSync) throws ArangoException {
892880
return documentDriver.replaceDocument(getDefaultDatabase(), documentHandle, value, rev, waitForSync);
893881
}
@@ -1028,7 +1016,7 @@ public DocumentEntity<?> updateDocument(
10281016
final String collectionName,
10291017
final long documentId,
10301018
final Object value,
1031-
final Long rev,
1019+
final String rev,
10321020
final Boolean waitForSync,
10331021
final Boolean keepNull) throws ArangoException {
10341022
return updateDocument(createDocumentHandle(collectionName, String.valueOf(documentId)), value, rev, waitForSync,
@@ -1060,7 +1048,7 @@ public DocumentEntity<?> updateDocument(
10601048
final String collectionName,
10611049
final String documentKey,
10621050
final Object value,
1063-
final Long rev,
1051+
final String rev,
10641052
final Boolean waitForSync,
10651053
final Boolean keepNull) throws ArangoException {
10661054
return updateDocument(createDocumentHandle(collectionName, documentKey), value, rev, waitForSync, keepNull);
@@ -1088,7 +1076,7 @@ public DocumentEntity<?> updateDocument(
10881076
public <T> DocumentEntity<T> updateDocument(
10891077
final String documentHandle,
10901078
final T value,
1091-
final Long rev,
1079+
final String rev,
10921080
final Boolean waitForSync,
10931081
final Boolean keepNull) throws ArangoException {
10941082
return documentDriver.updateDocument(getDefaultDatabase(), documentHandle, value, rev, waitForSync, keepNull);
@@ -1173,7 +1161,7 @@ public boolean exists(final String documentHandle) throws ArangoException {
11731161
* @return the document revision number
11741162
* @throws ArangoException
11751163
*/
1176-
public long checkDocument(final String collectionName, final long documentId) throws ArangoException {
1164+
public String checkDocument(final String collectionName, final long documentId) throws ArangoException {
11771165
return checkDocument(createDocumentHandle(collectionName, String.valueOf(documentId)));
11781166
}
11791167

@@ -1187,7 +1175,7 @@ public long checkDocument(final String collectionName, final long documentId) th
11871175
* @return the document revision number
11881176
* @throws ArangoException
11891177
*/
1190-
public long checkDocument(final String collectionName, final String documentKey) throws ArangoException {
1178+
public String checkDocument(final String collectionName, final String documentKey) throws ArangoException {
11911179
return checkDocument(createDocumentHandle(collectionName, documentKey));
11921180
}
11931181

@@ -1199,7 +1187,7 @@ public long checkDocument(final String collectionName, final String documentKey)
11991187
* @return the document revision number
12001188
* @throws ArangoException
12011189
*/
1202-
public long checkDocument(final String documentHandle) throws ArangoException {
1190+
public String checkDocument(final String documentHandle) throws ArangoException {
12031191
return documentDriver.checkDocument(getDefaultDatabase(), documentHandle);
12041192
}
12051193

@@ -1278,8 +1266,8 @@ public <T> DocumentEntity<T> getDocument(final String documentHandle, final Clas
12781266
public <T> DocumentEntity<T> getDocument(
12791267
final String documentHandle,
12801268
final Class<T> clazz,
1281-
final Long ifNoneMatchRevision,
1282-
final Long ifMatchRevision) throws ArangoException {
1269+
final String ifNoneMatchRevision,
1270+
final String ifMatchRevision) throws ArangoException {
12831271
return documentDriver.getDocument(getDefaultDatabase(), documentHandle, clazz, ifNoneMatchRevision,
12841272
ifMatchRevision);
12851273
}
@@ -1339,7 +1327,7 @@ public DocumentEntity<?> deleteDocument(final String documentHandle) throws Aran
13391327
* @return a DocumentEntity object
13401328
* @throws ArangoException
13411329
*/
1342-
public DocumentEntity<?> deleteDocument(final String collectionName, final long documentId, final Long rev)
1330+
public DocumentEntity<?> deleteDocument(final String collectionName, final long documentId, final String rev)
13431331
throws ArangoException {
13441332
return deleteDocument(createDocumentHandle(collectionName, String.valueOf(documentId)), rev);
13451333
}
@@ -1358,27 +1346,11 @@ public DocumentEntity<?> deleteDocument(final String collectionName, final long
13581346
* @return a DocumentEntity object
13591347
* @throws ArangoException
13601348
*/
1361-
public DocumentEntity<?> deleteDocument(final String collectionName, final String documentKey, final Long rev)
1349+
public DocumentEntity<?> deleteDocument(final String collectionName, final String documentKey, final String rev)
13621350
throws ArangoException {
13631351
return deleteDocument(createDocumentHandle(collectionName, documentKey), rev);
13641352
}
13651353

1366-
/**
1367-
* Deletes a document from the database. This method offers a parameter rev
1368-
* (revision). If the revision of the document on the server does not match
1369-
* the given revision an error is thrown.
1370-
*
1371-
* @param documentHandle
1372-
* The document handle.
1373-
* @param rev
1374-
* The desired revision
1375-
* @return a DocumentEntity object
1376-
* @throws ArangoException
1377-
*/
1378-
public DocumentEntity<?> deleteDocument(final String documentHandle, final Long rev) throws ArangoException {
1379-
return documentDriver.deleteDocument(getDefaultDatabase(), documentHandle, rev);
1380-
}
1381-
13821354
/**
13831355
* This method validates a given AQL query string and returns a CursorEntity
13841356
*
@@ -3095,8 +3067,8 @@ public <T> VertexEntity<T> graphGetVertex(
30953067
final String collectionName,
30963068
final String key,
30973069
final Class<T> clazz,
3098-
final Long ifNoneMatchRevision,
3099-
final Long ifMatchRevision) throws ArangoException {
3070+
final String ifNoneMatchRevision,
3071+
final String ifMatchRevision) throws ArangoException {
31003072
return graphDriver.getVertex(getDefaultDatabase(), graphName, collectionName, key, clazz, ifMatchRevision,
31013073
ifNoneMatchRevision);
31023074
}
@@ -3168,8 +3140,8 @@ public DeletedEntity graphDeleteVertex(
31683140
final String collectionName,
31693141
final String key,
31703142
final Boolean waitForSync,
3171-
final Long ifMatchRevision,
3172-
final Long ifNoneMatchRevision) throws ArangoException {
3143+
final String ifMatchRevision,
3144+
final String ifNoneMatchRevision) throws ArangoException {
31733145
return graphDriver.deleteVertex(getDefaultDatabase(), graphName, collectionName, key, waitForSync,
31743146
ifMatchRevision, ifNoneMatchRevision);
31753147
}
@@ -3227,8 +3199,8 @@ public <T> VertexEntity<T> graphReplaceVertex(
32273199
final String key,
32283200
final T vertex,
32293201
final Boolean waitForSync,
3230-
final Long ifMatchRevision,
3231-
final Long ifNoneMatchRevision) throws ArangoException {
3202+
final String ifMatchRevision,
3203+
final String ifNoneMatchRevision) throws ArangoException {
32323204
return graphDriver.replaceVertex(getDefaultDatabase(), graphName, collectionName, key, vertex, waitForSync,
32333205
ifMatchRevision, ifNoneMatchRevision);
32343206
}
@@ -3294,8 +3266,8 @@ public <T> VertexEntity<T> graphUpdateVertex(
32943266
final T vertex,
32953267
final Boolean keepNull,
32963268
final Boolean waitForSync,
3297-
final Long ifMatchRevision,
3298-
final Long ifNoneMatchRevision) throws ArangoException {
3269+
final String ifMatchRevision,
3270+
final String ifNoneMatchRevision) throws ArangoException {
32993271
return graphDriver.updateVertex(getDefaultDatabase(), graphName, collectionName, key, vertex, keepNull,
33003272
waitForSync, ifMatchRevision, ifNoneMatchRevision);
33013273
}
@@ -3414,8 +3386,8 @@ public <T> EdgeEntity<T> graphGetEdge(
34143386
final String edgeCollectionName,
34153387
final String key,
34163388
final Class<T> clazz,
3417-
final Long ifMatchRevision,
3418-
final Long ifNoneMatchRevision) throws ArangoException {
3389+
final String ifMatchRevision,
3390+
final String ifNoneMatchRevision) throws ArangoException {
34193391
return graphDriver.getEdge(getDefaultDatabase(), graphName, edgeCollectionName, key, clazz, ifMatchRevision,
34203392
ifNoneMatchRevision);
34213393
}
@@ -3507,8 +3479,8 @@ public DeletedEntity graphDeleteEdge(
35073479
final String edgeCollectionName,
35083480
final String key,
35093481
final Boolean waitForSync,
3510-
final Long ifMatchRevision,
3511-
final Long ifNoneMatchRevision) throws ArangoException {
3482+
final String ifMatchRevision,
3483+
final String ifNoneMatchRevision) throws ArangoException {
35123484
return graphDriver.deleteEdge(getDefaultDatabase(), graphName, edgeCollectionName, key, waitForSync,
35133485
ifMatchRevision, ifNoneMatchRevision);
35143486
}
@@ -3583,8 +3555,8 @@ public <T> EdgeEntity<T> graphReplaceEdge(
35833555
final String toHandle,
35843556
final T value,
35853557
final Boolean waitForSync,
3586-
final Long ifMatchRevision,
3587-
final Long ifNoneMatchRevision) throws ArangoException {
3558+
final String ifMatchRevision,
3559+
final String ifNoneMatchRevision) throws ArangoException {
35883560
return graphDriver.replaceEdge(getDefaultDatabase(), graphName, edgeCollectionName, key, fromHandle, toHandle,
35893561
value, waitForSync, ifMatchRevision, ifNoneMatchRevision);
35903562
}
@@ -3664,8 +3636,8 @@ public <T> EdgeEntity<T> graphUpdateEdge(
36643636
final T value,
36653637
final Boolean waitForSync,
36663638
final Boolean keepNull,
3667-
final Long ifMatchRevision,
3668-
final Long ifNoneMatchRevision) throws ArangoException {
3639+
final String ifMatchRevision,
3640+
final String ifNoneMatchRevision) throws ArangoException {
36693641
return graphDriver.updateEdge(getDefaultDatabase(), graphName, edgeCollectionName, key, fromHandle, toHandle,
36703642
value, waitForSync, keepNull, ifMatchRevision, ifNoneMatchRevision);
36713643
}
@@ -4206,8 +4178,8 @@ public DocumentEntity<String> createDocumentRaw(
42064178
*/
42074179
public String getDocumentRaw(
42084180
final String documentHandle,
4209-
final Long ifNoneMatchRevision,
4210-
final Long ifMatchRevision) throws ArangoException {
4181+
final String ifNoneMatchRevision,
4182+
final String ifMatchRevision) throws ArangoException {
42114183
return documentDriver.getDocumentRaw(getDefaultDatabase(), documentHandle, ifNoneMatchRevision,
42124184
ifMatchRevision);
42134185
}
@@ -4256,7 +4228,7 @@ public CursorRawResult executeAqlQueryRaw(
42564228
public DocumentEntity<String> replaceDocumentRaw(
42574229
final String documentHandle,
42584230
final String rawJsonString,
4259-
final Long rev,
4231+
final String rev,
42604232
final Boolean waitForSync) throws ArangoException {
42614233
return documentDriver.replaceDocumentRaw(getDefaultDatabase(), documentHandle, rawJsonString, rev, waitForSync);
42624234
}
@@ -4283,7 +4255,7 @@ public DocumentEntity<String> replaceDocumentRaw(
42834255
public DocumentEntity<String> updateDocumentRaw(
42844256
final String documentHandle,
42854257
final String rawJsonString,
4286-
final Long rev,
4258+
final String rev,
42874259
final Boolean waitForSync,
42884260
final Boolean keepNull) throws ArangoException {
42894261
return documentDriver.updateDocumentRaw(getDefaultDatabase(), documentHandle, rawJsonString, rev, waitForSync,

0 commit comments

Comments
 (0)