Skip to content
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

Jump to bottom

Added option to ignore URI parsing errors #1

Merged
merged 1 commit into from
May 3, 2022
Merged

Added option to ignore URI parsing errors #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/Microsoft.OData.Client/DataServiceContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ public DataServiceContext(Uri serviceRoot)
/// With Silverlight, the <paramref name="serviceRoot"/> can be a relative Uri
/// that will be combined with System.Windows.Browser.HtmlPage.Document.DocumentUri.
/// </remarks>
public DataServiceContext(Uri serviceRoot, ODataProtocolVersion maxProtocolVersion)
: this(serviceRoot, maxProtocolVersion, ClientEdmModelCache.GetModel(maxProtocolVersion))
public DataServiceContext(Uri serviceRoot, ODataProtocolVersion maxProtocolVersion, bool ignoreUriParsingErrors = false)
: this(serviceRoot, maxProtocolVersion, ClientEdmModelCache.GetModel(maxProtocolVersion), ignoreUriParsingErrors)
{
}

Expand All @@ -270,12 +270,12 @@ public DataServiceContext(Uri serviceRoot, ODataProtocolVersion maxProtocolVersi
/// With Silverlight, the <paramref name="serviceRoot"/> can be a relative Uri
/// that will be combined with System.Windows.Browser.HtmlPage.Document.DocumentUri.
/// </remarks>
internal DataServiceContext(Uri serviceRoot, ODataProtocolVersion maxProtocolVersion, ClientEdmModel model)
internal DataServiceContext(Uri serviceRoot, ODataProtocolVersion maxProtocolVersion, ClientEdmModel model, bool ignoreUriParsingErrors)
{
Debug.Assert(model != null, "model != null");
this.model = model;

this.baseUriResolver = UriResolver.CreateFromBaseUri(serviceRoot, ServiceRootParameterName);
this.baseUriResolver = UriResolver.CreateFromBaseUri(serviceRoot, ServiceRootParameterName, ignoreUriParsingErrors);
this.maxProtocolVersion = Util.CheckEnumerationValue(maxProtocolVersion, "maxProtocolVersion");
this.entityParameterSendOption = EntityParameterSendOption.SendFullProperties;
this.mergeOption = MergeOption.AppendOnly;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.OData.Client/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Microsoft.OData.Client.DataServiceCollection<T>.LoadNextPartialSetAsync() -> boo
Microsoft.OData.Client.DataServiceContext
Microsoft.OData.Client.DataServiceContext.DataServiceContext() -> void
Microsoft.OData.Client.DataServiceContext.DataServiceContext(System.Uri serviceRoot) -> void
Microsoft.OData.Client.DataServiceContext.DataServiceContext(System.Uri serviceRoot, Microsoft.OData.Client.ODataProtocolVersion maxProtocolVersion) -> void
Microsoft.OData.Client.DataServiceContext.DataServiceContext(System.Uri serviceRoot, Microsoft.OData.Client.ODataProtocolVersion maxProtocolVersion, bool ignoreUriParsingErrors = false) -> void
Microsoft.OData.Client.DataServiceContext.DefaultResolveType(string typeName, string fullNamespace, string languageDependentNamespace) -> System.Type
Microsoft.OData.Client.DataServiceContext.HttpRequestTransportMode.get -> Microsoft.OData.Client.HttpRequestTransportMode
Microsoft.OData.Client.DataServiceContext.HttpRequestTransportMode.set -> void
Expand Down
12 changes: 10 additions & 2 deletions src/Microsoft.OData.Client/UriResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,17 @@ internal Uri BaseUriOrNull
/// <param name="baseUri">The baseUri to use in the UriResolver</param>
/// <param name="parameterName">The name of the parameter that the user passed the baseUri in from.</param>
/// <returns>The new UriResolver using the passed in baseUri</returns>
internal static UriResolver CreateFromBaseUri(Uri baseUri, string parameterName)
internal static UriResolver CreateFromBaseUri(Uri baseUri, string parameterName, bool ignoreUriParsingErrors = false)
{
ConvertToAbsoluteAndValidateBaseUri(ref baseUri, parameterName);
if (ignoreUriParsingErrors)
{
baseUri = ConvertToAbsoluteUri(baseUri);
}
else
{
ConvertToAbsoluteAndValidateBaseUri(ref baseUri, parameterName);
}

return new UriResolver(baseUri, null);
}

Expand Down