Skip to content

Feature/70 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaaabcv wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/70 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72dec85
Do not modify resource property when calling get method
Dec 21, 2019
cbf1649
Add unit test
Dec 21, 2019
787765e
Let unit test actually run
Dec 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/PortableRest.Tests/ResourceUriTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,15 @@ public void BuildResourceUriWhereResourceUriIsNull()
Assert.AreEqual("https://www.googleapis.com/discovery/v1/apis?&name=adexchangebuyer",
request.GetResourceUri("https://www.googleapis.com/discovery/v1/apis?&name=adexchangebuyer").ToString());
}

[TestMethod]
public void TestUriIdempodence()
{
var request = new RestRequest("/test");
request.AddQueryString("test", "value");
var originalResource = request.Resource;
request.GetResourceUri("http://some.base.url");
Assert.AreEqual(originalResource, request.Resource);
}
}
}
9 changes: 5 additions & 4 deletions src/PortableRest/RestRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,10 @@ public void AddQueryString(string key, object value)
/// <returns></returns>
public Uri GetResourceUri(string baseUrl)
{
string resource = Resource;
foreach (var segment in UrlSegments.Where(c => !c.IsQueryString))
{
Resource = Resource.Replace("{" + segment.Key + "}", Uri.EscapeUriString(segment.Value));
resource = resource.Replace("{" + segment.Key + "}", Uri.EscapeUriString(segment.Value));
}

if (UrlSegments.Any(c => c.IsQueryString))
Expand All @@ -265,12 +266,12 @@ public Uri GetResourceUri(string baseUrl)
current.Append(string.Format("&{0}={1}", Uri.EscapeUriString(next.Key), Uri.EscapeDataString(next.Value))))
.ToString();

Resource = string.Format(Resource.Contains("?") ? "{0}{1}" : "{0}?{1}", Resource, queryString);
resource = string.Format(resource.Contains("?") ? "{0}{1}" : "{0}?{1}", resource, queryString);
}

Resource = CombineUriParts(baseUrl, Resource);
resource = CombineUriParts(baseUrl, resource);

return new Uri(Resource, UriKind.RelativeOrAbsolute);
return new Uri(resource, UriKind.RelativeOrAbsolute);
}

#endregion
Expand Down