Skip to content

Commit 6f6e7a8

Browse files
committed
options null 检测
1 parent 741c0ed commit 6f6e7a8

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

WebApiClient/Defaults/JsonFormatter.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,8 @@ public object Deserialize(string json, Type objType)
6666
protected virtual JsonSerializerSettings CreateSerializerSettings(FormatOptions options)
6767
{
6868
var setting = new JsonSerializerSettings();
69-
if (options != null)
70-
{
71-
setting.DateFormatString = options.DateTimeFormat;
72-
setting.ContractResolver = options.UseCamelCase ? useCamelCaseResolver : noCamelCaseResolver;
73-
}
74-
else
75-
{
76-
setting.ContractResolver = noCamelCaseResolver;
77-
}
69+
setting.DateFormatString = options?.DateTimeFormat;
70+
setting.ContractResolver = options?.UseCamelCase == true ? useCamelCaseResolver : noCamelCaseResolver;
7871
return setting;
7972
}
8073
}

WebApiClient/Defaults/KeyValueFormatter.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ protected virtual JsonSerializerSettings CreateSerializerSettings(FormatOptions
6868
{
6969
var setting = new JsonSerializerSettings();
7070
setting.Converters.Add(new KeyValuePairConverter());
71-
setting.DateFormatString = options.DateTimeFormat;
72-
setting.ContractResolver = options.UseCamelCase ? useCamelCaseResolver : noCamelCaseResolver;
71+
72+
setting.DateFormatString = options?.DateTimeFormat;
73+
setting.ContractResolver = options?.UseCamelCase == true ? useCamelCaseResolver : noCamelCaseResolver;
74+
7375
return setting;
7476
}
7577
}

0 commit comments

Comments
 (0)