Fixed cibuild

Bart Koelman · Bart Koelman · commit 23e5ba47fed9 · 2021-03-11T12:57:28.000+01:00
diff --git a/src/JsonApiDotNetCore/Hooks/Internal/HooksNavigationParser.cs b/src/JsonApiDotNetCore/Hooks/Internal/HooksNavigationParser.cs
@@ -2,9 +2,11 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
+#pragma warning disable AV1008 // Class should not be static
+
 namespace JsonApiDotNetCore.Hooks.Internal
 {
-    internal sealed class HooksNavigationParser
+    internal static class HooksNavigationParser
     {
         /// <summary>
         /// Gets the property info that is referenced in the NavigationAction expression. Credits: https://stackoverflow.com/a/17116267/4441216
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs
@@ -17,7 +17,6 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
     [PublicAPI]
     public class WhereClauseBuilder : QueryClauseBuilder<Type>
     {
-        private static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();
         private static readonly CollectionConverter CollectionConverter = new CollectionConverter();
         private static readonly ConstantExpression NullConstant = Expression.Constant(null);
 
@@ -190,7 +189,7 @@ private Type TryResolveCommonType(QueryExpression left, QueryExpression right)
         {
             Type leftType = ResolveFixedType(left);
 
-            if (TypeConverter.CanContainNull(leftType))
+            if (RuntimeTypeConverter.CanContainNull(leftType))
             {
                 return leftType;
             }
@@ -202,7 +201,7 @@ private Type TryResolveCommonType(QueryExpression left, QueryExpression right)
 
             Type rightType = TryResolveFixedType(right);
 
-            if (rightType != null && TypeConverter.CanContainNull(rightType))
+            if (rightType != null && RuntimeTypeConverter.CanContainNull(rightType))
             {
                 return rightType;
             }
@@ -260,7 +259,7 @@ private static object ConvertTextToTargetType(string text, Type targetType)
         {
             try
             {
-                return TypeConverter.ConvertType(text, targetType);
+                return RuntimeTypeConverter.ConvertType(text, targetType);
             }
             catch (FormatException exception)
             {
diff --git a/src/JsonApiDotNetCore/Resources/Identifiable.cs b/src/JsonApiDotNetCore/Resources/Identifiable.cs
@@ -16,8 +16,6 @@ public abstract class Identifiable : Identifiable<int>
     /// </typeparam>
     public abstract class Identifiable<TId> : IIdentifiable<TId>
     {
-        private static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();
-
         /// <inheritdoc />
         public virtual TId Id { get; set; }
 
@@ -46,7 +44,7 @@ protected virtual string GetStringId(TId value)
         /// </summary>
         protected virtual TId GetTypedId(string value)
         {
-            return value == null ? default : (TId)TypeConverter.ConvertType(value, typeof(TId));
+            return value == null ? default : (TId)RuntimeTypeConverter.ConvertType(value, typeof(TId));
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/RuntimeTypeConverter.cs b/src/JsonApiDotNetCore/RuntimeTypeConverter.cs
@@ -1,10 +1,12 @@
 using System;
 
+#pragma warning disable AV1008 // Class should not be static
+
 namespace JsonApiDotNetCore
 {
-    internal sealed class RuntimeTypeConverter
+    internal static class RuntimeTypeConverter
     {
-        public object ConvertType(object value, Type type)
+        public static object ConvertType(object value, Type type)
         {
             ArgumentGuard.NotNull(type, nameof(type));
 
@@ -73,12 +75,12 @@ public object ConvertType(object value, Type type)
             }
         }
 
-        public bool CanContainNull(Type type)
+        public static bool CanContainNull(Type type)
         {
             return !type.IsValueType || Nullable.GetUnderlyingType(type) != null;
         }
 
-        public object GetDefaultValue(Type type)
+        public static object GetDefaultValue(Type type)
         {
             return type.IsValueType ? Activator.CreateInstance(type) : null;
         }
diff --git a/src/JsonApiDotNetCore/Serialization/BaseDeserializer.cs b/src/JsonApiDotNetCore/Serialization/BaseDeserializer.cs
@@ -21,7 +21,6 @@ namespace JsonApiDotNetCore.Serialization
     [PublicAPI]
     public abstract class BaseDeserializer
     {
-        private protected static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();
         private protected static readonly CollectionConverter CollectionConverter = new CollectionConverter();
 
         protected IResourceContextProvider ResourceContextProvider { get; }
@@ -349,7 +348,7 @@ private object ConvertAttrValue(object newValue, Type targetType)
             }
 
             // the attribute value is a native C# type.
-            object convertedValue = TypeConverter.ConvertType(newValue, targetType);
+            object convertedValue = RuntimeTypeConverter.ConvertType(newValue, targetType);
             return convertedValue;
         }
 
diff --git a/src/JsonApiDotNetCore/Serialization/Building/ResourceObjectBuilder.cs b/src/JsonApiDotNetCore/Serialization/Building/ResourceObjectBuilder.cs
@@ -13,7 +13,6 @@ namespace JsonApiDotNetCore.Serialization.Building
     [PublicAPI]
     public class ResourceObjectBuilder : IResourceObjectBuilder
     {
-        private static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();
         private static readonly CollectionConverter CollectionConverter = new CollectionConverter();
 
         private readonly ResourceObjectBuilderSettings _settings;
@@ -175,7 +174,7 @@ private void ProcessAttributes(IIdentifiable resource, IEnumerable<AttrAttribute
                 }
 
                 if (_settings.SerializerDefaultValueHandling == DefaultValueHandling.Ignore &&
-                    Equals(value, TypeConverter.GetDefaultValue(attr.Property.PropertyType)))
+                    Equals(value, RuntimeTypeConverter.GetDefaultValue(attr.Property.PropertyType)))
                 {
                     return;
                 }
diff --git a/src/JsonApiDotNetCore/Serialization/RequestDeserializer.cs b/src/JsonApiDotNetCore/Serialization/RequestDeserializer.cs
@@ -260,7 +260,7 @@ private void AssertCompatibleId(ResourceIdentifierObject resourceIdentifierObjec
             {
                 try
                 {
-                    TypeConverter.ConvertType(resourceIdentifierObject.Id, idType);
+                    RuntimeTypeConverter.ConvertType(resourceIdentifierObject.Id, idType);
                 }
                 catch (FormatException exception)
                 {
diff --git a/test/UnitTests/Internal/RuntimeTypeConverterTests.cs b/test/UnitTests/Internal/RuntimeTypeConverterTests.cs
@@ -14,10 +14,8 @@ public void Can_Convert_DateTimeOffsets()
             var dto = new DateTimeOffset(new DateTime(2002, 2, 2), TimeSpan.FromHours(4));
             string formattedString = dto.ToString("O");
 
-            var typeConverter = new RuntimeTypeConverter();
-
             // Act
-            object result = typeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
+            object result = RuntimeTypeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
 
             // Assert
             Assert.Equal(dto, result);
@@ -29,10 +27,8 @@ public void Bad_DateTimeOffset_String_Throws()
             // Arrange
             const string formattedString = "this_is_not_a_valid_dto";
 
-            var typeConverter = new RuntimeTypeConverter();
-
             // Act
-            Action action = () => typeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
+            Action action = () => RuntimeTypeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
 
             // Assert
             Assert.Throws<FormatException>(action);
@@ -44,10 +40,8 @@ public void Can_Convert_Enums()
             // Arrange
             const string formattedString = "1";
 
-            var typeConverter = new RuntimeTypeConverter();
-
             // Act
-            object result = typeConverter.ConvertType(formattedString, typeof(TestEnum));
+            object result = RuntimeTypeConverter.ConvertType(formattedString, typeof(TestEnum));
 
             // Assert
             Assert.Equal(TestEnum.Test, result);
@@ -60,10 +54,8 @@ public void ConvertType_Returns_Value_If_Type_Is_Same()
             var val = new ComplexType();
             Type type = val.GetType();
 
-            var typeConverter = new RuntimeTypeConverter();
-
             // Act
-            object result = typeConverter.ConvertType(val, type);
+            object result = RuntimeTypeConverter.ConvertType(val, type);
 
             // Assert
             Assert.Equal(val, result);
@@ -78,11 +70,9 @@ public void ConvertType_Returns_Value_If_Type_Is_Assignable()
             Type baseType = typeof(BaseType);
             Type iType = typeof(IType);
 
-            var typeConverter = new RuntimeTypeConverter();
-
             // Act
-            object baseResult = typeConverter.ConvertType(val, baseType);
-            object iResult = typeConverter.ConvertType(val, iType);
+            object baseResult = RuntimeTypeConverter.ConvertType(val, baseType);
+            object iResult = RuntimeTypeConverter.ConvertType(val, iType);
 
             // Assert
             Assert.Equal(val, baseResult);
@@ -102,12 +92,10 @@ public void ConvertType_Returns_Default_Value_For_Empty_Strings()
                 { typeof(Guid), Guid.Empty }
             };
 
-            var typeConverter = new RuntimeTypeConverter();
-
             foreach (KeyValuePair<Type, object> pair in data)
             {
                 // Act
-                object result = typeConverter.ConvertType(string.Empty, pair.Key);
+                object result = RuntimeTypeConverter.ConvertType(string.Empty, pair.Key);
 
                 // Assert
                 Assert.Equal(pair.Value, result);
@@ -121,10 +109,8 @@ public void Can_Convert_TimeSpans()
             TimeSpan timeSpan = TimeSpan.FromMinutes(45);
             string stringSpan = timeSpan.ToString();
 
-            var typeConverter = new RuntimeTypeConverter();
-
             // Act
-            object result = typeConverter.ConvertType(stringSpan, typeof(TimeSpan));
+            object result = RuntimeTypeConverter.ConvertType(stringSpan, typeof(TimeSpan));
 
             // Assert
             Assert.Equal(timeSpan, result);
@@ -136,10 +122,8 @@ public void Bad_TimeSpanString_Throws()
             // Arrange
             const string formattedString = "this_is_not_a_valid_timespan";
 
-            var typeConverter = new RuntimeTypeConverter();
-
             // Act
-            Action action = () => typeConverter.ConvertType(formattedString, typeof(TimeSpan));
+            Action action = () => RuntimeTypeConverter.ConvertType(formattedString, typeof(TimeSpan));
 
             // Assert
             Assert.Throws<FormatException>(action);

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`	`using System.Linq.Expressions;`
`3`	`3`	`using System.Reflection;`
`4`	`4`
	`5`	`+#pragma warning disable AV1008 // Class should not be static`
	`6`	`+`
`5`	`7`	`namespace JsonApiDotNetCore.Hooks.Internal`
`6`	`8`	`{`
`7`		`- internal sealed class HooksNavigationParser`
	`9`	`+ internal static class HooksNavigationParser`
`8`	`10`	`{`
`9`	`11`	`/// <summary>`
`10`	`12`	`/// Gets the property info that is referenced in the NavigationAction expression. Credits: https://stackoverflow.com/a/17116267/4441216`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding`
`17`	`17`	`[PublicAPI]`
`18`	`18`	`public class WhereClauseBuilder : QueryClauseBuilder<Type>`
`19`	`19`	`{`
`20`		`- private static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();`
`21`	`20`	`private static readonly CollectionConverter CollectionConverter = new CollectionConverter();`
`22`	`21`	`private static readonly ConstantExpression NullConstant = Expression.Constant(null);`
`23`	`22`
`@@ -190,7 +189,7 @@ private Type TryResolveCommonType(QueryExpression left, QueryExpression right)`
`190`	`189`	`{`
`191`	`190`	`Type leftType = ResolveFixedType(left);`
`192`	`191`
`193`		`- if (TypeConverter.CanContainNull(leftType))`
	`192`	`+ if (RuntimeTypeConverter.CanContainNull(leftType))`
`194`	`193`	`{`
`195`	`194`	`return leftType;`
`196`	`195`	`}`
`@@ -202,7 +201,7 @@ private Type TryResolveCommonType(QueryExpression left, QueryExpression right)`
`202`	`201`
`203`	`202`	`Type rightType = TryResolveFixedType(right);`
`204`	`203`
`205`		`- if (rightType != null && TypeConverter.CanContainNull(rightType))`
	`204`	`+ if (rightType != null && RuntimeTypeConverter.CanContainNull(rightType))`
`206`	`205`	`{`
`207`	`206`	`return rightType;`
`208`	`207`	`}`
`@@ -260,7 +259,7 @@ private static object ConvertTextToTargetType(string text, Type targetType)`
`260`	`259`	`{`
`261`	`260`	`try`
`262`	`261`	`{`
`263`		`- return TypeConverter.ConvertType(text, targetType);`
	`262`	`+ return RuntimeTypeConverter.ConvertType(text, targetType);`
`264`	`263`	`}`
`265`	`264`	`catch (FormatException exception)`
`266`	`265`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public abstract class Identifiable : Identifiable<int>`
`16`	`16`	`/// </typeparam>`
`17`	`17`	`public abstract class Identifiable<TId> : IIdentifiable<TId>`
`18`	`18`	`{`
`19`		`- private static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();`
`20`		`-`
`21`	`19`	`/// <inheritdoc />`
`22`	`20`	`public virtual TId Id { get; set; }`
`23`	`21`
`@@ -46,7 +44,7 @@ protected virtual string GetStringId(TId value)`
`46`	`44`	`/// </summary>`
`47`	`45`	`protected virtual TId GetTypedId(string value)`
`48`	`46`	`{`
`49`		`- return value == null ? default : (TId)TypeConverter.ConvertType(value, typeof(TId));`
	`47`	`+ return value == null ? default : (TId)RuntimeTypeConverter.ConvertType(value, typeof(TId));`
`50`	`48`	`}`
`51`	`49`	`}`
`52`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`using System;`
`2`	`2`
	`3`	`+#pragma warning disable AV1008 // Class should not be static`
	`4`	`+`
`3`	`5`	`namespace JsonApiDotNetCore`
`4`	`6`	`{`
`5`		`- internal sealed class RuntimeTypeConverter`
	`7`	`+ internal static class RuntimeTypeConverter`
`6`	`8`	`{`
`7`		`- public object ConvertType(object value, Type type)`
	`9`	`+ public static object ConvertType(object value, Type type)`
`8`	`10`	`{`
`9`	`11`	`ArgumentGuard.NotNull(type, nameof(type));`
`10`	`12`
`@@ -73,12 +75,12 @@ public object ConvertType(object value, Type type)`
`73`	`75`	`}`
`74`	`76`	`}`
`75`	`77`
`76`		`- public bool CanContainNull(Type type)`
	`78`	`+ public static bool CanContainNull(Type type)`
`77`	`79`	`{`
`78`	`80`	`return !type.IsValueType \|\| Nullable.GetUnderlyingType(type) != null;`
`79`	`81`	`}`
`80`	`82`
`81`		`- public object GetDefaultValue(Type type)`
	`83`	`+ public static object GetDefaultValue(Type type)`
`82`	`84`	`{`
`83`	`85`	`return type.IsValueType ? Activator.CreateInstance(type) : null;`
`84`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ namespace JsonApiDotNetCore.Serialization`
`21`	`21`	`[PublicAPI]`
`22`	`22`	`public abstract class BaseDeserializer`
`23`	`23`	`{`
`24`		`- private protected static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();`
`25`	`24`	`private protected static readonly CollectionConverter CollectionConverter = new CollectionConverter();`
`26`	`25`
`27`	`26`	`protected IResourceContextProvider ResourceContextProvider { get; }`
`@@ -349,7 +348,7 @@ private object ConvertAttrValue(object newValue, Type targetType)`
`349`	`348`	`}`
`350`	`349`
`351`	`350`	`// the attribute value is a native C# type.`
`352`		`- object convertedValue = TypeConverter.ConvertType(newValue, targetType);`
	`351`	`+ object convertedValue = RuntimeTypeConverter.ConvertType(newValue, targetType);`
`353`	`352`	`return convertedValue;`
`354`	`353`	`}`
`355`	`354`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ namespace JsonApiDotNetCore.Serialization.Building`
`13`	`13`	`[PublicAPI]`
`14`	`14`	`public class ResourceObjectBuilder : IResourceObjectBuilder`
`15`	`15`	`{`
`16`		`- private static readonly RuntimeTypeConverter TypeConverter = new RuntimeTypeConverter();`
`17`	`16`	`private static readonly CollectionConverter CollectionConverter = new CollectionConverter();`
`18`	`17`
`19`	`18`	`private readonly ResourceObjectBuilderSettings _settings;`
`@@ -175,7 +174,7 @@ private void ProcessAttributes(IIdentifiable resource, IEnumerable<AttrAttribute`
`175`	`174`	`}`
`176`	`175`
`177`	`176`	`if (_settings.SerializerDefaultValueHandling == DefaultValueHandling.Ignore &&`
`178`		`- Equals(value, TypeConverter.GetDefaultValue(attr.Property.PropertyType)))`
	`177`	`+ Equals(value, RuntimeTypeConverter.GetDefaultValue(attr.Property.PropertyType)))`
`179`	`178`	`{`
`180`	`179`	`return;`
`181`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ private void AssertCompatibleId(ResourceIdentifierObject resourceIdentifierObjec`
`260`	`260`	`{`
`261`	`261`	`try`
`262`	`262`	`{`
`263`		`- TypeConverter.ConvertType(resourceIdentifierObject.Id, idType);`
	`263`	`+ RuntimeTypeConverter.ConvertType(resourceIdentifierObject.Id, idType);`
`264`	`264`	`}`
`265`	`265`	`catch (FormatException exception)`
`266`	`266`	`{`