#80 refactor to own type instead of pair

Author: aburmeis

src/main/java/com/arangodb/springframework/repository/query/AbstractArangoQuery.java

@@ -29,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
-import org.springframework.data.util.Pair;
 import org.springframework.util.Assert;
 
 import com.arangodb.ArangoCursor;
@@ -79,16 +78,16 @@ public Object execute(final Object[] parameters) {
 			options.fullCount(true);
 		}
 
-		final Pair<String, ? extends Collection<String>> queryAndCollection = createQuery(accessor, bindVars);
+		final QueryWithCollections queryAndCollection = createQuery(accessor, bindVars);
 		if (options.getStreamTransactionId() == null && transactionBridge != null) {
-			options.streamTransactionId(transactionBridge.getCurrentTransaction(queryAndCollection.getSecond()));
+			options.streamTransactionId(transactionBridge.getCurrentTransaction(queryAndCollection.getCollections()));
 		}
 
 
 		final ResultProcessor processor = method.getResultProcessor().withDynamicProjection(accessor);
 		final Class<?> typeToRead = getTypeToRead(processor);
 
-		final ArangoCursor<?> result = operations.query(queryAndCollection.getFirst(), bindVars, options, typeToRead);
+		final ArangoCursor<?> result = operations.query(queryAndCollection.getQuery(), bindVars, options, typeToRead);
 		logWarningsIfNecessary(result);
 		return processor.processResult(convertResult(result, accessor));
 	}
@@ -115,7 +114,7 @@ public ArangoQueryMethod getQueryMethod() {
 	 *            the binding parameter map
 	 * @return a pair of the created AQL query and all collection names
 	 */
-	protected abstract Pair<String, ? extends Collection<String>> createQuery(
+	protected abstract QueryWithCollections createQuery(
 			ArangoParameterAccessor accessor,
 			Map<String, Object> bindVars);
 

src/main/java/com/arangodb/springframework/repository/query/DerivedArangoQuery.java

@@ -53,7 +53,7 @@ public DerivedArangoQuery(final ArangoQueryMethod method, final ArangoOperations
 	}
 
 	@Override
-	protected Pair<String, ? extends Collection<String>> createQuery(
+	protected QueryWithCollections createQuery(
             final ArangoParameterAccessor accessor,
             final Map<String, Object> bindVars) {
 

src/main/java/com/arangodb/springframework/repository/query/QueryWithCollections.java

@@ -0,0 +1,22 @@
+package com.arangodb.springframework.repository.query;
+
+import java.util.Collection;
+
+public class QueryWithCollections {
+
+    private final String query;
+    private final Collection<String> collections;
+
+    public QueryWithCollections(String query, Collection<String> collections) {
+        this.query = query;
+        this.collections = collections;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public Collection<String> getCollections() {
+        return collections;
+    }
+}

src/main/java/com/arangodb/springframework/repository/query/StringBasedArangoQuery.java

@@ -29,7 +29,6 @@
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.util.Pair;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParserContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -98,13 +97,13 @@ public StringBasedArangoQuery(final String query, final ArangoQueryMethod method
 	}
 
 	@Override
-	protected Pair<String, ? extends Collection<String>> createQuery(
+	protected QueryWithCollections createQuery(
             final ArangoParameterAccessor accessor,
             final Map<String, Object> bindVars) {
 
 		extractBindVars(accessor, bindVars);
 
-		return Pair.of(prepareQuery(accessor), allCollectionNames(bindVars));
+		return new QueryWithCollections(prepareQuery(accessor), allCollectionNames(bindVars));
 	}
 
 	private Collection<String> allCollectionNames(Map<String, Object> bindVars) {

src/main/java/com/arangodb/springframework/repository/query/derived/DerivedQueryCreator.java

@@ -27,6 +27,7 @@
 import com.arangodb.springframework.core.mapping.ArangoPersistentProperty;
 import com.arangodb.springframework.core.util.AqlUtils;
 import com.arangodb.springframework.repository.query.ArangoParameterAccessor;
+import com.arangodb.springframework.repository.query.QueryWithCollections;
 import com.arangodb.springframework.repository.query.derived.geo.Ring;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +43,6 @@
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 import org.springframework.data.repository.query.parser.Part;
 import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.data.util.Pair;
 import org.springframework.util.Assert;
 
 import java.util.*;
@@ -51,7 +51,7 @@
 /**
  * Creates a full AQL query from a PartTree and ArangoParameterAccessor
  */
-public class DerivedQueryCreator extends AbstractQueryCreator<Pair<String, ? extends Collection<String>>, Criteria> {
+public class DerivedQueryCreator extends AbstractQueryCreator<QueryWithCollections, Criteria> {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(DerivedQueryCreator.class);
 	private static final Set<Part.Type> UNSUPPORTED_IGNORE_CASE = new HashSet<>();
@@ -121,7 +121,7 @@ protected Criteria or(final Criteria base, final Criteria criteria) {
 	 * @return
 	 */
 	@Override
-	protected Pair<String, ? extends Collection<String>> complete(final Criteria criteria, final Sort sort) {
+	protected QueryWithCollections complete(final Criteria criteria, final Sort sort) {
 		if (tree.isDistinct() && !tree.isCountProjection()) {
 			LOGGER.debug("Use of 'Distinct' is meaningful only in count queries");
 		}
@@ -192,7 +192,7 @@ protected Criteria or(final Criteria base, final Criteria criteria) {
 				}
 			}
 		}
-		return Pair.of(query.toString(), withCollections);
+		return new QueryWithCollections(query.toString(), withCollections);
 	}
 
 	public double[] getUniquePoint() {