#80 ignore additional collections as they may be read only

Author: aburmeis

src/main/java/com/arangodb/springframework/transaction/ArangoTransactionObject.java

@@ -7,7 +7,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.lang.Nullable;
-import org.springframework.transaction.IllegalTransactionStateException;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.interceptor.TransactionAttribute;
 import org.springframework.transaction.support.SmartTransactionObject;
@@ -104,15 +103,16 @@ public String toString() {
 
     private void addCollections(Collection<String> collections) {
         if (resource.getStreamTransactionId() != null) {
-            if (!resource.getCollectionNames().containsAll(collections)) {
+            if (!resource.getCollectionNames().containsAll(collections) && logger.isDebugEnabled()) {
                 Set<String> additional = new HashSet<>(collections);
                 additional.removeAll(resource.getCollectionNames());
-                throw new IllegalTransactionStateException("Stream transaction already started on collections " + resource.getCollectionNames() + ", no additional collections allowed: " + additional);
+                logger.debug("Stream transaction already started on collections " + resource.getCollectionNames() + ", assuming additional collections are read only: " + additional);
             }
+        } else {
+            Set<String> all = new HashSet<>(resource.getCollectionNames());
+            all.addAll(collections);
+            resource.setCollectionNames(all);
         }
-        HashSet<String> all = new HashSet<>(resource.getCollectionNames());
-        all.addAll(collections);
-        resource.setCollectionNames(all);
     }
 
     private boolean isStatus(StreamTransactionStatus status) {

src/test/java/com/arangodb/springframework/transaction/ArangoTransactionManagerTest.java

@@ -32,7 +32,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -163,14 +165,16 @@ public void getTransactionWithMultipleBridgeCallsWorksForKnownCollections() {
         assertThat(collections.getWrite(), hasItems("baz", "foo"));
     }
 
-    @Test(expected = IllegalTransactionStateException.class)
-    public void getTransactionWithMultipleBridgeCallsFailsForAdditionalCollection() {
+    @Test
+    public void getTransactionWithMultipleBridgeCallsIgnoresAdditionalCollections() {
         DefaultTransactionAttribute definition = new DefaultTransactionAttribute();
-        definition.setLabels(Collections.singleton("baz"));
+        definition.setLabels(Collections.singleton("bar"));
         definition.setTimeout(20);
-        underTest.getTransaction(definition);
+        TransactionStatus state = underTest.getTransaction(definition);
         beginTransaction("123", "foo");
-        beginPassed.getValue().apply(Collections.singletonList("bar"));
+        beginPassed.getValue().apply(Collections.singletonList("baz"));
+        assertThat(getTransactionObject(state).getResource().getCollectionNames(), hasItems("foo", "bar"));
+        assertThat(getTransactionObject(state).getResource().getCollectionNames(), not(hasItem("baz")));
     }
 
     @Test(expected = InvalidIsolationLevelException.class)