Transaction: add attribute allowImplicit

Author: Mark

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

@@ -27,9 +27,19 @@ public class TransactionEntity extends BaseEntity {
 
 	public static class ReadWriteCollections {
 
-		List<String> read = new ArrayList<String>();
+		private List<String> read = new ArrayList<String>();
 
-		List<String> write = new ArrayList<String>();
+		private List<String> write = new ArrayList<String>();
+
+		private boolean allowImplicit = true;
+
+		public boolean isAllowImplicit() {
+			return allowImplicit;
+		}
+
+		public void setAllowImplicit(boolean allowImplicit) {
+			this.allowImplicit = allowImplicit;
+		}
 	}
 
 	ReadWriteCollections collections = new ReadWriteCollections();
@@ -62,6 +72,15 @@ public void addWriteCollection(String collection) {
 		this.collections.write.add(collection);
 	}
 
+	/**
+	 * @param allowImplicit
+	 *            allows(true)/ disallows(false) read access to other
+	 *            collections than specified. Default is true.
+	 */
+	public void setAllowImplicit(final boolean allowImplicit) {
+		collections.setAllowImplicit(allowImplicit);
+	}
+
 	public String getAction() {
 		return action;
 	}

src/test/java/com/arangodb/ArangoDriverTransactionTest.java

@@ -20,9 +20,11 @@
 import static org.junit.Assert.assertThat;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.arangodb.entity.BaseEntity;
 import com.arangodb.entity.TransactionEntity;
 import com.arangodb.entity.TransactionResultEntity;
 
@@ -33,6 +35,7 @@
 public class ArangoDriverTransactionTest extends BaseTest {
 
 	private static final String SOME_COLLECTION = "someCollection";
+	private static final String SOME_OTHER_COLLECTION = "someOtherCollection";
 
 	public class ParamObject {
 		private String a = "a";
@@ -77,6 +80,16 @@ public void setup() throws ArangoException {
 			driver.createCollection(SOME_COLLECTION);
 		} catch (final ArangoException e) {
 
+		}
+		try {
+			driver.deleteCollection(SOME_OTHER_COLLECTION);
+		} catch (final ArangoException e) {
+
+		}
+		try {
+			driver.createCollection(SOME_OTHER_COLLECTION);
+		} catch (final ArangoException e) {
+
 		}
 	}
 
@@ -86,6 +99,11 @@ public void teardown() throws ArangoException {
 			driver.deleteCollection(SOME_COLLECTION);
 		} catch (final ArangoException e) {
 
+		}
+		try {
+			driver.deleteCollection(SOME_OTHER_COLLECTION);
+		} catch (final ArangoException e) {
+
 		}
 	}
 
@@ -137,4 +155,30 @@ public void test_Transaction() throws ArangoException {
 
 	}
 
+	@Test
+	public void allowImplicit() throws ArangoException {
+		TransactionEntity transaction = driver
+				.createTransaction("function (params) {" + "var db = require('internal').db;"
+						+ "return {'a':db.someCollection.all().toArray()[0], 'b':db.someOtherCollection.all().toArray()[0]};"
+						+ "}");
+		transaction.addReadCollection(SOME_COLLECTION);
+		{
+			TransactionResultEntity result = driver.executeTransaction(transaction);
+			assertThat(result.getStatusCode(), is(200));
+			assertThat(result.getCode(), is(200));
+			assertThat(result.isError(), is(false));
+		}
+		{
+			transaction.setAllowImplicit(false);
+			try {
+				driver.executeTransaction(transaction);
+				Assert.fail();
+			} catch (ArangoException e) {
+				final BaseEntity result = e.getEntity();
+				assertThat(result.getStatusCode(), is(400));
+				assertThat(result.getCode(), is(400));
+				assertThat(result.isError(), is(true));
+			}
+		}
+	}
 }