zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2025-12-22 15:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop manufacturing Response objects just to create an exception

Browse Source
This commit is contained in:
Haacked
2015-01-01 22:23:04 -08:00
parent c2d51570fd
commit d8f50292e3
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Octokit/Exceptions/ApiException.cs
View File

@@ -32,7 +32,7 @@ namespace Octokit
/// <param name="message">The error message</param>
/// <param name="httpStatusCode">The HTTP status code from the response</param>
public ApiException(string message, HttpStatusCode httpStatusCode)
: this(new Response {Body = message, StatusCode = httpStatusCode})
: this(GetApiErrorFromExceptionMessage(message), httpStatusCode, null)
{
}
@@ -42,7 +42,7 @@ namespace Octokit
/// <param name="message">The error message</param>
/// <param name="innerException">The inner exception</param>
public ApiException(string message, Exception innerException)
: this(new Response { Body = message }, innerException)
: this(GetApiErrorFromExceptionMessage(message), 0, innerException)
{
}
@@ -76,10 +76,27 @@ namespace Octokit
protected ApiException(ApiException innerException)
{
Ensure.ArgumentNotNull(innerException, "innerException");
StatusCode = innerException.StatusCode;
ApiError = innerException.ApiError;
}
protected ApiException(HttpStatusCode statusCode, Exception innerException)
: base(null, innerException)
{
ApiError = new ApiError();
StatusCode = statusCode;
}
protected ApiException(ApiError apiError, HttpStatusCode statusCode, Exception innerException)
: base(null, innerException)
{
Ensure.ArgumentNotNull(apiError, "apiError");
ApiError = apiError;
StatusCode = statusCode;
}
public override string Message
{
get { return ApiErrorMessageSafe ?? "An error occurred with this API request"; }

3
Octokit/Exceptions/ApiValidationException.cs
View File

@@ -3,7 +3,6 @@ using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Runtime.Serialization;
using Octokit.Internal;
namespace Octokit
{
@@ -20,7 +19,7 @@ namespace Octokit
/// <summary>
/// Constructs an instance of ApiValidationException
/// </summary>
public ApiValidationException() : base(new Response { StatusCode = (HttpStatusCode)422})
public ApiValidationException() : base((HttpStatusCode)422, null)
{
}

8
Octokit/Exceptions/AuthorizationException.cs
View File

@@ -3,7 +3,6 @@ using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Runtime.Serialization;
using Octokit.Internal;
namespace Octokit
{
@@ -20,7 +19,7 @@ namespace Octokit
/// <summary>
/// Constructs an instance of AuthorizationException
/// </summary>
public AuthorizationException() : base(new Response { StatusCode = HttpStatusCode.Unauthorized })
public AuthorizationException() : base(HttpStatusCode.Unauthorized, null)
{
}
@@ -45,6 +44,11 @@ namespace Octokit
"AuthorizationException created with wrong status code");
}
public AuthorizationException(HttpStatusCode httpStatusCode, Exception innerException)
: base(httpStatusCode, innerException)
{
}
#if !NETFX_CORE
/// <summary>
/// Constructs an instance of AuthorizationException.

5
Octokit/Exceptions/TwoFactorChallengeFailedException.cs
View File

@@ -2,7 +2,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Runtime.Serialization;
using Octokit.Internal;
namespace Octokit
{
@@ -20,7 +19,7 @@ namespace Octokit
/// Constructs an instance of TwoFactorChallengeFailedException
/// </summary>
public TwoFactorChallengeFailedException() :
base(new Response { StatusCode = HttpStatusCode.Unauthorized })
base(HttpStatusCode.Unauthorized, null)
{
}
@@ -29,7 +28,7 @@ namespace Octokit
/// </summary>
/// <param name="innerException">The inner exception</param>
public TwoFactorChallengeFailedException(Exception innerException)
: base(new Response { StatusCode = HttpStatusCode.Unauthorized }, innerException)
: base(HttpStatusCode.Unauthorized, innerException)
{
}

4
Octokit/Exceptions/TwoFactorRequiredException.cs
View File

@@ -3,7 +3,6 @@ using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Runtime.Serialization;
using Octokit.Internal;
namespace Octokit
{
@@ -29,8 +28,9 @@ namespace Octokit
/// </summary>
/// <param name="twoFactorType">Expected 2FA response type</param>
public TwoFactorRequiredException(TwoFactorType twoFactorType)
: this(new Response { StatusCode = HttpStatusCode.Unauthorized}, twoFactorType)
: base(HttpStatusCode.Unauthorized, null)
{
TwoFactorType = twoFactorType;
}
/// <summary>