fixed merge conflict

Author: agrothe

README.md

@@ -9,7 +9,7 @@ Contributions welcome.
 For those who like to write pure AQL queries for ultimate flexibility. This will mainly focus on AQL string queries at first with convience methods for Insert, Update, Delete etc.
 
 ### Managed Foreign Keys
-This client supports a managed foreign key feature. This allowa an entity to include a `List<T>` of another entity by setting a data annotation. This will work with two tables in the database but allow users to work the entity as if it was a single document. While this is duplicating some relational database features, this is the most common feature lacking in client libraries.
+This client supports a managed foreign key feature. This allows an entity to include a `List<T>` of another entity by setting a data annotation. This will work with two tables in the database but allow users to work the entity as if it was a single document. While this is duplicating some relational database features, this is the most common feature lacking in client libraries.
 
 ArangoDB has an excellent join feature via AQL, and this is the next logical step on the client side. [Please see the documentation for examples](https://github.com/bordereast/arangodb-net-core/wiki)
 
@@ -27,10 +27,18 @@ GetByKeyAsync | Done | Auto
 UpdateAsync | Done | Auto
 DeleteAsync | Done | N/A
 InsertAsync | Done | Auto
+InsertManyAsync | Done | Auto
 GetAllAsync | Done | Auto
 GetAllKeysAsync | Done | N/A
 GetByExampleAsync | Done | Auto
 CreateCollection | Done | N/A
 
 ### Credits
-Based loosely on ideas taken from [ra0o0f](https://github.com/ra0o0f/arangoclient.net) and [yojimbo87](https://github.com/yojimbo87/ArangoDB-NET), this is a .NETCoreApp1.1 library.
+Based loosely on ideas taken from [ra0o0f](https://github.com/ra0o0f/arangoclient.net) and [yojimbo87](https://github.com/yojimbo87/ArangoDB-NET), this is a .NETCoreApp2 library.
+
+#### Contributions by
+
+[Irriss](https://github.com/irriss)
+
+[Arkos-LoG](https://github.com/Arkos-LoG)
+

src/BorderEast.ArangoDB.Client/BorderEast.ArangoDB.Client/Connection/HttpConnection.cs

@@ -5,6 +5,7 @@
 using BorderEast.ArangoDB.Client.Database;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using BorderEast.ArangoDB.Client.Exception;
 
 namespace BorderEast.ArangoDB.Client.Connection
 {
@@ -59,6 +60,10 @@ public async Task<Result> GetAsync(Payload payload) {
  return null;
  }
 
+ if (!responseTask.IsSuccessStatusCode 
+ && responseTask.StatusCode != System.Net.HttpStatusCode.BadRequest) //there is detailed info in Content for bad request
+ throw new QueryExecutionException(responseTask.StatusCode.ToString(), (int)responseTask.StatusCode);
+
  Result result = new Result()
  {
  StatusCode = responseTask.StatusCode,

src/BorderEast.ArangoDB.Client/BorderEast.ArangoDB.Client/Database/ArangoQuery.cs

@@ -84,7 +84,7 @@ public async Task<List<T>> ToListAsync() {
  var json = JsonConvert.DeserializeObject<AQLResult<T>>(result.Content);
 
  if (json.Error)
- throw new QueryExecutionException(json.ErrorMessage);
+ throw new QueryExecutionException(json.ErrorMessage, json.ErrorNumber);
 
  return json.Result;
  }

src/BorderEast.ArangoDB.Client/BorderEast.ArangoDB.Client/Database/ClientSettings.cs

@@ -25,7 +25,7 @@ public ClientSettings() {
 
  public ClientSettings(string serverAddress, int serverPort, ProtocolType protocolType, 
  string systemPassword, string databaseName, string databaseUsername, string databasePassword, 
- bool autoCreate, bool isDebug = false, ArangoDBContractResolver arangoDBContractResolver = null) 
+ bool autoCreate, bool isDebug = false, ArangoDBContractResolver arangoDBContractResolver = null) : this()
  {
  ServerAddress = serverAddress;
  ServerPort = serverPort;
@@ -35,14 +35,10 @@ public ClientSettings(string serverAddress, int serverPort, ProtocolType protoco
  DatabaseCredential = new NetworkCredential(databaseUsername, databasePassword);
  AutoCreate = autoCreate;
 
- if (arangoDBContractResolver == null)
- {
- arangoDBContractResolver = new ArangoDBContractResolver();
- } 
 
  JsonSettings = new JsonSerializerSettings
  {
- ContractResolver = arangoDBContractResolver,
+ ContractResolver = new ArangoDBContractResolver(),
  DateTimeZoneHandling = DateTimeZoneHandling.Utc,
  NullValueHandling = NullValueHandling.Include,
  DefaultValueHandling = DefaultValueHandling.Include,
@@ -51,7 +47,6 @@ public ClientSettings(string serverAddress, int serverPort, ProtocolType protoco
  ReferenceLoopHandling = ReferenceLoopHandling.Ignore
  };
 
- 
 
  IsDebug = isDebug;
  }

src/BorderEast.ArangoDB.Client/BorderEast.ArangoDB.Client/Exception/QueryExecutionException.cs

@@ -6,9 +6,10 @@ namespace BorderEast.ArangoDB.Client.Exception
 {
  public class QueryExecutionException : System.Exception
  {
- public QueryExecutionException(string message) : base(message)
+ public int ErrorNumber { get; private set; }
+ public QueryExecutionException(string message, int errorNum) : base(message)
  {
-
+ ErrorNumber = errorNum;
  }
  }
 }