Skip to content

[Search] Substitute Uri.ToString() with Uri.AbsoluteUri #22421

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

Merged
Mohit-Chakraborty merged 1 commit into from
Jul 2, 2021
Merged

[Search] Substitute Uri.ToString() with Uri.AbsoluteUri #22421

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
1 change: 0 additions & 1 deletion sdk/search/Azure.Search.Documents/src/Azure.Search.Documents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
</Description>
<PackageTags>Azure Cognitive Search;Azure Search Documents;Azure Search;Search;Cognitive;Search Engine;Azure</PackageTags>
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
<EnableBannedApiAnalyzers>false</EnableBannedApiAnalyzers>
<!-- These are still firing but not valid -->
<NoWarn>$(NoWarn);AZC0007;AZC0004;AZC0001</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchResourceEncryptionKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public SearchResourceEncryptionKey(Uri vaultUri, string keyName, string keyVersi
public Uri VaultUri
{
get => new Uri(_vaultUri);
private set => _vaultUri = value.ToString();
private set => _vaultUri = value.AbsoluteUri;
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ internal SearchIndexClient(
private SearchServiceRestClient ServiceClient => LazyInitializer.EnsureInitialized(ref _serviceClient, () => new SearchServiceRestClient(
_clientDiagnostics,
_pipeline,
Endpoint.ToString(),
Endpoint.AbsoluteUri,
null,
_version.ToVersionString())
);
Expand All @@ -138,7 +138,7 @@ internal SearchIndexClient(
private IndexesRestClient IndexesClient => LazyInitializer.EnsureInitialized(ref _indexesClient, () => new IndexesRestClient(
_clientDiagnostics,
_pipeline,
Endpoint.ToString(),
Endpoint.AbsoluteUri,
null,
_version.ToVersionString())
);
Expand All @@ -149,7 +149,7 @@ internal SearchIndexClient(
private SynonymMapsRestClient SynonymMapsClient => LazyInitializer.EnsureInitialized(ref _synonymMapsClient, () => new SynonymMapsRestClient(
_clientDiagnostics,
_pipeline,
Endpoint.ToString(),
Endpoint.AbsoluteUri,
null,
_version.ToVersionString())
);
Expand Down
6 changes: 3 additions & 3 deletions sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public SearchIndexerClient(
private DataSourcesRestClient DataSourcesClient => LazyInitializer.EnsureInitialized(ref _dataSourcesClient, () => new DataSourcesRestClient(
_clientDiagnostics,
_pipeline,
Endpoint.ToString(),
Endpoint.AbsoluteUri,
null,
_version.ToVersionString())
);
Expand All @@ -106,7 +106,7 @@ public SearchIndexerClient(
private IndexersRestClient IndexersClient => LazyInitializer.EnsureInitialized(ref _indexersClient, () => new IndexersRestClient(
_clientDiagnostics,
_pipeline,
Endpoint.ToString(),
Endpoint.AbsoluteUri,
null,
_version.ToVersionString())
);
Expand All @@ -117,7 +117,7 @@ public SearchIndexerClient(
private SkillsetsRestClient SkillsetsClient => LazyInitializer.EnsureInitialized(ref _skillsetsClient, () => new SkillsetsRestClient(
_clientDiagnostics,
_pipeline,
Endpoint.ToString(),
Endpoint.AbsoluteUri,
null,
_version.ToVersionString())
);
Expand Down
2 changes: 1 addition & 1 deletion sdk/search/Azure.Search.Documents/src/Models/SearchContinuationToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static string Serialize(Uri nextPageUri, SearchOptions nextPageOptions)
{
writer.WriteStartObject();
writer.WriteString(s_apiVersionEncodedName, SearchClientOptions.ContinuationTokenVersion.ToVersionString());
writer.WriteString(s_nextLinkEncodedName, nextPageUri.ToString());
writer.WriteString(s_nextLinkEncodedName, nextPageUri.AbsoluteUri);
writer.WritePropertyName(s_nextPageParametersEncodedName);
writer.WriteObjectValue(nextPageOptions);
writer.WriteEndObject();
Expand Down
6 changes: 3 additions & 3 deletions sdk/search/Azure.Search.Documents/src/SearchClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public SearchClient(
Protocol = new DocumentsRestClient(
ClientDiagnostics,
Pipeline,
endpoint.ToString(),
endpoint.AbsoluteUri,
indexName,
null,
Version.ToVersionString());
Expand Down Expand Up @@ -234,7 +234,7 @@ internal SearchClient(
Protocol = new DocumentsRestClient(
ClientDiagnostics,
Pipeline,
endpoint.ToString(),
endpoint.AbsoluteUri,
IndexName,
null,
Version.ToVersionString());
Expand Down Expand Up @@ -1223,7 +1223,7 @@ private async Task<Response<IndexDocumentsResult>> IndexDocumentsInternal<T>(
Request request = message.Request;
request.Method = RequestMethod.Post;
RawRequestUriBuilder uri = new RawRequestUriBuilder();
uri.AppendRaw(Endpoint.ToString(), false);
uri.AppendRaw(Endpoint.AbsoluteUri, false);
uri.AppendRaw("/indexes('", false);
uri.AppendRaw(IndexName, true);
uri.AppendRaw("')", false);
Expand Down