Add string extensions & combine bool check

Author: clarkd

HubSpot.NET/Core/Extensions/StringExtensions.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HubSpot.NET.Core.Extensions
+{
+    public static class StringExtensions
+    {
+        public static bool IsNullOrEmpty(this string value)
+        {
+            return string.IsNullOrEmpty(value);
+        }
+    }
+}

HubSpot.NET/Core/Requests/RequestDataConverter.cs

@@ -3,6 +3,7 @@
 using System.Dynamic;
 using System.Linq;
 using System.Reflection;
+using HubSpot.NET.Core.Extensions;
 using HubSpot.NET.Core.Interfaces;
 
 namespace HubSpot.NET.Core.Requests
@@ -219,23 +220,21 @@ internal object ConvertSingleEntity(ExpandoObject dynamicObject, object dto)
 
                 if (targetProp != null)
                 {
-                    var isNullable = false;
-                    if (targetProp.PropertyType.Name.Contains("Nullable"))
-                    {
-                        isNullable = true;
-                    }
-                    Type t = Nullable.GetUnderlyingType(targetProp.PropertyType) ?? targetProp.PropertyType;
+                    var isNullable = targetProp.PropertyType.Name.Contains("Nullable");
+
+                    var type = Nullable.GetUnderlyingType(targetProp.PropertyType) ?? targetProp.PropertyType;
 
-                    // resolves bug where if the object property was a nullable number (int/double/etc.) and the value being processed
+                    // resolves issue where if the object property was a nullable number (int/double/etc.) and the value being processed
                     // was null or an empty string an exception 'string was not in the correct format' occurred.
-                    if (isNullable && (dynamicValue == null || string.IsNullOrEmpty(dynamicValue.ToString())))
+                    // see https://github.com/squaredup/HubSpot.NET/pull/8
+                    if (isNullable && (dynamicValue?.ToString()).IsNullOrEmpty())
                     {
                         // if nullable and the value to convert is null or an empty string it should not be converted
                         targetProp.SetValue(dto, null);
                     }
                     else
                     {
-                        var value = dynamicValue.GetType() == t ? dynamicValue : Convert.ChangeType(dynamicValue, t);
+                        var value = dynamicValue.GetType() == type ? dynamicValue : Convert.ChangeType(dynamicValue, type);
                         targetProp.SetValue(dto, value);
                     }
                 }