Skip to content

Commit 01afbe7

Browse files
niemyjskiniemyjski
committed
Updated to JSON.NET 13.0.3
1 parent 6f33256 commit 01afbe7

File tree

108 files changed

+1528
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1528
-717
lines changed

‎src/Exceptionless/Newtonsoft.Json/Converters/BinaryConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private static void EnsureReflectionObject(Type t)
126126
{
127127
// current token is already at base64 string
128128
// unable to call ReadAsBytes so do it the old fashion way
129-
string encodedData = reader.Value!.ToString();
129+
string encodedData = reader.Value!.ToString()!;
130130
data = Convert.FromBase64String(encodedData);
131131
}
132132
else
@@ -135,7 +135,7 @@ private static void EnsureReflectionObject(Type t)
135135
}
136136

137137
Type t = (ReflectionUtils.IsNullableType(objectType))
138-
? Nullable.GetUnderlyingType(objectType)
138+
? Nullable.GetUnderlyingType(objectType)!
139139
: objectType;
140140

141141
#if HAVE_LINQ

‎src/Exceptionless/Newtonsoft.Json/Converters/DataSetConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
8484
// handle typed datasets
8585
DataSet ds = (objectType == typeof(DataSet))
8686
? new DataSet()
87-
: (DataSet)Activator.CreateInstance(objectType);
87+
: (DataSet)Activator.CreateInstance(objectType)!;
8888

8989
DataTableConverter converter = new DataTableConverter();
9090

9191
reader.ReadAndAssert();
9292

9393
while (reader.TokenType == JsonToken.PropertyName)
9494
{
95-
DataTable dt = ds.Tables[(string)reader.Value!];
95+
DataTable? dt = ds.Tables[(string)reader.Value!];
9696
bool exists = (dt != null);
9797

9898
dt = (DataTable)converter.ReadJson(reader, typeof(DataTable), dt, serializer)!;

‎src/Exceptionless/Newtonsoft.Json/Converters/DataTableConverter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
9999
// handle typed datasets
100100
dt = (objectType == typeof(DataTable))
101101
? new DataTable()
102-
: (DataTable)Activator.CreateInstance(objectType);
102+
: (DataTable)Activator.CreateInstance(objectType)!;
103103
}
104104

105105
// DataTable is inside a DataSet
@@ -144,7 +144,7 @@ private static void CreateRow(JsonReader reader, DataTable dt, JsonSerializer se
144144

145145
reader.ReadAndAssert();
146146

147-
DataColumn column = dt.Columns[columnName];
147+
DataColumn? column = dt.Columns[columnName];
148148
if (column == null)
149149
{
150150
Type columnType = GetColumnDataType(reader);
@@ -185,7 +185,7 @@ private static void CreateRow(JsonReader reader, DataTable dt, JsonSerializer se
185185
reader.ReadAndAssert();
186186
}
187187

188-
Array destinationArray = Array.CreateInstance(column.DataType.GetElementType(), o.Count);
188+
Array destinationArray = Array.CreateInstance(column.DataType.GetElementType()!, o.Count);
189189
((IList)o).CopyTo(destinationArray, 0);
190190

191191
dr[columnName] = destinationArray;

‎src/Exceptionless/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
182182

183183
while (reader.TokenType == JsonToken.PropertyName)
184184
{
185-
string propertyName = reader.Value!.ToString();
185+
string propertyName = reader.Value!.ToString()!;
186186
if (string.Equals(propertyName, CasePropertyName, StringComparison.OrdinalIgnoreCase))
187187
{
188188
reader.ReadAndAssert();

‎src/Exceptionless/Newtonsoft.Json/Converters/EntityKeyMemberConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private static void ReadAndAssertProperty(JsonReader reader, string propertyName
129129
reader.ReadAndAssert();
130130
string? type = reader.Value?.ToString();
131131

132-
Type t = Type.GetType(type);
132+
Type t = Type.GetType(type!)!;
133133

134134
ReadAndAssertProperty(reader, ValuePropertyName);
135135
reader.ReadAndAssert();

‎src/Exceptionless/Newtonsoft.Json/Converters/ExpandoObjectConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private object ReadObject(JsonReader reader)
119119
switch (reader.TokenType)
120120
{
121121
case JsonToken.PropertyName:
122-
string propertyName = reader.Value!.ToString();
122+
string propertyName = reader.Value!.ToString()!;
123123

124124
if (!reader.Read())
125125
{

‎src/Exceptionless/Newtonsoft.Json/Converters/IsoDateTimeConverter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
133133

134134
#if HAVE_DATE_TIME_OFFSET
135135
Type t = (nullable)
136-
? Nullable.GetUnderlyingType(objectType)
136+
? Nullable.GetUnderlyingType(objectType)!
137137
: objectType;
138138
#endif
139139

@@ -167,6 +167,8 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
167167
return null;
168168
}
169169

170+
MiscellaneousUtils.Assert(dateText != null);
171+
170172
#if HAVE_DATE_TIME_OFFSET
171173
if (t == typeof(DateTimeOffset))
172174
{

‎src/Exceptionless/Newtonsoft.Json/Converters/JavaScriptDateTimeConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
9898

9999
#if HAVE_DATE_TIME_OFFSET
100100
Type t = (ReflectionUtils.IsNullableType(objectType))
101-
? Nullable.GetUnderlyingType(objectType)
101+
? Nullable.GetUnderlyingType(objectType)!
102102
: objectType;
103103
if (t == typeof(DateTimeOffset))
104104
{

‎src/Exceptionless/Newtonsoft.Json/Converters/KeyValuePairConverter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
102102
reader.ReadAndAssert();
103103

104104
Type t = ReflectionUtils.IsNullableType(objectType)
105-
? Nullable.GetUnderlyingType(objectType)
105+
? Nullable.GetUnderlyingType(objectType)!
106106
: objectType;
107107

108108
ReflectionObject reflectionObject = ReflectionObjectPerType.Get(t);
@@ -111,7 +111,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
111111

112112
while (reader.TokenType == JsonToken.PropertyName)
113113
{
114-
string propertyName = reader.Value!.ToString();
114+
string propertyName = reader.Value!.ToString()!;
115115
if (string.Equals(propertyName, KeyName, StringComparison.OrdinalIgnoreCase))
116116
{
117117
reader.ReadForTypeAndAssert(keyContract, false);
@@ -145,7 +145,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
145145
public override bool CanConvert(Type objectType)
146146
{
147147
Type t = (ReflectionUtils.IsNullableType(objectType))
148-
? Nullable.GetUnderlyingType(objectType)
148+
? Nullable.GetUnderlyingType(objectType)!
149149
: objectType;
150150

151151
if (t.IsValueType() && t.IsGenericType())

‎src/Exceptionless/Newtonsoft.Json/Converters/RegexConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private Regex ReadRegexObject(JsonReader reader, JsonSerializer serializer)
179179
switch (reader.TokenType)
180180
{
181181
case JsonToken.PropertyName:
182-
string propertyName = reader.Value!.ToString();
182+
string propertyName = reader.Value!.ToString()!;
183183

184184
if (!reader.Read())
185185
{

0 commit comments

Comments
 (0)