From 390949843787077400ca90e63ddefb4a926d67c9 Mon Sep 17 00:00:00 2001 From: Tim Sneed Date: Fri, 28 Feb 2014 06:33:44 -0600 Subject: [PATCH 1/4] Internalize ProductHeaderValue What Haacked, PaulBetts, and Shiftkey suggested --- .../Clients/AssigneesClientTests.cs | 1 - .../Clients/BlobClientTests.cs | 1 - .../Clients/BranchesClientTests.cs | 1 - .../Clients/CommitStatusClientTests.cs | 3 +- .../Clients/CommitsClientTests.cs | 1 - .../Clients/DeploymentStatusClientTests.cs | 1 - .../Clients/DeploymentsClientTests.cs | 1 - .../Clients/FollowersClientTests.cs | 1 - .../Clients/GistsClientTests.cs | 3 +- .../Clients/IssuesClientTests.cs | 1 - .../Clients/IssuesEventsClientTests.cs | 1 - .../Clients/IssuesLabelsClientTests.cs | 4 -- .../Clients/MilestonesClientTests.cs | 1 - .../Clients/MiscellaneousClientTests.cs | 3 +- .../Clients/PullRequestsClientTests.cs | 1 - .../Clients/ReferencesClientTests.cs | 1 - .../Clients/ReleasesClientTests.cs | 1 - .../Clients/RepositoriesClientTests.cs | 1 - .../Clients/TreeClientTests.cs | 1 - .../Clients/UsersClientTests.cs | 1 - .../Reactive/ObservableIssuesClientTests.cs | 1 - Octokit/GitHubClient.cs | 1 - Octokit/Http/ProductHeaderValue.cs | 70 +++++++++++++++++++ Octokit/Octokit-Mono.csproj | 1 + Octokit/Octokit-MonoAndroid.csproj | 1 + Octokit/Octokit-Monotouch.csproj | 1 + Octokit/Octokit-netcore45.csproj | 1 + Octokit/Octokit.csproj | 1 + clean-up-after-tests/Program.cs | 1 - 29 files changed, 78 insertions(+), 29 deletions(-) create mode 100644 Octokit/Http/ProductHeaderValue.cs diff --git a/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs b/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs index bf628e32b1..a7beba26bb 100644 --- a/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/BlobClientTests.cs b/Octokit.Tests.Integration/Clients/BlobClientTests.cs index 72364dfef0..cdd72be39a 100644 --- a/Octokit.Tests.Integration/Clients/BlobClientTests.cs +++ b/Octokit.Tests.Integration/Clients/BlobClientTests.cs @@ -1,5 +1,4 @@ using System; -using System.Net.Http.Headers; using Octokit; using Octokit.Tests.Integration; using System.Threading.Tasks; diff --git a/Octokit.Tests.Integration/Clients/BranchesClientTests.cs b/Octokit.Tests.Integration/Clients/BranchesClientTests.cs index c0ac66bc2d..209bbeff24 100644 --- a/Octokit.Tests.Integration/Clients/BranchesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/BranchesClientTests.cs @@ -1,5 +1,4 @@ using System; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs b/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs index b22e5caad4..67b8a71d87 100644 --- a/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs +++ b/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs @@ -1,5 +1,4 @@ -using System.Net.Http.Headers; -using System.Threading.Tasks; +using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; using Xunit; diff --git a/Octokit.Tests.Integration/Clients/CommitsClientTests.cs b/Octokit.Tests.Integration/Clients/CommitsClientTests.cs index ae7df594f4..a95dd1e154 100644 --- a/Octokit.Tests.Integration/Clients/CommitsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/CommitsClientTests.cs @@ -1,5 +1,4 @@ using System; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs index 025e3b564f..11771cd445 100644 --- a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs +++ b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs @@ -1,7 +1,6 @@ using Octokit; using Octokit.Tests.Integration; using System; -using System.Net.Http.Headers; using System.Threading.Tasks; using Xunit; diff --git a/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs b/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs index 3262e3cd19..45e0c88311 100644 --- a/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs @@ -1,7 +1,6 @@ using Octokit; using Octokit.Tests.Integration; using System; -using System.Net.Http.Headers; using System.Threading.Tasks; using Xunit; diff --git a/Octokit.Tests.Integration/Clients/FollowersClientTests.cs b/Octokit.Tests.Integration/Clients/FollowersClientTests.cs index 4d7f1e0f5b..5e4ddb053f 100644 --- a/Octokit.Tests.Integration/Clients/FollowersClientTests.cs +++ b/Octokit.Tests.Integration/Clients/FollowersClientTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Octokit; diff --git a/Octokit.Tests.Integration/Clients/GistsClientTests.cs b/Octokit.Tests.Integration/Clients/GistsClientTests.cs index a5a49411c6..4b5ac95b3c 100644 --- a/Octokit.Tests.Integration/Clients/GistsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/GistsClientTests.cs @@ -1,5 +1,4 @@ -using System.Net.Http.Headers; -using System.Threading.Tasks; +using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; using Xunit; diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs index 2405aae5e7..2a224262f4 100644 --- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs @@ -1,7 +1,6 @@ using System; using System.Globalization; using System.Linq; -using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; using Octokit; diff --git a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs index 105384b028..6f2f047952 100644 --- a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; using Octokit; diff --git a/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs index 6918cb5aea..7d74663fea 100644 --- a/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Net.Http.Headers; -using System.Threading; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs index ab689ca113..9b6a891984 100644 --- a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs b/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs index afd8a49922..c415060d3e 100644 --- a/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs +++ b/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs @@ -1,5 +1,4 @@ -using System.Net.Http.Headers; -using System.Threading.Tasks; +using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; using Xunit; diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs index acd63cf4ac..ffe07aa251 100644 --- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs b/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs index 0ec895ee4c..e88b1fab94 100644 --- a/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Helpers; diff --git a/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs b/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs index 26f8410d50..c8a64942eb 100644 --- a/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs index 4d94f81053..cceb0ccabd 100644 --- a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/TreeClientTests.cs b/Octokit.Tests.Integration/Clients/TreeClientTests.cs index 9017778c9f..828dc415ac 100644 --- a/Octokit.Tests.Integration/Clients/TreeClientTests.cs +++ b/Octokit.Tests.Integration/Clients/TreeClientTests.cs @@ -1,5 +1,4 @@ using System; -using System.Net.Http.Headers; using System.Threading.Tasks; using Octokit; using Octokit.Tests.Integration; diff --git a/Octokit.Tests.Integration/Clients/UsersClientTests.cs b/Octokit.Tests.Integration/Clients/UsersClientTests.cs index c4e1bfd288..ccfa4b50f5 100644 --- a/Octokit.Tests.Integration/Clients/UsersClientTests.cs +++ b/Octokit.Tests.Integration/Clients/UsersClientTests.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Net; -using System.Net.Http.Headers; using System.Reactive.Linq; using System.Threading.Tasks; using Octokit; diff --git a/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs index 834a3a2e38..488447fe4b 100644 --- a/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs +++ b/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs @@ -1,7 +1,6 @@ using Octokit; using Octokit.Reactive; using System; -using System.Net.Http.Headers; using System.Reactive.Linq; using System.Threading.Tasks; using Octokit.Tests.Integration; diff --git a/Octokit/GitHubClient.cs b/Octokit/GitHubClient.cs index 8e6604878f..00f7840541 100644 --- a/Octokit/GitHubClient.cs +++ b/Octokit/GitHubClient.cs @@ -1,5 +1,4 @@ using System; -using System.Net.Http.Headers; using Octokit.Internal; namespace Octokit diff --git a/Octokit/Http/ProductHeaderValue.cs b/Octokit/Http/ProductHeaderValue.cs new file mode 100644 index 0000000000..4b8116fb6c --- /dev/null +++ b/Octokit/Http/ProductHeaderValue.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Octokit +{ + public class ProductHeaderValue + { + ProductHeaderValue() + { + + } + + public ProductHeaderValue(string name) + { + _productHeaderValue = new System.Net.Http.Headers.ProductHeaderValue(name); + + } + + public ProductHeaderValue(string name, string value) + { + _productHeaderValue = new System.Net.Http.Headers.ProductHeaderValue(name, value); + } + + System.Net.Http.Headers.ProductHeaderValue _productHeaderValue; + + + public string Name + { + get { return _productHeaderValue.Name; } + } + + public string Version + { + get { return _productHeaderValue.Version; } + } + + public override bool Equals(object obj) + { + return _productHeaderValue.Equals(obj); + } + + public override int GetHashCode() + { + return _productHeaderValue.GetHashCode(); + } + + public override string ToString() + { + return _productHeaderValue.ToString(); + } + + public static ProductHeaderValue Parse(string input) + { + return new ProductHeaderValue { _productHeaderValue = System.Net.Http.Headers.ProductHeaderValue.Parse(input) }; + } + + public static bool TryParse(string input, + out ProductHeaderValue parsedValue) + { + System.Net.Http.Headers.ProductHeaderValue value; + var result = System.Net.Http.Headers.ProductHeaderValue.TryParse(input, out value); + parsedValue = result ? Parse(input) : null; + return result; + + } + } +} \ No newline at end of file diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj index 62434eae69..2be11b707e 100644 --- a/Octokit/Octokit-Mono.csproj +++ b/Octokit/Octokit-Mono.csproj @@ -297,6 +297,7 @@ + \ No newline at end of file diff --git a/Octokit/Octokit-MonoAndroid.csproj b/Octokit/Octokit-MonoAndroid.csproj index 2f28263d0a..dffcde40e6 100644 --- a/Octokit/Octokit-MonoAndroid.csproj +++ b/Octokit/Octokit-MonoAndroid.csproj @@ -308,6 +308,7 @@ + \ No newline at end of file diff --git a/Octokit/Octokit-Monotouch.csproj b/Octokit/Octokit-Monotouch.csproj index 96608bc0ff..b2da9ac37b 100644 --- a/Octokit/Octokit-Monotouch.csproj +++ b/Octokit/Octokit-Monotouch.csproj @@ -303,6 +303,7 @@ + \ No newline at end of file diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj index 098412369d..e3c5be32af 100644 --- a/Octokit/Octokit-netcore45.csproj +++ b/Octokit/Octokit-netcore45.csproj @@ -295,6 +295,7 @@ + diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index 5d0559fca5..87c7a51e6b 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -59,6 +59,7 @@ + diff --git a/clean-up-after-tests/Program.cs b/clean-up-after-tests/Program.cs index 44d9c4a7a7..d2d5edb1c2 100644 --- a/clean-up-after-tests/Program.cs +++ b/clean-up-after-tests/Program.cs @@ -1,5 +1,4 @@ using System; -using System.Net.Http.Headers; using System.Text.RegularExpressions; using System.Threading.Tasks; using Octokit; From 702fc5e0fc5358eec1d2625ad4ec7dd911ca37d6 Mon Sep 17 00:00:00 2001 From: Tim Sneed Date: Fri, 28 Feb 2014 11:07:10 -0600 Subject: [PATCH 2/4] Removed new line, doh. --- Octokit/Http/ProductHeaderValue.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Octokit/Http/ProductHeaderValue.cs b/Octokit/Http/ProductHeaderValue.cs index 4b8116fb6c..ac6e6a776e 100644 --- a/Octokit/Http/ProductHeaderValue.cs +++ b/Octokit/Http/ProductHeaderValue.cs @@ -64,7 +64,6 @@ public static bool TryParse(string input, var result = System.Net.Http.Headers.ProductHeaderValue.TryParse(input, out value); parsedValue = result ? Parse(input) : null; return result; - } } } \ No newline at end of file From 7dc9c55ba6e5a327ec2b1eb4ce4dc24ab27d5f30 Mon Sep 17 00:00:00 2001 From: Tim Sneed Date: Fri, 28 Feb 2014 11:30:02 -0600 Subject: [PATCH 3/4] More newlines And usings :thumbsup: --- Octokit/Http/ProductHeaderValue.cs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Octokit/Http/ProductHeaderValue.cs b/Octokit/Http/ProductHeaderValue.cs index ac6e6a776e..bf98966b93 100644 --- a/Octokit/Http/ProductHeaderValue.cs +++ b/Octokit/Http/ProductHeaderValue.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Octokit +namespace Octokit { public class ProductHeaderValue { @@ -16,7 +10,6 @@ public class ProductHeaderValue public ProductHeaderValue(string name) { _productHeaderValue = new System.Net.Http.Headers.ProductHeaderValue(name); - } public ProductHeaderValue(string name, string value) @@ -26,7 +19,6 @@ public ProductHeaderValue(string name, string value) System.Net.Http.Headers.ProductHeaderValue _productHeaderValue; - public string Name { get { return _productHeaderValue.Name; } From 813419fa3ea5cd3e83525d36a8606dda429f8e42 Mon Sep 17 00:00:00 2001 From: Tim Sneed Date: Fri, 28 Feb 2014 11:32:14 -0600 Subject: [PATCH 4/4] Third Time's a charm --- Octokit/Http/ProductHeaderValue.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Octokit/Http/ProductHeaderValue.cs b/Octokit/Http/ProductHeaderValue.cs index bf98966b93..0881f41719 100644 --- a/Octokit/Http/ProductHeaderValue.cs +++ b/Octokit/Http/ProductHeaderValue.cs @@ -2,10 +2,7 @@ { public class ProductHeaderValue { - ProductHeaderValue() - { - - } + ProductHeaderValue() { } public ProductHeaderValue(string name) {