From b4d71c8fe936565ffec36e5b8d2f6df988d8873d Mon Sep 17 00:00:00 2001
From: David Alpert <david@spinthemoose.com>
Date: Fri, 31 Jul 2015 23:43:37 -0500
Subject: [PATCH] refactoring ApiConnection.EmptyBody to RequestBody.Empty to
 break the inverse dependency from Connection to ApiConnection

---
 Octokit.Tests/Clients/TeamsClientTests.cs |  2 +-
 Octokit.Tests/Http/ConnectionTests.cs     |  4 ++--
 Octokit/Clients/TeamsClient.cs            |  2 +-
 Octokit/Http/ApiConnection.cs             |  3 ---
 Octokit/Http/RequestBody.cs               | 12 ++++++++++++
 Octokit/Octokit-Mono.csproj               |  1 +
 Octokit/Octokit-MonoAndroid.csproj        |  1 +
 Octokit/Octokit-Monotouch.csproj          |  1 +
 Octokit/Octokit-Portable.csproj           |  1 +
 Octokit/Octokit-netcore45.csproj          |  1 +
 Octokit/Octokit.csproj                    |  1 +
 11 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 Octokit/Http/RequestBody.cs

diff --git a/Octokit.Tests/Clients/TeamsClientTests.cs b/Octokit.Tests/Clients/TeamsClientTests.cs
index a99513e06b..3ca76d5f8a 100644
--- 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<object>(u => u == ApiConnection.EmptyBody));
+                    Arg.Is<object>(u => u == RequestBody.Empty));
             }
 
             [Fact]
diff --git a/Octokit.Tests/Http/ConnectionTests.cs b/Octokit.Tests/Http/ConnectionTests.cs
index 64fae48a84..eebc34d821 100644
--- a/Octokit.Tests/Http/ConnectionTests.cs
+++ b/Octokit.Tests/Http/ConnectionTests.cs
@@ -371,7 +371,7 @@ public async Task MakesPutRequestWithData()
             [Fact]
             public async Task MakesPutRequestWithNoData()
             {
-                var body = ApiConnection.EmptyBody;
+                var body = RequestBody.Empty;
                 var expectedBody = SimpleJson.SerializeObject(body);
                 var httpClient = Substitute.For<IHttpClient>();
                 IResponse response = new Response();
@@ -421,7 +421,7 @@ public async Task MakesPutRequestWithDataAndTwoFactor()
             [Fact]
             public async Task MakesPutRequestWithNoDataAndTwoFactor()
             {
-                var body = ApiConnection.EmptyBody ;
+                var body = RequestBody.Empty;
                 var expectedBody = SimpleJson.SerializeObject(body);
                 var httpClient = Substitute.For<IHttpClient>();
                 IResponse response = new Response();
diff --git a/Octokit/Clients/TeamsClient.cs b/Octokit/Clients/TeamsClient.cs
index d2a5288cf5..002358142f 100644
--- 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, Octokit.ApiConnection.EmptyBody);
+                response = await ApiConnection.Put<Dictionary<string, string>>(endpoint, RequestBody.Empty);
             }
             catch (NotFoundException)
             {
diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs
index b9db71d347..9b1656f5bf 100644
--- a/Octokit/Http/ApiConnection.cs
+++ b/Octokit/Http/ApiConnection.cs
@@ -15,9 +15,6 @@ 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>
diff --git a/Octokit/Http/RequestBody.cs b/Octokit/Http/RequestBody.cs
new file mode 100644
index 0000000000..346e71d120
--- /dev/null
+++ b/Octokit/Http/RequestBody.cs
@@ -0,0 +1,12 @@
+namespace Octokit
+{
+    /// <summary>
+    /// Container for the static <see cref="Empty"/> method that represents an
+    /// intentional empty request body to avoid overloading <code>null</code>.
+    /// </summary>
+    public static class RequestBody
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2211:NonConstantFieldsShouldNotBeVisible")]
+        public static object Empty = new object();
+    }
+}
\ No newline at end of file
diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj
index 64daa00563..8b5eedaca9 100644
--- a/Octokit/Octokit-Mono.csproj
+++ b/Octokit/Octokit-Mono.csproj
@@ -399,6 +399,7 @@
     <Compile Include="Models\Response\ResourceRateLimit.cs" />
     <Compile Include="Models\Response\MiscellaneousRateLimit.cs" />
     <Compile Include="Exceptions\RepositoryFormatException.cs" />
+    <Compile Include="Http\RequestBody.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Octokit/Octokit-MonoAndroid.csproj b/Octokit/Octokit-MonoAndroid.csproj
index 9002587a63..a34a7b1ef9 100644
--- a/Octokit/Octokit-MonoAndroid.csproj
+++ b/Octokit/Octokit-MonoAndroid.csproj
@@ -415,6 +415,7 @@
     <Compile Include="Models\Response\ResourceRateLimit.cs" />
     <Compile Include="Models\Response\MiscellaneousRateLimit.cs" />
     <Compile Include="Exceptions\RepositoryFormatException.cs" />
+    <Compile Include="Http\RequestBody.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Octokit/Octokit-Monotouch.csproj b/Octokit/Octokit-Monotouch.csproj
index 607ec59518..3f4b6f9cfa 100644
--- a/Octokit/Octokit-Monotouch.csproj
+++ b/Octokit/Octokit-Monotouch.csproj
@@ -408,6 +408,7 @@
     <Compile Include="Models\Response\ResourceRateLimit.cs" />
     <Compile Include="Models\Response\MiscellaneousRateLimit.cs" />
     <Compile Include="Exceptions\RepositoryFormatException.cs" />
+    <Compile Include="Http\RequestBody.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/Octokit/Octokit-Portable.csproj b/Octokit/Octokit-Portable.csproj
index 74f211dfd1..36e840bd46 100644
--- a/Octokit/Octokit-Portable.csproj
+++ b/Octokit/Octokit-Portable.csproj
@@ -398,6 +398,7 @@
     <Compile Include="Models\Response\ResourceRateLimit.cs" />
     <Compile Include="Models\Response\MiscellaneousRateLimit.cs" />
     <Compile Include="Exceptions\RepositoryFormatException.cs" />
+    <Compile Include="Http\RequestBody.cs" />
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="..\CustomDictionary.xml">
diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj
index 944bb68159..17d8bae84e 100644
--- a/Octokit/Octokit-netcore45.csproj
+++ b/Octokit/Octokit-netcore45.csproj
@@ -402,6 +402,7 @@
     <Compile Include="Models\Response\ResourceRateLimit.cs" />
     <Compile Include="Models\Response\MiscellaneousRateLimit.cs" />
     <Compile Include="Exceptions\RepositoryFormatException.cs" />
+    <Compile Include="Http\RequestBody.cs" />
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="..\CustomDictionary.xml">
diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
index 60a9607f7c..760b5bfe67 100644
--- a/Octokit/Octokit.csproj
+++ b/Octokit/Octokit.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Helpers\SerializeNullAttribute.cs" />
     <Compile Include="Http\HttpMessageHandlerFactory.cs" />
     <Compile Include="Http\ProductHeaderValue.cs" />
+    <Compile Include="Http\RequestBody.cs" />
     <Compile Include="Models\Request\GistFileUpdate.cs" />
     <Compile Include="Models\Request\NewMerge.cs" />
     <Compile Include="Models\Request\PublicRepositoryRequest.cs" />