refactoring ApiConnection.EmptyBody to RequestBody.Empty to break the…

… inverse dependency from Connection to ApiConnection

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]

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();

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)
             {

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>

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();
+    }
+}

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>

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>

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" />

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">

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">

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" />