replacing null with an empty object hung off ApiConnection as suggest…

…ed by @haacked
octokit · Aug 1, 2015 · 3f1bd13 · 3f1bd13
1 parent d458f8c
commit 3f1bd13
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Octokit.Tests/Clients/TeamsClientTests.cs b/Octokit.Tests/Clients/TeamsClientTests.cs
@@ -165,7 +165,7 @@ public async Task AllowsEmptyBody()
 
                 connection.Received().Put<Dictionary<string, string>>(
                     Arg.Is<Uri>(u => u.ToString() == "teams/1/memberships/user"),
-                    Arg.Is<string>(u => u == null));
+                    Arg.Is<object>(u => u == ApiConnection.EmptyBody));
             }
 
             [Fact]

diff --git a/Octokit/Clients/TeamsClient.cs b/Octokit/Clients/TeamsClient.cs
@@ -164,7 +164,7 @@ public async Task<TeamMembership> AddMembership(int id, string login)
 
             try
             {
-                response = await ApiConnection.Put<Dictionary<string, string>>(endpoint, null);
+                response = await ApiConnection.Put<Dictionary<string, string>>(endpoint, Octokit.ApiConnection.EmptyBody);
             }
             catch (NotFoundException)
             {

diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs
@@ -15,6 +15,9 @@ public class ApiConnection : IApiConnection
     {
         readonly IApiPagination _pagination;
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2211:NonConstantFieldsShouldNotBeVisible")]
+        public static object EmptyBody = new object();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiConnection"/> class.
         /// </summary>
-Original file line number
+Diff line change
@@ Expand Up @@
                 try
                 {
-                    response = await ApiConnection.Put<Dictionary<string, string>>(endpoint, null);
+                    response = await ApiConnection.Put<Dictionary<string, string>>(endpoint, Octokit.ApiConnection.EmptyBody);
                 }
                 catch (NotFoundException)
                 {
@@ Expand Down @@