Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
commitStreamTransaction
  • Loading branch information
michele committed Aug 7, 2019
commit dfa10a0dfa356bd8f9280ebd50af88e832a4bda5
10 changes: 10 additions & 0 deletions src/main/java/com/arangodb/ArangoDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,16 @@ GraphEntity createGraph(String name, Collection<EdgeDefinition> edgeDefinitions,
*/
StreamTransactionEntity getStreamTransaction(String id) throws ArangoDBException;

/**
* Commits a Stream Transaction.
*
* @return information about the transaction
* @throws ArangoDBException
* @see <a href="https://docs.arangodb.com/current/HTTP/transaction-stream-transaction.html#commit-or-abort-a-transaction">
* API Documentation</a>
*/
StreamTransactionEntity commitStreamTransaction(String id) throws ArangoDBException;

/**
* Retrieves information about the current database
*
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/arangodb/internal/ArangoDatabaseImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,11 @@ public StreamTransactionEntity getStreamTransaction(String id) throws ArangoDBEx
return executor.execute(getStreamTransactionRequest(id), streamTransactionResponseDeserializer());
}

@Override
public StreamTransactionEntity commitStreamTransaction(String id) throws ArangoDBException {
return executor.execute(commitStreamTransactionRequest(id), streamTransactionResponseDeserializer());
}

@Override
public DatabaseEntity getInfo() throws ArangoDBException {
return executor.execute(getInfoRequest(), getInfoResponseDeserializer());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,10 @@ protected Request getStreamTransactionRequest(String id) {
return request(name, RequestType.GET, PATH_API_TRANSACTION, id);
}

protected Request commitStreamTransactionRequest(String id) {
return request(name, RequestType.PUT, PATH_API_TRANSACTION, id);
}

protected ResponseDeserializer<StreamTransactionEntity> streamTransactionResponseDeserializer() {
return new ResponseDeserializer<StreamTransactionEntity>() {
@Override
Expand Down
49 changes: 49 additions & 0 deletions src/test/java/com/arangodb/ArangoDatabaseTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1454,6 +1454,16 @@ public void abortStreamTransactionWithInvalidTransactionIdShouldThrow() {
db.abortStreamTransaction("invalidTransactionId");
}

@Test(expected = ArangoDBException.class)
public void abortCommittedStreamTransactionShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
db.commitStreamTransaction(createdTx.getId());
db.abortStreamTransaction(createdTx.getId());
}

@Test
public void getStreamTransaction() {
if (!requireVersion(3, 5)) {
Expand All @@ -1462,6 +1472,7 @@ public void getStreamTransaction() {
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
StreamTransactionEntity gotTx = db.getStreamTransaction(createdTx.getId());
assertThat(gotTx.getId(), is(notNullValue()));
assertThat(gotTx.getId(), is(createdTx.getId()));
assertThat(gotTx.getStatus(), is(StreamTransactionEntity.StreamTransactionStatus.running));
db.abortStreamTransaction(createdTx.getId());
}
Expand All @@ -1482,6 +1493,44 @@ public void getStreamTransactionWithInvalidTransactionIdShouldThrow() {
db.getStreamTransaction("invalidTransactionId");
}

@Test
public void commitStreamTransaction() {
if (!requireVersion(3, 5)) {
return;
}
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
StreamTransactionEntity committedTx = db.commitStreamTransaction(createdTx.getId());
assertThat(committedTx.getId(), is(notNullValue()));
assertThat(committedTx.getId(), is(createdTx.getId()));
assertThat(committedTx.getStatus(), is(StreamTransactionEntity.StreamTransactionStatus.committed));
}

@Test(expected = ArangoDBException.class)
public void commitStreamTransactionWhenTransactionIdDoesNotExistsShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
db.commitStreamTransaction("000000");
}

@Test(expected = ArangoDBException.class)
public void commitStreamTransactionWithInvalidTransactionIdShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
db.commitStreamTransaction("invalidTransactionId");
}

@Test(expected = ArangoDBException.class)
public void commitAbortedStreamTransactionShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
db.abortStreamTransaction(createdTx.getId());
db.commitStreamTransaction(createdTx.getId());
}

@Test
public void getInfo() {
final DatabaseEntity info = db.getInfo();
Expand Down