3838import com .arangodb .velocypack .VPackSlice ;
3939
4040/**
41- *
41+ *
4242 * @author Audrius Malele
4343 * @author Mark McCormick
4444 * @author Mark Vollmary
@@ -58,7 +58,6 @@ public AbstractArangoQuery(final ArangoQueryMethod method, final ArangoOperation
5858 final QueryTransactionBridge transactionBridge ) {
5959 Assert .notNull (method , "ArangoQueryMethod must not be null!" );
6060 Assert .notNull (operations , "ArangoOperations must not be null!" );
61- Assert .notNull (transactionBridge , "QueryTransactionBridge must not be null!" );
6261 this .method = method ;
6362 this .operations = operations ;
6463 mappingContext = (ArangoMappingContext ) operations .getConverter ().getMappingContext ();
@@ -81,7 +80,7 @@ public Object execute(final Object[] parameters) {
8180 }
8281
8382 final Pair <String , ? extends Collection <String >> queryAndCollection = createQuery (accessor , bindVars );
84- if (options .getStreamTransactionId () == null ) {
83+ if (options .getStreamTransactionId () == null && transactionBridge != null ) {
8584 options .streamTransactionId (transactionBridge .beginCurrentTransaction (queryAndCollection .getSecond ()));
8685 }
8786
@@ -109,7 +108,7 @@ public ArangoQueryMethod getQueryMethod() {
109108 * Implementations should create an AQL query with the given
110109 * {@link com.arangodb.springframework.repository.query.ArangoParameterAccessor} and set necessary binding
111110 * parameters and query options.
112- *
111+ *
113112 * @param accessor
114113 * provides access to the actual arguments
115114 * @param bindVars
@@ -126,7 +125,7 @@ public ArangoQueryMethod getQueryMethod() {
126125
127126 /**
128127 * Merges AqlQueryOptions derived from @QueryOptions with dynamically passed AqlQueryOptions which takes priority
129- *
128+ *
130129 * @param oldStatic
131130 * @param newDynamic
132131 * @return
0 commit comments