zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-03 03:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

extracting all the cross-platform setup of HttpMessageHandler into

Browse Source 
a less awful class
This commit is contained in:
Brendan Forster
2015-05-31 19:23:39 +09:30
parent 5d0c8d6679
commit e5e4b4c8b0
12 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests.Integration/HttpClientAdapterTests.cs
+2 -2
View File
@@ -14,7 +14,7 @@ public class HttpClientAdapterTests
[IntegrationTest]
public async Task CanDownloadImage()
{
var httpClient = new HttpClientAdapter();
var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.GetHandler);
var request = new Request
{
BaseAddress = new Uri("https://github.global.ssl.fastly.net/", UriKind.Absolute),
@@ -36,7 +36,7 @@ public class HttpClientAdapterTests
[IntegrationTest]
public async Task CanCancelARequest()
{
var httpClient = new HttpClientAdapter();
var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.GetHandler);
var request = new Request
{
BaseAddress = new Uri("https://github.global.ssl.fastly.net/", UriKind.Absolute),
Octokit.Tests/Http/HttpClientAdapterTests.cs
+5 -5
View File
@@ -178,6 +178,11 @@ namespace Octokit.Tests.Http
sealed class HttpClientAdapterTester : HttpClientAdapter
{
public HttpClientAdapterTester()
: base (HttpMessageHandlerFactory.GetHandler)
{
}
public HttpRequestMessage BuildRequestMessageTester(IRequest request)
{
return BuildRequestMessage(request);
@@ -187,11 +192,6 @@ namespace Octokit.Tests.Http
{
return await BuildResponse(responseMessage);
}
protected override HttpClientHandler GetHandler()
{
return new HttpClientHandler();
}
}
}
Octokit/GlobalSuppressions.cs
BIN
View File
Binary file not shown.
Octokit/Http/Connection.cs
+1 -1
View File
@@ -92,7 +92,7 @@ namespace Octokit
/// <param name="credentialStore">Provides credentials to the client when making requests</param>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public Connection(ProductHeaderValue productInformation, Uri baseAddress, ICredentialStore credentialStore)
: this(productInformation, baseAddress, credentialStore, new HttpClientAdapter(), new SimpleJsonSerializer())
: this(productInformation, baseAddress, credentialStore, new HttpClientAdapter(HttpMessageHandlerFactory.GetHandler), new SimpleJsonSerializer())
{
}
Octokit/Http/HttpClientAdapter.cs
+4 -48
View File
@@ -18,40 +18,18 @@ namespace Octokit.Internal
/// </remarks>
public class HttpClientAdapter : IHttpClient
{
#if !PORTABLE
readonly IWebProxy _webProxy;
#endif
readonly HttpClient _http;
[SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public HttpClientAdapter()
public HttpClientAdapter(Func<HttpMessageHandler> getHandler)
{
var handler = GetHandler();
Ensure.ArgumentNotNull(getHandler, "getHandler");
var handler = getHandler();
_http = new HttpClient(new RedirectHandler { InnerHandler = handler });
}
#if !PORTABLE
[SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public HttpClientAdapter(IWebProxy webProxy)
{
_webProxy = webProxy;
var handler = GetHandler();
_http = new HttpClient(new RedirectHandler { InnerHandler = handler });
}
[SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public HttpClientAdapter(IWebProxy webProxy, HttpMessageHandler handler)
{
Ensure.ArgumentNotNull(handler, "handler");
_webProxy = webProxy;
_http = new HttpClient(new RedirectHandler { InnerHandler = handler});
}
#endif
/// <summary>
/// Sends the specified request and returns a response.
/// </summary>
@@ -89,28 +67,6 @@ namespace Octokit.Internal
return cancellationTokenForRequest;
}
[SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
protected virtual HttpClientHandler GetHandler()
{
var httpOptions = new HttpClientHandler
{
AllowAutoRedirect = false
};
#if !PORTABLE
if (httpOptions.SupportsAutomaticDecompression)
{
httpOptions.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
}
if (httpOptions.SupportsProxy && _webProxy != null)
{
httpOptions.UseProxy = true;
httpOptions.Proxy = _webProxy;
}
#endif
return httpOptions;
}
protected async virtual Task<IResponse> BuildResponse(HttpResponseMessage responseMessage)
{
Ensure.ArgumentNotNull(responseMessage, "responseMessage");
Octokit/Http/HttpMessageHandlerFactory.cs
+36
View File
@@ -0,0 +1,36 @@
using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Net.Http;
namespace Octokit.Internal
{
public static class HttpMessageHandlerFactory
{
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public static HttpClientHandler GetHandler()
{
return GetHandler(null);
}
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public static HttpClientHandler GetHandler(IWebProxy proxy)
{
var handler = new HttpClientHandler
{
AllowAutoRedirect = false
};
#if !PORTABLE
if (handler.SupportsAutomaticDecompression)
{
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
}
if (handler.SupportsProxy && proxy != null)
{
handler.UseProxy = true;
handler.Proxy = proxy;
}
#endif
return handler;
}
}
}
Octokit/Octokit-Mono.csproj
+1
View File
@@ -393,6 +393,7 @@
<Compile Include="Models\Response\PullRequestFile.cs" />
<Compile Include="Models\Request\PublicRepositoryRequest.cs" />
<Compile Include="Exceptions\TwoFactorAuthorizationException.cs" />
<Compile Include="Http\HttpMessageHandlerFactory.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
Octokit/Octokit-MonoAndroid.csproj
+1
View File
@@ -409,6 +409,7 @@
<Compile Include="Models\Request\RepositoryHooksPingRequest.cs" />
<Compile Include="Exceptions\TwoFactorAuthorizationException.cs" />
<Compile Include="Models\Request\RepositoryHookTestRequest.cs" />
<Compile Include="Http\HttpMessageHandlerFactory.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
</Project>
Octokit/Octokit-Monotouch.csproj
+1
View File
@@ -402,6 +402,7 @@
<Compile Include="Models\Request\RepositoryHooksPingRequest.cs" />
<Compile Include="Exceptions\TwoFactorAuthorizationException.cs" />
<Compile Include="Models\Request\RepositoryHookTestRequest.cs" />
<Compile Include="Http\HttpMessageHandlerFactory.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Octokit/Octokit-Portable.csproj
+2
View File
@@ -128,6 +128,7 @@
<Compile Include="Exceptions\NotFoundException.cs" />
<Compile Include="Exceptions\TwoFactorChallengeFailedException.cs" />
<Compile Include="Exceptions\TwoFactorRequiredException.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Helpers\ApiExtensions.cs" />
<Compile Include="Helpers\ApiUrls.cs" />
<Compile Include="Helpers\AuthorizationExtensions.cs" />
@@ -391,6 +392,7 @@
<Compile Include="Models\Response\PullRequestFile.cs" />
<Compile Include="Models\Request\PublicRepositoryRequest.cs" />
<Compile Include="Exceptions\TwoFactorAuthorizationException.cs" />
<Compile Include="Http\HttpMessageHandlerFactory.cs" />
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="..\CustomDictionary.xml">
Octokit/Octokit-netcore45.csproj
+2 -1
View File
@@ -395,6 +395,7 @@
<Compile Include="Models\Response\PullRequestFile.cs" />
<Compile Include="Models\Request\PublicRepositoryRequest.cs" />
<Compile Include="Exceptions\TwoFactorAuthorizationException.cs" />
<Compile Include="Http\HttpMessageHandlerFactory.cs" />
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="..\CustomDictionary.xml">
@@ -410,4 +411,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Octokit/Octokit.csproj
+1
View File
@@ -81,6 +81,7 @@
<Compile Include="Helpers\HttpClientExtensions.cs" />
<Compile Include="Helpers\PropertyOrField.cs" />
<Compile Include="Helpers\SerializeNullAttribute.cs" />
<Compile Include="Http\HttpMessageHandlerFactory.cs" />
<Compile Include="Http\ProductHeaderValue.cs" />
<Compile Include="Models\Request\GistFileUpdate.cs" />
<Compile Include="Models\Request\NewMerge.cs" />