Skip to content

Commit 285d2cd

Browse files
committed
Added query function returning raw JSON response from server
1 parent 075dd0d commit 285d2cd

File tree

4 files changed

+45
-1
lines changed

4 files changed

+45
-1
lines changed

.classpath

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
<attribute name="maven.pomderived" value="true"/>
1313
</attributes>
1414
</classpathentry>
15-
<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
15+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
1620
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1721
<attributes>
1822
<attribute name="maven.pomderived" value="true"/>

src/main/java/com/arangodb/ArangoDriver.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import com.arangodb.http.BatchHttpManager;
7676
import com.arangodb.http.BatchPart;
7777
import com.arangodb.http.HttpManager;
78+
import com.arangodb.http.HttpResponseEntity;
7879
import com.arangodb.http.InvocationHandlerImpl;
7980
import com.arangodb.impl.ImplFactory;
8081
import com.arangodb.impl.InternalBatchDriverImpl;
@@ -2469,6 +2470,27 @@ public <T> CursorResult<T> executeAqlQuery(
24692470
return cursorDriver.executeAqlQuery(getDefaultDatabase(), query, bindVars, aqlQueryOptions, clazz);
24702471
}
24712472

2473+
/**
2474+
* Executes an AQL query and returns the raw JSON response
2475+
* @param query an AQL query as string
2476+
* @param bindVars a map containing all bind variables,
2477+
* @param aqlQueryOptions AQL query options
2478+
* @return
2479+
* @throws ArangoException
2480+
*/
2481+
public HttpResponseEntity executeAqlQueryJSON(
2482+
String query,
2483+
Map<String, Object> bindVars,
2484+
AqlQueryOptions aqlQueryOptions
2485+
) throws ArangoException {
2486+
2487+
if (aqlQueryOptions == null) {
2488+
aqlQueryOptions = getDefaultAqlQueryOptions();
2489+
}
2490+
2491+
return cursorDriver.executeAqlQueryJSON(getDefaultDatabase(), query, bindVars, aqlQueryOptions);
2492+
}
2493+
24722494
/**
24732495
* This method executes an AQL query and returns a DocumentCursorResult
24742496
*

src/main/java/com/arangodb/InternalCursorDriver.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.arangodb.entity.QueriesResultEntity;
99
import com.arangodb.entity.QueryTrackingPropertiesEntity;
1010
import com.arangodb.entity.ShortestPathEntity;
11+
import com.arangodb.http.HttpResponseEntity;
1112
import com.arangodb.impl.BaseDriverInterface;
1213
import com.arangodb.util.AqlQueryOptions;
1314
import com.arangodb.util.ShortestPathOptions;
@@ -40,6 +41,13 @@ <T> CursorResult<T> executeAqlQuery(
4041
AqlQueryOptions aqlQueryOptions,
4142
Class<T> clazz) throws ArangoException;
4243

44+
// return the raw JSON response from server
45+
HttpResponseEntity executeAqlQueryJSON(
46+
String database,
47+
String query,
48+
Map<String, Object> bindVars,
49+
AqlQueryOptions aqlQueryOptions) throws ArangoException;
50+
4351
// request a cursor with DocumentEntity
4452
<T, S extends DocumentEntity<T>> DocumentCursorResult<T, S> executeBaseCursorQuery(
4553
String database,

src/main/java/com/arangodb/impl/InternalCursorDriverImpl.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ public CursorEntity<?> validateQuery(String database, String query) throws Arang
5454
return createEntity(res, CursorEntity.class);
5555
}
5656

57+
@Override
58+
public HttpResponseEntity executeAqlQueryJSON(
59+
String database,
60+
String query,
61+
Map<String, Object> bindVars,
62+
AqlQueryOptions aqlQueryOptions) throws ArangoException {
63+
64+
return getCursor(database, query, bindVars, aqlQueryOptions);
65+
}
66+
5767
@SuppressWarnings("unchecked")
5868
@Override
5969
public <T> CursorEntity<T> executeCursorEntityQuery(

0 commit comments

Comments
 (0)