Included exception handling when getting raw JSON

Author: miguel-porto

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

@@ -75,7 +75,6 @@
 import com.arangodb.http.BatchHttpManager;
 import com.arangodb.http.BatchPart;
 import com.arangodb.http.HttpManager;
-import com.arangodb.http.HttpResponseEntity;
 import com.arangodb.http.InvocationHandlerImpl;
 import com.arangodb.impl.ImplFactory;
 import com.arangodb.impl.InternalBatchDriverImpl;
@@ -2478,7 +2477,7 @@ public <T> CursorResult<T> executeAqlQuery(
 	 * @return
 	 * @throws ArangoException
 	 */
-	public HttpResponseEntity executeAqlQueryJSON(
+	public String executeAqlQueryJSON(
 			String query,
 			Map<String, Object> bindVars,
 			AqlQueryOptions aqlQueryOptions

src/main/java/com/arangodb/BaseArangoDriver.java

@@ -295,6 +295,87 @@ protected <T extends BaseEntity> T createEntity(
 			EntityDeserializers.removeParameterized();
 		}
 	}
+	
+	/**
+	 * Gets the raw JSON string with results, from the Http response
+	 * @param res the response of the database
+	 * @return
+	 * @throws ArangoException
+	 */
+	protected String getJSONResponseText(HttpResponseEntity res) throws ArangoException {
+		if (res == null) {
+			return null;
+		}
+		int statusCode = res.getStatusCode();
+		if (statusCode >= 400) {
+			DefaultEntity defaultEntity = new DefaultEntity();
+			if (res.getText() != null && !res.getText().equalsIgnoreCase("") && statusCode != 500) {
+				JsonParser jsonParser = new JsonParser();
+				JsonElement jsonElement = jsonParser.parse(res.getText());
+				JsonObject jsonObject = jsonElement.getAsJsonObject();
+				JsonElement errorMessage = jsonObject.get("errorMessage");
+				defaultEntity.setErrorMessage(errorMessage.getAsString());
+				JsonElement errorNumber = jsonObject.get("errorNum");
+				defaultEntity.setErrorNumber(errorNumber.getAsInt());
+			} else {
+				String statusPhrase = "";
+				switch (statusCode) {
+				case 400:
+					statusPhrase = "Bad Request";
+					break;
+				case 401:
+					statusPhrase = "Unauthorized";
+					break;
+				case 403:
+					statusPhrase = "Forbidden";
+					break;
+				case 404:
+					statusPhrase = "Not Found";
+					break;
+				case 405:
+					statusPhrase = "Method Not Allowed";
+					break;
+				case 406:
+					statusPhrase = "Not Acceptable";
+					break;
+				case 407:
+					statusPhrase = "Proxy Authentication Required";
+					break;
+				case 408:
+					statusPhrase = "Request Time-out";
+					break;
+				case 409:
+					statusPhrase = "Conflict";
+					break;
+				case 500:
+					statusPhrase = "Internal Server Error";
+					break;
+				default:
+					statusPhrase = "unknown error";
+					break;
+				}
+
+				defaultEntity.setErrorMessage(statusPhrase);
+				if (statusCode == 500) {
+					defaultEntity.setErrorMessage(statusPhrase + ": " + res.getText());
+				}
+			}
+
+			defaultEntity.setCode(statusCode);
+			defaultEntity.setStatusCode(statusCode);
+			defaultEntity.setError(true);
+			ArangoException arangoException = new ArangoException(defaultEntity);
+			arangoException.setCode(statusCode);
+			throw arangoException;
+		}
+		
+		// no errors, return results as a JSON string
+		JsonParser jsonParser = new JsonParser();
+		JsonElement jsonElement = jsonParser.parse(res.getText());
+		JsonObject jsonObject = jsonElement.getAsJsonObject();
+		JsonElement result = jsonObject.get("result");
+		return result.toString();
+	}
 
 	protected <T> T createEntity(String str, Class<T> clazz, Class<?>... pclazz) throws ArangoException {
 		try {

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

@@ -8,7 +8,6 @@
 import com.arangodb.entity.QueriesResultEntity;
 import com.arangodb.entity.QueryTrackingPropertiesEntity;
 import com.arangodb.entity.ShortestPathEntity;
-import com.arangodb.http.HttpResponseEntity;
 import com.arangodb.impl.BaseDriverInterface;
 import com.arangodb.util.AqlQueryOptions;
 import com.arangodb.util.ShortestPathOptions;
@@ -42,7 +41,7 @@ <T> CursorResult<T> executeAqlQuery(
 		Class<T> clazz) throws ArangoException;
 
 	// return the raw JSON response from server
-	HttpResponseEntity executeAqlQueryJSON(
+	String executeAqlQueryJSON(
 			String database,
 			String query,
 			Map<String, Object> bindVars,

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

@@ -55,13 +55,13 @@ public CursorEntity<?> validateQuery(String database, String query) throws Arang
 	}
 
 	@Override
-	public HttpResponseEntity executeAqlQueryJSON(
+	public String executeAqlQueryJSON(
 			String database,
 			String query,
 			Map<String, Object> bindVars,
 			AqlQueryOptions aqlQueryOptions) throws ArangoException {
 
-			return getCursor(database, query, bindVars, aqlQueryOptions);
+			return getJSONResponseText(getCursor(database, query, bindVars, aqlQueryOptions));
 		}
 
 	@SuppressWarnings("unchecked")