TryParse throws if it gets a null value, and structs often have null values

shana · shana · commit 2d5892485787 · 2018-06-01T20:40:44.000+02:00
diff --git a/src/GitHub.Api/Cache/CacheContainer.cs b/src/GitHub.Api/Cache/CacheContainer.cs
@@ -162,7 +162,7 @@ public DateTimeOffset UpdatedTime
                 if (!updatedTimeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(updatedTimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(updatedTimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         updatedTimeValue = result;
                     }
diff --git a/src/GitHub.Api/Extensions/StringExtensions.cs b/src/GitHub.Api/Extensions/StringExtensions.cs
@@ -40,6 +40,11 @@ public static string ToNullIfEmpty(this string s)
             return String.IsNullOrEmpty(s) ? null : s;
         }
 
+        public static string ToEmptyIfNull(this string s)
+        {
+            return String.IsNullOrEmpty(s) ? String.Empty : s;
+        }
+
         public static bool StartsWith(this string s, char c)
         {
             if (String.IsNullOrEmpty(s)) return false;
diff --git a/src/GitHub.Api/Git/GitLock.cs b/src/GitHub.Api/Git/GitLock.cs
@@ -13,12 +13,13 @@ public struct GitLock
         public string path;
         public GitUser owner;
         [NotSerialized] public string lockedAtString;
+        private string LockedAtString { get { return lockedAtString != null ? lockedAtString : String.Empty; } }
         public DateTimeOffset locked_at
         {
             get
             {
                 DateTimeOffset dt;
-                if (!DateTimeOffset.TryParseExact(lockedAtString, Constants.Iso8601Formats,
+                if (!DateTimeOffset.TryParseExact(LockedAtString.ToEmptyIfNull(), Constants.Iso8601Formats,
                         CultureInfo.InvariantCulture, Constants.DateTimeStyle, out dt))
                 {
                     locked_at = DateTimeOffset.MinValue;
diff --git a/src/GitHub.Api/Git/GitLogEntry.cs b/src/GitHub.Api/Git/GitLogEntry.cs
@@ -68,7 +68,7 @@ public DateTimeOffset Time
                 if (!timeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(TimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(TimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))
                     {
                         timeValue = result;
                     }
@@ -95,7 +95,7 @@ public DateTimeOffset CommitTime
                 if (!commitTimeValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(CommitTimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(CommitTimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         commitTimeValue = result;
                     }
@@ -216,4 +216,4 @@ public override string ToString()
             return sb.ToString();
         }
     }
-}
+}
diff --git a/src/GitHub.Api/Platform/Settings.cs b/src/GitHub.Api/Platform/Settings.cs
@@ -74,7 +74,7 @@ public override string Get(string key, string fallback = "")
                 if (typeof(T) == typeof(DateTimeOffset))
                 {
                     DateTimeOffset dt;
-                    if (DateTimeOffset.TryParseExact(value?.ToString(), Constants.Iso8601Formats,
+                    if (DateTimeOffset.TryParseExact(value?.ToString().ToEmptyIfNull(), Constants.Iso8601Formats,
                         CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
                     {
                         value = dt;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -38,7 +38,7 @@ public DateTimeOffset FirstRunAt
                 if (!firstRunAtValue.HasValue)
                 {
                     DateTimeOffset dt;
-                    if (!DateTimeOffset.TryParseExact(firstRunAtString, Constants.Iso8601Formats,
+                    if (!DateTimeOffset.TryParseExact(firstRunAtString.ToEmptyIfNull(), Constants.Iso8601Formats,
                             CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
                     {
                         dt = DateTimeOffset.Now;
@@ -261,7 +261,7 @@ public DateTimeOffset LastUpdatedAt
                 if (!lastUpdatedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         lastUpdatedAtValue = result;
                     }
@@ -287,7 +287,7 @@ public DateTimeOffset InitializedAt
                 if (!initializedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(InitializedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(InitializedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         initializedAtValue = result;
                     }
diff --git a/src/tests/IntegrationTests/CachingClasses.cs b/src/tests/IntegrationTests/CachingClasses.cs
@@ -184,7 +184,7 @@ public DateTimeOffset LastUpdatedAt
                 if (!lastUpdatedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(LastUpdatedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         lastUpdatedAtValue = result;
                     }
@@ -210,7 +210,7 @@ public DateTimeOffset InitializedAt
                 if (!initializedAtValue.HasValue)
                 {
                     DateTimeOffset result;
-                    if (DateTimeOffset.TryParseExact(InitializedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTimeOffset.TryParseExact(InitializedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
                         initializedAtValue = result;
                     }

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public DateTimeOffset UpdatedTime`
`162`	`162`	`if (!updatedTimeValue.HasValue)`
`163`	`163`	`{`
`164`	`164`	`DateTimeOffset result;`
`165`		`- if (DateTimeOffset.TryParseExact(updatedTimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`165`	`+ if (DateTimeOffset.TryParseExact(updatedTimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
`166`	`166`	`{`
`167`	`167`	`updatedTimeValue = result;`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,11 @@ public static string ToNullIfEmpty(this string s)`
`40`	`40`	`return String.IsNullOrEmpty(s) ? null : s;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ public static string ToEmptyIfNull(this string s)`
	`44`	`+ {`
	`45`	`+ return String.IsNullOrEmpty(s) ? String.Empty : s;`
	`46`	`+ }`
	`47`	`+`
`43`	`48`	`public static bool StartsWith(this string s, char c)`
`44`	`49`	`{`
`45`	`50`	`if (String.IsNullOrEmpty(s)) return false;`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,13 @@ public struct GitLock`
`13`	`13`	`public string path;`
`14`	`14`	`public GitUser owner;`
`15`	`15`	`[NotSerialized] public string lockedAtString;`
	`16`	`+ private string LockedAtString { get { return lockedAtString != null ? lockedAtString : String.Empty; } }`
`16`	`17`	`public DateTimeOffset locked_at`
`17`	`18`	`{`
`18`	`19`	`get`
`19`	`20`	`{`
`20`	`21`	`DateTimeOffset dt;`
`21`		`- if (!DateTimeOffset.TryParseExact(lockedAtString, Constants.Iso8601Formats,`
	`22`	`+ if (!DateTimeOffset.TryParseExact(LockedAtString.ToEmptyIfNull(), Constants.Iso8601Formats,`
`22`	`23`	`CultureInfo.InvariantCulture, Constants.DateTimeStyle, out dt))`
`23`	`24`	`{`
`24`	`25`	`locked_at = DateTimeOffset.MinValue;`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public DateTimeOffset Time`
`68`	`68`	`if (!timeValue.HasValue)`
`69`	`69`	`{`
`70`	`70`	`DateTimeOffset result;`
`71`		`- if (DateTimeOffset.TryParseExact(TimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))`
	`71`	`+ if (DateTimeOffset.TryParseExact(TimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))`
`72`	`72`	`{`
`73`	`73`	`timeValue = result;`
`74`	`74`	`}`
`@@ -95,7 +95,7 @@ public DateTimeOffset CommitTime`
`95`	`95`	`if (!commitTimeValue.HasValue)`
`96`	`96`	`{`
`97`	`97`	`DateTimeOffset result;`
`98`		`- if (DateTimeOffset.TryParseExact(CommitTimeString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`98`	`+ if (DateTimeOffset.TryParseExact(CommitTimeString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
`99`	`99`	`{`
`100`	`100`	`commitTimeValue = result;`
`101`	`101`	`}`
`@@ -216,4 +216,4 @@ public override string ToString()`
`216`	`216`	`return sb.ToString();`
`217`	`217`	`}`
`218`	`218`	`}`
`219`		`-}`
	`219`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public override string Get(string key, string fallback = "")`
`74`	`74`	`if (typeof(T) == typeof(DateTimeOffset))`
`75`	`75`	`{`
`76`	`76`	`DateTimeOffset dt;`
`77`		`- if (DateTimeOffset.TryParseExact(value?.ToString(), Constants.Iso8601Formats,`
	`77`	`+ if (DateTimeOffset.TryParseExact(value?.ToString().ToEmptyIfNull(), Constants.Iso8601Formats,`
`78`	`78`	`CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))`
`79`	`79`	`{`
`80`	`80`	`value = dt;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public DateTimeOffset FirstRunAt`
`38`	`38`	`if (!firstRunAtValue.HasValue)`
`39`	`39`	`{`
`40`	`40`	`DateTimeOffset dt;`
`41`		`- if (!DateTimeOffset.TryParseExact(firstRunAtString, Constants.Iso8601Formats,`
	`41`	`+ if (!DateTimeOffset.TryParseExact(firstRunAtString.ToEmptyIfNull(), Constants.Iso8601Formats,`
`42`	`42`	`CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))`
`43`	`43`	`{`
`44`	`44`	`dt = DateTimeOffset.Now;`
`@@ -261,7 +261,7 @@ public DateTimeOffset LastUpdatedAt`
`261`	`261`	`if (!lastUpdatedAtValue.HasValue)`
`262`	`262`	`{`
`263`	`263`	`DateTimeOffset result;`
`264`		`- if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`264`	`+ if (DateTimeOffset.TryParseExact(LastUpdatedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
`265`	`265`	`{`
`266`	`266`	`lastUpdatedAtValue = result;`
`267`	`267`	`}`
`@@ -287,7 +287,7 @@ public DateTimeOffset InitializedAt`
`287`	`287`	`if (!initializedAtValue.HasValue)`
`288`	`288`	`{`
`289`	`289`	`DateTimeOffset result;`
`290`		`- if (DateTimeOffset.TryParseExact(InitializedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`290`	`+ if (DateTimeOffset.TryParseExact(InitializedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
`291`	`291`	`{`
`292`	`292`	`initializedAtValue = result;`
`293`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public DateTimeOffset LastUpdatedAt`
`184`	`184`	`if (!lastUpdatedAtValue.HasValue)`
`185`	`185`	`{`
`186`	`186`	`DateTimeOffset result;`
`187`		`- if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`187`	`+ if (DateTimeOffset.TryParseExact(LastUpdatedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
`188`	`188`	`{`
`189`	`189`	`lastUpdatedAtValue = result;`
`190`	`190`	`}`
`@@ -210,7 +210,7 @@ public DateTimeOffset InitializedAt`
`210`	`210`	`if (!initializedAtValue.HasValue)`
`211`	`211`	`{`
`212`	`212`	`DateTimeOffset result;`
`213`		`- if (DateTimeOffset.TryParseExact(InitializedAtString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
	`213`	`+ if (DateTimeOffset.TryParseExact(InitializedAtString.ToEmptyIfNull(), Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))`
`214`	`214`	`{`
`215`	`215`	`initializedAtValue = result;`
`216`	`216`	`}`