Skip to content
This repository was archived by the owner on May 16, 2020. It is now read-only.

Commit 7132d85

Browse files
committed
throw exception in case of HTTP error;
DefaultNamingStrategy for JSON
1 parent a787fef commit 7132d85

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using BorderEast.ArangoDB.Client.Database;
66
using System.Net.Http.Headers;
77
using System.Threading.Tasks;
8+
using BorderEast.ArangoDB.Client.Exception;
89

910
namespace BorderEast.ArangoDB.Client.Connection
1011
{
@@ -59,6 +60,10 @@ public async Task<Result> GetAsync(Payload payload) {
5960
return null;
6061
}
6162

63+
if (!responseTask.IsSuccessStatusCode
64+
&& responseTask.StatusCode != System.Net.HttpStatusCode.BadRequest) //there is detailed info in Content for bad request
65+
throw new QueryExecutionException(responseTask.StatusCode.ToString(), (int)responseTask.StatusCode);
66+
6267
Result result = new Result()
6368
{
6469
StatusCode = responseTask.StatusCode,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace BorderEast.ArangoDB.Client.Database
99
public class ArangoDBContractResolver : DefaultContractResolver {
1010
public ArangoDBContractResolver() : base()
1111
{
12-
NamingStrategy = new CamelCaseNamingStrategy
12+
NamingStrategy = new DefaultNamingStrategy
1313
{
1414
ProcessDictionaryKeys = true,
1515
OverrideSpecifiedNames = false,

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public ClientSettings() {
2525

2626
public ClientSettings(string serverAddress, int serverPort, ProtocolType protocolType,
2727
string systemPassword, string databaseName, string databaseUsername, string databasePassword,
28-
bool autoCreate, bool isDebug = false)
28+
bool autoCreate, bool isDebug = false) : this()
2929
{
3030
ServerAddress = serverAddress;
3131
ServerPort = serverPort;
@@ -35,19 +35,6 @@ public ClientSettings(string serverAddress, int serverPort, ProtocolType protoco
3535
DatabaseCredential = new NetworkCredential(databaseUsername, databasePassword);
3636
AutoCreate = autoCreate;
3737

38-
39-
JsonSettings = new JsonSerializerSettings
40-
{
41-
ContractResolver = new ArangoDBContractResolver(),
42-
DateTimeZoneHandling = DateTimeZoneHandling.Utc,
43-
NullValueHandling = NullValueHandling.Include,
44-
DefaultValueHandling = DefaultValueHandling.Include,
45-
StringEscapeHandling = StringEscapeHandling.Default,
46-
Formatting = Formatting.Indented,
47-
ReferenceLoopHandling = ReferenceLoopHandling.Ignore
48-
};
49-
50-
5138
IsDebug = isDebug;
5239
}
5340

0 commit comments

Comments
 (0)