Convert codebase to use C# 8 nullability

Thanks to @Brar for considerable work on the feature! Closes #2304
npgsql · May 5, 2019 · f2dd3f7 · f2dd3f7
1 parent d922b0a
commit f2dd3f7
Show file tree

Hide file tree

Showing 194 changed files with 1,942 additions and 1,810 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -29,6 +29,7 @@ before_build:
 build_script:
   - dotnet build "test\Npgsql.Tests" -c Debug
   - dotnet build "test\Npgsql.PluginTests" -c Debug
+  - dotnet build "src\Npgsql" -c Release
   - msbuild src\VSIX\VSIX.csproj /p:Configuration=Release /v:Minimal
 # WIX hasn't been released yet for VS 2019
 #  - msbuild src\MSI\MSI.wixproj /p:Configuration=Release /v:Minimal

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,6 +18,7 @@
   <PropertyGroup>
     <LangVersion>8.0</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NullableContextOptions>enable</NullableContextOptions>
   </PropertyGroup>
 
   <!-- Siging configuration -->

diff --git a/Npgsql.sln.DotSettings b/Npgsql.sln.DotSettings
@@ -6,8 +6,6 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArgumentsStyleStringLiteral/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/ValueAnalysisMode/@EntryValue">IMPLICIT_NOTNULL</s:String>
-	<s:Boolean x:Key="/Default/CodeInspection/ImplicitNullability/Enabled/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ARGUMENTS_LITERAL/@EntryValue">Positional</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ARGUMENTS_NAMED/@EntryValue">Positional</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Implicit</s:String>

diff --git a/src/Npgsql.GeoJSON/CrsMap.cs b/src/Npgsql.GeoJSON/CrsMap.cs
@@ -9,9 +9,9 @@ namespace Npgsql.GeoJSON
     {
         internal readonly int MinSrid;
         internal readonly int MaxSrid;
-        internal readonly string Authority;
+        internal readonly string? Authority;
 
-        internal CrsMapEntry(int minSrid, int maxSrid, string authority)
+        internal CrsMapEntry(int minSrid, int maxSrid, string? authority)
         {
             MinSrid = minSrid;
             MaxSrid = maxSrid;
@@ -74,15 +74,15 @@ internal CrsMap Build()
 
     readonly partial struct CrsMap
     {
-        readonly CrsMapEntry[] _overriden;
+        readonly CrsMapEntry[]? _overriden;
 
-        internal CrsMap(CrsMapEntry[] overriden)
+        internal CrsMap(CrsMapEntry[]? overriden)
             => _overriden = overriden;
 
-        internal string GetAuthority(int srid)
+        internal string? GetAuthority(int srid)
             => GetAuthority(_overriden, srid) ?? GetAuthority(WellKnown, srid);
 
-        static string GetAuthority(CrsMapEntry[] entries, int srid)
+        static string? GetAuthority(CrsMapEntry[]? entries, int srid)
         {
             if (entries == null)
                 return null;

diff --git a/src/Npgsql.GeoJSON/GeoJSONHandler.cs b/src/Npgsql.GeoJSON/GeoJSONHandler.cs
diff --git a/src/Npgsql.Json.NET/JsonHandler.cs b/src/Npgsql.Json.NET/JsonHandler.cs
@@ -12,7 +12,8 @@ public class JsonHandlerFactory : NpgsqlTypeHandlerFactory<string>
     {
         readonly JsonSerializerSettings _settings;
 
-        public JsonHandlerFactory(JsonSerializerSettings settings) => _settings = settings;
+        public JsonHandlerFactory(JsonSerializerSettings? settings = null)
+            => _settings = settings ?? new JsonSerializerSettings();
 
         protected override NpgsqlTypeHandler<string> Create(NpgsqlConnection conn)
             => new JsonHandler(conn, _settings);
@@ -24,7 +25,7 @@ class JsonHandler : Npgsql.TypeHandlers.TextHandler
 
         public JsonHandler(NpgsqlConnection connection, JsonSerializerSettings settings) : base(connection) => _settings = settings;
 
-        protected override async ValueTask<T> Read<T>(NpgsqlReadBuffer buf, int len, bool async, FieldDescription fieldDescription = null)
+        protected override async ValueTask<T> Read<T>(NpgsqlReadBuffer buf, int len, bool async, FieldDescription? fieldDescription = null)
         {
             var s = await base.Read<string>(buf, len, async, fieldDescription);
             if (typeof(T) == typeof(string))
@@ -39,17 +40,17 @@ protected override async ValueTask<T> Read<T>(NpgsqlReadBuffer buf, int len, boo
             }
         }
 
-        protected override int ValidateAndGetLength<T2>(T2 value, ref NpgsqlLengthCache lengthCache, NpgsqlParameter parameter)
+        protected override int ValidateAndGetLength<T2>(T2 value, ref NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter)
             => typeof(T2) == typeof(string)
                 ? base.ValidateAndGetLength(value, ref lengthCache, parameter)
-                : ValidateObjectAndGetLength(value, ref lengthCache, parameter);
+                : ValidateObjectAndGetLength(value!, ref lengthCache, parameter);
-        
+
-        protected override Task WriteWithLength<T2>(T2 value, NpgsqlWriteBuffer buf, NpgsqlLengthCache lengthCache, NpgsqlParameter parameter, bool async)
+        protected override Task WriteWithLength<T2>(T2 value, NpgsqlWriteBuffer buf, NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter, bool async)
             => typeof(T2) == typeof(string)
                 ? base.WriteWithLength(value, buf, lengthCache, parameter, async)
-                : WriteObjectWithLength(value, buf, lengthCache, parameter, async);
+                : WriteObjectWithLength(value!, buf, lengthCache, parameter, async);
 
-        protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLengthCache lengthCache, NpgsqlParameter parameter)
+        protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter)
         {
             var s = value as string;
             if (s == null)
@@ -61,10 +62,10 @@ protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLength
             return base.ValidateAndGetLength(s, ref lengthCache, parameter);
         }
 
-        protected override Task WriteObjectWithLength(object value, NpgsqlWriteBuffer buf, NpgsqlLengthCache lengthCache, NpgsqlParameter parameter, bool async)
+        protected override Task WriteObjectWithLength(object value, NpgsqlWriteBuffer buf, NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter, bool async)
         {
             if (value == null || value is DBNull)
-                return base.WriteObjectWithLength(value, buf, lengthCache, parameter, async);
+                return base.WriteObjectWithLength(DBNull.Value, buf, lengthCache, parameter, async);
 
             if (parameter?.ConvertedValue != null)
                 value = parameter.ConvertedValue;

diff --git a/src/Npgsql.Json.NET/JsonbHandler.cs b/src/Npgsql.Json.NET/JsonbHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Npgsql.BackendMessages;
@@ -12,7 +13,8 @@ public class JsonbHandlerFactory : NpgsqlTypeHandlerFactory<string>
     {
         readonly JsonSerializerSettings _settings;
 
-        public JsonbHandlerFactory(JsonSerializerSettings settings) => _settings = settings;
+        public JsonbHandlerFactory(JsonSerializerSettings? settings = null)
+            => _settings = settings ?? new JsonSerializerSettings();
 
         protected override NpgsqlTypeHandler<string> Create(NpgsqlConnection conn)
             => new JsonbHandler(conn, _settings);
@@ -24,7 +26,7 @@ class JsonbHandler : Npgsql.TypeHandlers.JsonbHandler
 
         public JsonbHandler(NpgsqlConnection connection, JsonSerializerSettings settings) : base(connection) => _settings = settings;
 
-        protected override async ValueTask<T> Read<T>(NpgsqlReadBuffer buf, int len, bool async, FieldDescription fieldDescription = null)
+        protected override async ValueTask<T> Read<T>(NpgsqlReadBuffer buf, int len, bool async, FieldDescription? fieldDescription = null)
         {
             var s = await base.Read<string>(buf, len, async, fieldDescription);
             if (typeof(T) == typeof(string))
@@ -39,17 +41,17 @@ protected override async ValueTask<T> Read<T>(NpgsqlReadBuffer buf, int len, boo
             }
         }
 
-        protected override int ValidateAndGetLength<T2>(T2 value, ref NpgsqlLengthCache lengthCache, NpgsqlParameter parameter)
+        protected override int ValidateAndGetLength<T2>(T2 value, ref NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter)
             => typeof(T2) == typeof(string)
                 ? base.ValidateAndGetLength(value, ref lengthCache, parameter)
-                : ValidateObjectAndGetLength(value, ref lengthCache, parameter);
+                : ValidateObjectAndGetLength(value!, ref lengthCache, parameter);
-        
+
-        protected override Task WriteWithLength<T2>(T2 value, NpgsqlWriteBuffer buf, NpgsqlLengthCache lengthCache, NpgsqlParameter parameter, bool async)
+        protected override Task WriteWithLength<T2>(T2 value, NpgsqlWriteBuffer buf, NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter, bool async)
             => typeof(T2) == typeof(string)
                 ? base.WriteWithLength(value, buf, lengthCache, parameter, async)
-                : WriteObjectWithLength(value, buf, lengthCache, parameter, async);
+                : WriteObjectWithLength(value!, buf, lengthCache, parameter, async);
 
-        protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLengthCache lengthCache, NpgsqlParameter parameter)
+        protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter)
         {
             var s = value as string;
             if (s == null)
@@ -61,10 +63,10 @@ protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLength
             return base.ValidateObjectAndGetLength(s, ref lengthCache, parameter);
         }
 
-        protected override Task WriteObjectWithLength(object value, NpgsqlWriteBuffer buf, NpgsqlLengthCache lengthCache, NpgsqlParameter parameter, bool async)
+        protected override Task WriteObjectWithLength(object value, NpgsqlWriteBuffer buf, NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter, bool async)
         {
             if (value == null || value is DBNull)
-                return base.WriteObjectWithLength(value, buf, lengthCache, parameter, async);
+                return base.WriteObjectWithLength(DBNull.Value, buf, lengthCache, parameter, async);
 
             if (parameter?.ConvertedValue != null)
                 value = parameter.ConvertedValue;

diff --git a/src/Npgsql.Json.NET/NpgsqlJsonNetExtensions.cs b/src/Npgsql.Json.NET/NpgsqlJsonNetExtensions.cs
@@ -21,9 +21,9 @@ public static class NpgsqlJsonNetExtensions
         /// <param name="settings">Optional settings to customize JSON serialization</param>
         public static INpgsqlTypeMapper UseJsonNet(
             this INpgsqlTypeMapper mapper,
-            Type[] jsonbClrTypes = null,
+            Type[]? jsonbClrTypes = null,
-            Type[] jsonClrTypes = null,
+            Type[]? jsonClrTypes = null,
-            JsonSerializerSettings settings = null
+            JsonSerializerSettings? settings = null
         )
         {
             mapper.AddMapping(new NpgsqlTypeMappingBuilder

diff --git a/src/Npgsql.LegacyPostgis/CodeAnnotations.cs b/src/Npgsql.LegacyPostgis/CodeAnnotations.cs
@@ -164,7 +164,7 @@ internal enum ImplicitUseTargetFlags
     sealed class PublicAPIAttribute : Attribute
 #pragma warning restore CA1018
     {
-        public PublicAPIAttribute() { }
+        public PublicAPIAttribute() : this("") { }
         public PublicAPIAttribute([NotNull] string comment)
         {
             Comment = comment;