From be9f446df485aa87db15bd587efe7a455cb41ef3 Mon Sep 17 00:00:00 2001 From: Haacked Date: Thu, 1 Jan 2015 20:40:10 -0800 Subject: [PATCH] Move Response to its own file and Internal namespace A class named "Response" could conflict with a lot of things. --- .../Clients/AuthorizationsClientTests.cs | 1 + Octokit.Tests/Clients/WatchedClientTests.cs | 1 + .../RateLimitExceededExceptionTests.cs | 1 + Octokit.sln | 1 + Octokit/Exceptions/ApiValidationException.cs | 1 + Octokit/Exceptions/AuthorizationException.cs | 1 + .../TwoFactorChallengeFailedException.cs | 1 + Octokit/Http/IResponse.cs | 16 -------------- Octokit/Http/Response.cs | 22 +++++++++++++++++++ Octokit/Octokit-Mono.csproj | 1 + Octokit/Octokit-MonoAndroid.csproj | 1 + Octokit/Octokit-Monotouch.csproj | 3 ++- Octokit/Octokit-Portable.csproj | 3 ++- Octokit/Octokit-netcore45.csproj | 1 + Octokit/Octokit.csproj | 1 + 15 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 Octokit/Http/Response.cs diff --git a/Octokit.Tests/Clients/AuthorizationsClientTests.cs b/Octokit.Tests/Clients/AuthorizationsClientTests.cs index 6b538e10..14f15a62 100644 --- a/Octokit.Tests/Clients/AuthorizationsClientTests.cs +++ b/Octokit.Tests/Clients/AuthorizationsClientTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Net; using System.Threading.Tasks; using NSubstitute; +using Octokit.Internal; using Octokit.Tests.Helpers; using Xunit; diff --git a/Octokit.Tests/Clients/WatchedClientTests.cs b/Octokit.Tests/Clients/WatchedClientTests.cs index 40d56889..c5ee0fc7 100644 --- a/Octokit.Tests/Clients/WatchedClientTests.cs +++ b/Octokit.Tests/Clients/WatchedClientTests.cs @@ -2,6 +2,7 @@ using System.Net; using System.Threading.Tasks; using NSubstitute; +using Octokit.Internal; using Xunit; namespace Octokit.Tests.Clients diff --git a/Octokit.Tests/Exceptions/RateLimitExceededExceptionTests.cs b/Octokit.Tests/Exceptions/RateLimitExceededExceptionTests.cs index 25463859..d8995038 100644 --- a/Octokit.Tests/Exceptions/RateLimitExceededExceptionTests.cs +++ b/Octokit.Tests/Exceptions/RateLimitExceededExceptionTests.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.IO; using System.Net; using System.Runtime.Serialization.Formatters.Binary; +using Octokit.Internal; using Xunit; namespace Octokit.Tests.Exceptions diff --git a/Octokit.sln b/Octokit.sln index d5be9bc8..1e2fb59b 100644 --- a/Octokit.sln +++ b/Octokit.sln @@ -101,6 +101,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {01687D54-1D87-4562-A721-C57F1C94052C} = {CEC9D451-6291-4EDF-971A-D398144FBF96} {B84274D7-BE51-4613-8DB1-58E7C0EC45A8} = {397C742D-291E-46BD-99A5-57BB6902FA7B} EndGlobalSection EndGlobal diff --git a/Octokit/Exceptions/ApiValidationException.cs b/Octokit/Exceptions/ApiValidationException.cs index 52771753..27f06a09 100644 --- a/Octokit/Exceptions/ApiValidationException.cs +++ b/Octokit/Exceptions/ApiValidationException.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Net; using System.Runtime.Serialization; +using Octokit.Internal; namespace Octokit { diff --git a/Octokit/Exceptions/AuthorizationException.cs b/Octokit/Exceptions/AuthorizationException.cs index 33fe7e59..a73eeb24 100644 --- a/Octokit/Exceptions/AuthorizationException.cs +++ b/Octokit/Exceptions/AuthorizationException.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Net; using System.Runtime.Serialization; +using Octokit.Internal; namespace Octokit { diff --git a/Octokit/Exceptions/TwoFactorChallengeFailedException.cs b/Octokit/Exceptions/TwoFactorChallengeFailedException.cs index 7e23a50e..0f367bdf 100644 --- a/Octokit/Exceptions/TwoFactorChallengeFailedException.cs +++ b/Octokit/Exceptions/TwoFactorChallengeFailedException.cs @@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis; using System.Net; using System.Runtime.Serialization; +using Octokit.Internal; namespace Octokit { diff --git a/Octokit/Http/IResponse.cs b/Octokit/Http/IResponse.cs index c853f966..5bba5564 100644 --- a/Octokit/Http/IResponse.cs +++ b/Octokit/Http/IResponse.cs @@ -25,20 +25,4 @@ namespace Octokit HttpStatusCode StatusCode { get; set; } string ContentType { get; set; } } - - public class Response : IResponse - { - public Response() - { - Headers = new Dictionary(); - } - - public object BodyAsObject { get; set; } - public string Body { get; set; } - public Dictionary Headers { get; private set; } - public Uri ResponseUri { get; set; } - public ApiInfo ApiInfo { get; set; } - public HttpStatusCode StatusCode { get; set; } - public string ContentType { get; set; } - } } diff --git a/Octokit/Http/Response.cs b/Octokit/Http/Response.cs new file mode 100644 index 00000000..b9221be5 --- /dev/null +++ b/Octokit/Http/Response.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Net; + +namespace Octokit.Internal +{ + public class Response : IResponse + { + public Response() + { + Headers = new Dictionary(); + } + + public object BodyAsObject { get; set; } + public string Body { get; set; } + public Dictionary Headers { get; private set; } + public Uri ResponseUri { get; set; } + public ApiInfo ApiInfo { get; set; } + public HttpStatusCode StatusCode { get; set; } + public string ContentType { get; set; } + } +} \ No newline at end of file diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj index b167a315..b0013d32 100644 --- a/Octokit/Octokit-Mono.csproj +++ b/Octokit/Octokit-Mono.csproj @@ -358,6 +358,7 @@ + \ No newline at end of file diff --git a/Octokit/Octokit-MonoAndroid.csproj b/Octokit/Octokit-MonoAndroid.csproj index 15740d1c..940a6be4 100644 --- a/Octokit/Octokit-MonoAndroid.csproj +++ b/Octokit/Octokit-MonoAndroid.csproj @@ -370,6 +370,7 @@ + \ No newline at end of file diff --git a/Octokit/Octokit-Monotouch.csproj b/Octokit/Octokit-Monotouch.csproj index 5b7eed16..7e9742cb 100644 --- a/Octokit/Octokit-Monotouch.csproj +++ b/Octokit/Octokit-Monotouch.csproj @@ -365,7 +365,8 @@ + - \ No newline at end of file + diff --git a/Octokit/Octokit-Portable.csproj b/Octokit/Octokit-Portable.csproj index 0470d1fe..10765c88 100644 --- a/Octokit/Octokit-Portable.csproj +++ b/Octokit/Octokit-Portable.csproj @@ -356,6 +356,7 @@ + @@ -386,4 +387,4 @@ --> - \ No newline at end of file + diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj index 9f17257f..55cd9bbe 100644 --- a/Octokit/Octokit-netcore45.csproj +++ b/Octokit/Octokit-netcore45.csproj @@ -360,6 +360,7 @@ + diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index 5e5e7d58..d7cbe304 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -80,6 +80,7 @@ +