Skip to content

Commit dd1fa14

Browse files
committed
Passing optional JsonSerializerSettings.
1 parent ee15bdb commit dd1fa14

1 file changed

Lines changed: 28 additions & 21 deletions

File tree

‎Json-Rpc/JsonRpcProcessor.cs‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,41 @@ namespace AustinHarris.JsonRpc
1313
{
1414
public static class JsonRpcProcessor
1515
{
16-
public static void Process(JsonRpcStateAsync async, object context = null)
16+
public static void Process(JsonRpcStateAsync async, object context = null,
17+
JsonSerializerSettings settings = null)
1718
{
18-
Process(Handler.DefaultSessionId(), async, context);
19+
Process(Handler.DefaultSessionId(), async, context, settings);
1920
}
2021

21-
public static void Process(string sessionId, JsonRpcStateAsync async, object context = null)
22+
public static void Process(string sessionId, JsonRpcStateAsync async, object context = null,
23+
JsonSerializerSettings settings = null)
2224
{
23-
Process(sessionId, async.JsonRpc, context)
25+
Process(sessionId, async.JsonRpc, context, settings)
2426
.ContinueWith(t =>
25-
{
26-
async.Result = t.Result;
27-
async.SetCompleted();
28-
});
27+
{
28+
async.Result = t.Result;
29+
async.SetCompleted();
30+
});
2931
}
30-
public static Task<string> Process(string jsonRpc, object context = null)
32+
33+
public static Task<string> Process(string jsonRpc, object context = null,
34+
JsonSerializerSettings settings = null)
3135
{
32-
return Process(Handler.DefaultSessionId(), jsonRpc, context);
36+
return Process(Handler.DefaultSessionId(), jsonRpc, context, settings);
3337
}
34-
public static Task<string> Process(string sessionId, string jsonRpc, object context = null)
35-
{
38+
39+
public static Task<string> Process(string sessionId, string jsonRpc, object context = null,
40+
JsonSerializerSettings settings = null)
41+
{
3642
return Task<string>.Factory.StartNew((_) =>
3743
{
38-
var tuple = (Tuple<string, string, object>)_;
39-
return ProcessInternal(tuple.Item1, tuple.Item2, tuple.Item3);
40-
}, new Tuple<string, string, object>(sessionId, jsonRpc, context));
44+
var tuple = (Tuple<string, string, object, JsonSerializerSettings>)_;
45+
return ProcessInternal(tuple.Item1, tuple.Item2, tuple.Item3, tuple.Item4);
46+
}, new Tuple<string, string, object, JsonSerializerSettings>(sessionId, jsonRpc, context, settings));
4147
}
4248

43-
private static string ProcessInternal(string sessionId, string jsonRpc, object jsonRpcContext)
49+
private static string ProcessInternal(string sessionId, string jsonRpc, object jsonRpcContext,
50+
JsonSerializerSettings settings = null)
4451
{
4552
var handler = Handler.GetSessionHandler(sessionId);
4653

@@ -50,20 +57,20 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j
5057
{
5158
if (isSingleRpc(jsonRpc))
5259
{
53-
var foo = JsonConvert.DeserializeObject<JsonRequest>(jsonRpc);
60+
var foo = JsonConvert.DeserializeObject<JsonRequest>(jsonRpc, settings);
5461
batch = new[] { foo };
5562
}
5663
else
5764
{
58-
batch = JsonConvert.DeserializeObject<JsonRequest[]>(jsonRpc);
65+
batch = JsonConvert.DeserializeObject<JsonRequest[]>(jsonRpc, settings);
5966
}
6067
}
6168
catch (Exception ex)
6269
{
6370
return Newtonsoft.Json.JsonConvert.SerializeObject(new JsonResponse
6471
{
6572
Error = handler.ProcessParseException(jsonRpc, new JsonRpcException(-32700, "Parse error", ex))
66-
});
73+
}, settings);
6774
}
6875

6976
if (batch.Length == 0)
@@ -72,7 +79,7 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j
7279
{
7380
Error = handler.ProcessParseException(jsonRpc,
7481
new JsonRpcException(3200, "Invalid Request", "Batch of calls was empty."))
75-
});
82+
}, settings);
7683
}
7784

7885
var singleBatch = batch.Length == 1;
@@ -156,7 +163,7 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j
156163
sbResult = new StringBuilder("[");
157164
}
158165

159-
sbResult.Append(JsonConvert.SerializeObject(jsonResponse));
166+
sbResult.Append(JsonConvert.SerializeObject(jsonResponse, settings));
160167
if (i < batch.Length - 1)
161168
{
162169
sbResult.Append(',');

0 commit comments

Comments
 (0)