Merge pull request #3 from dhirensham/address-stricter-null-rules-in-vs17.12

dhirensham · web-flow · commit 38ece1eb5a5c · 2024-11-14T16:23:54.000+02:00
Address stricter rules around nullability in VS 17.12
diff --git a/src/CouchDB.Driver/Converters/AttachmentsParsedConverter.cs b/src/CouchDB.Driver/Converters/AttachmentsParsedConverter.cs
@@ -8,7 +8,7 @@ namespace CouchDB.Driver.Converters
 {
     internal class AttachmentsParsedConverter : JsonConverter<Dictionary<string, CouchAttachment>>
     {
-        public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttachment> value,
+        public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttachment>? value,
             JsonSerializer serializer)
         {
             serializer.Serialize(writer, value
@@ -20,7 +20,7 @@ public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttach
         public override bool CanRead => false;
 
         public override Dictionary<string, CouchAttachment> ReadJson(JsonReader reader, Type objectType,
-            Dictionary<string, CouchAttachment> existingValue, bool hasExistingValue,
+            Dictionary<string, CouchAttachment>? existingValue, bool hasExistingValue,
             JsonSerializer serializer)
         {
             throw new NotImplementedException();
diff --git a/src/CouchDB.Driver/CouchDB.Driver.csproj b/src/CouchDB.Driver/CouchDB.Driver.csproj
@@ -31,6 +31,7 @@
   <ItemGroup>
     <PackageReference Include="Flurl.Http" Version="3.2.4" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CouchDB.Driver/CouchDatabase.cs b/src/CouchDB.Driver/CouchDatabase.cs
@@ -591,11 +591,14 @@ public async IAsyncEnumerable<ChangesFeedResponseResult<TSource>> GetContinuousC
                         var substring = line.Substring(startIndex, lineLength);
                         ChangesFeedResponseResult<TSource>? result =
                             JsonConvert.DeserializeObject<ChangesFeedResponseResult<TSource>>(substring);
-                        if (string.IsNullOrWhiteSpace(_discriminator) ||
-                            result.Document.SplitDiscriminator == _discriminator)
+                        if (result != null)
                         {
-                            lastSequence = result.Seq;
-                            yield return result;
+                            if (string.IsNullOrWhiteSpace(_discriminator) ||
+                                result.Document.SplitDiscriminator == _discriminator)
+                            {
+                                lastSequence = result.Seq;
+                                yield return result;
+                            }
                         }
                     }
                 }
diff --git a/src/CouchDB.Driver/Extensions/MemberInfoExtensions.cs b/src/CouchDB.Driver/Extensions/MemberInfoExtensions.cs
@@ -17,7 +17,7 @@ public static string GetCouchPropertyName(this MemberInfo memberInfo, PropertyCa
                 ? jsonPropertyAttributes[0] as JsonPropertyAttribute
                 : null;
 
-            return jsonProperty != null
+            return jsonProperty?.PropertyName != null
                 ? jsonProperty.PropertyName
                 : propertyCaseType.Convert(memberInfo.Name);
         }
diff --git a/src/CouchDB.Driver/Extensions/TypeExtensions.cs b/src/CouchDB.Driver/Extensions/TypeExtensions.cs
@@ -18,7 +18,7 @@ public static string GetName(this Type t, CouchOptions options)
                 ? jsonObjectAttributes[0] as JsonObjectAttribute
                 : null;
 
-            if (jsonObject != null)
+            if (jsonObject?.Id != null)
             {
                 return jsonObject.Id;
             }
diff --git a/src/CouchDB.Driver/Helpers/CouchContractResolver.cs b/src/CouchDB.Driver/Helpers/CouchContractResolver.cs
@@ -17,7 +17,7 @@ internal CouchContractResolver(PropertyCaseType propertyCaseType, string? databa
             _databaseSplitDiscriminator = databaseSplitDiscriminator;
         }
 
-        protected override JsonProperty? CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
         {
             Check.NotNull(member, nameof(member));
 
diff --git a/src/CouchDB.Driver/Helpers/MicrosecondEpochConverter.cs b/src/CouchDB.Driver/Helpers/MicrosecondEpochConverter.cs
@@ -9,12 +9,15 @@ internal class MicrosecondEpochConverter : DateTimeConverterBase
     {
         private static readonly DateTime Epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
-            writer.WriteRawValue(((DateTime)value - Epoch).TotalMilliseconds + "000");
+            if (value != null)
+            {
+                writer.WriteRawValue(((DateTime)value - Epoch).TotalMilliseconds + "000");
+            }
         }
 
-        public override object? ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
             Check.NotNull(reader, nameof(reader));
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace CouchDB.Driver.Converters`
`8`	`8`	`{`
`9`	`9`	`internal class AttachmentsParsedConverter : JsonConverter<Dictionary<string, CouchAttachment>>`
`10`	`10`	`{`
`11`		`- public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttachment> value,`
	`11`	`+ public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttachment>? value,`
`12`	`12`	`JsonSerializer serializer)`
`13`	`13`	`{`
`14`	`14`	`serializer.Serialize(writer, value`
`@@ -20,7 +20,7 @@ public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttach`
`20`	`20`	`public override bool CanRead => false;`
`21`	`21`
`22`	`22`	`public override Dictionary<string, CouchAttachment> ReadJson(JsonReader reader, Type objectType,`
`23`		`- Dictionary<string, CouchAttachment> existingValue, bool hasExistingValue,`
	`23`	`+ Dictionary<string, CouchAttachment>? existingValue, bool hasExistingValue,`
`24`	`24`	`JsonSerializer serializer)`
`25`	`25`	`{`
`26`	`26`	`throw new NotImplementedException();`
Original file line number	Diff line number	Diff line change
`@@ -591,11 +591,14 @@ public async IAsyncEnumerable<ChangesFeedResponseResult<TSource>> GetContinuousC`
`591`	`591`	`var substring = line.Substring(startIndex, lineLength);`
`592`	`592`	`ChangesFeedResponseResult<TSource>? result =`
`593`	`593`	`JsonConvert.DeserializeObject<ChangesFeedResponseResult<TSource>>(substring);`
`594`		`- if (string.IsNullOrWhiteSpace(_discriminator) \|\|`
`595`		`- result.Document.SplitDiscriminator == _discriminator)`
	`594`	`+ if (result != null)`
`596`	`595`	`{`
`597`		`- lastSequence = result.Seq;`
`598`		`- yield return result;`
	`596`	`+ if (string.IsNullOrWhiteSpace(_discriminator) \|\|`
	`597`	`+ result.Document.SplitDiscriminator == _discriminator)`
	`598`	`+ {`
	`599`	`+ lastSequence = result.Seq;`
	`600`	`+ yield return result;`
	`601`	`+ }`
`599`	`602`	`}`
`600`	`603`	`}`
`601`	`604`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static string GetCouchPropertyName(this MemberInfo memberInfo, PropertyCa`
`17`	`17`	`? jsonPropertyAttributes[0] as JsonPropertyAttribute`
`18`	`18`	`: null;`
`19`	`19`
`20`		`- return jsonProperty != null`
	`20`	`+ return jsonProperty?.PropertyName != null`
`21`	`21`	`? jsonProperty.PropertyName`
`22`	`22`	`: propertyCaseType.Convert(memberInfo.Name);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static string GetName(this Type t, CouchOptions options)`
`18`	`18`	`? jsonObjectAttributes[0] as JsonObjectAttribute`
`19`	`19`	`: null;`
`20`	`20`
`21`		`- if (jsonObject != null)`
	`21`	`+ if (jsonObject?.Id != null)`
`22`	`22`	`{`
`23`	`23`	`return jsonObject.Id;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal CouchContractResolver(PropertyCaseType propertyCaseType, string? databa`
`17`	`17`	`_databaseSplitDiscriminator = databaseSplitDiscriminator;`
`18`	`18`	`}`
`19`	`19`
`20`		`- protected override JsonProperty? CreateProperty(MemberInfo member, MemberSerialization memberSerialization)`
	`20`	`+ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)`
`21`	`21`	`{`
`22`	`22`	`Check.NotNull(member, nameof(member));`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,15 @@ internal class MicrosecondEpochConverter : DateTimeConverterBase`
`9`	`9`	`{`
`10`	`10`	`private static readonly DateTime Epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);`
`11`	`11`
`12`		`- public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)`
	`12`	`+ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)`
`13`	`13`	`{`
`14`		`- writer.WriteRawValue(((DateTime)value - Epoch).TotalMilliseconds + "000");`
	`14`	`+ if (value != null)`
	`15`	`+ {`
	`16`	`+ writer.WriteRawValue(((DateTime)value - Epoch).TotalMilliseconds + "000");`
	`17`	`+ }`
`15`	`18`	`}`
`16`	`19`
`17`		`- public override object? ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
	`20`	`+ public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)`
`18`	`21`	`{`
`19`	`22`	`Check.NotNull(reader, nameof(reader));`
`20`	`23`