-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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.
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
Refactor RepositoryHandler and ResolverClient #18857
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||
// Licensed under the MIT License. | ||
|
||
using Azure.Core; | ||
using Azure.Core.Pipeline; | ||
using Azure.Iot.ModelsRepository.Fetchers; | ||
using System; | ||
|
@@ -16,19 +17,22 @@ internal class RepositoryHandler | |
private readonly IModelFetcher _modelFetcher; | ||
private readonly Guid _clientId; | ||
private readonly ClientDiagnostics _clientDiagnostics; | ||
private readonly Uri _repositoryUri; | ||
private readonly ResolverClientOptions _clientOptions; | ||
|
||
public Uri RepositoryUri { get; } | ||
public ResolverClientOptions ClientOptions { get; } | ||
|
||
public RepositoryHandler(Uri repositoryUri, ClientDiagnostics clientdiagnostics, ResolverClientOptions options = null) | ||
public RepositoryHandler(Uri repositoryUri, ClientDiagnostics clientDiagnostics, ResolverClientOptions options) | ||
{ | ||
ClientOptions = options ?? new ResolverClientOptions(); | ||
RepositoryUri = repositoryUri; | ||
_clientDiagnostics = clientdiagnostics; | ||
Argument.AssertNotNull(options, nameof(options)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Options shouldn't be null and we will not create a new instance if it is, the ResolverClient ctor will take care of it. |
||
|
||
_clientOptions = options; | ||
_clientDiagnostics = clientDiagnostics; | ||
_modelFetcher = repositoryUri.Scheme == "file" | ||
? _modelFetcher = new LocalModelFetcher(_clientDiagnostics, ClientOptions) | ||
: _modelFetcher = new RemoteModelFetcher(_clientDiagnostics, ClientOptions); | ||
? _modelFetcher = new LocalModelFetcher(_clientDiagnostics, _clientOptions) | ||
: _modelFetcher = new RemoteModelFetcher(_clientDiagnostics, _clientOptions); | ||
_clientId = Guid.NewGuid(); | ||
|
||
_repositoryUri = repositoryUri; | ||
|
||
ResolverEventSource.Instance.InitFetcher(_clientId, repositoryUri.Scheme); | ||
} | ||
|
||
|
@@ -91,7 +95,7 @@ private async Task<IDictionary<string, string>> ProcessAsync(IEnumerable<string> | |
|
||
ModelMetadata metadata = new ModelQuery(result.Definition).GetMetadata(); | ||
|
||
if (ClientOptions.DependencyResolution >= DependencyResolutionOption.Enabled) | ||
if (_clientOptions.DependencyResolution >= DependencyResolutionOption.Enabled) | ||
{ | ||
IList<string> dependencies = metadata.Dependencies; | ||
|
||
|
@@ -124,7 +128,7 @@ private async Task<FetchResult> FetchAsync(string dtmi, CancellationToken cancel | |
{ | ||
try | ||
{ | ||
return await _modelFetcher.FetchAsync(dtmi, RepositoryUri, cancellationToken).ConfigureAwait(false); | ||
return await _modelFetcher.FetchAsync(dtmi, _repositoryUri, cancellationToken).ConfigureAwait(false); | ||
} | ||
catch (Exception ex) | ||
{ | ||
|
@@ -136,7 +140,7 @@ private FetchResult Fetch(string dtmi, CancellationToken cancellationToken) | |
{ | ||
try | ||
{ | ||
return _modelFetcher.Fetch(dtmi, RepositoryUri, cancellationToken); | ||
return _modelFetcher.Fetch(dtmi, _repositoryUri, cancellationToken); | ||
} | ||
catch (Exception ex) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only other place that these properties are accessed is in the ResolverClient that actually passes these down to the RepositoryHandler itself, no need to have backward references as ResolverClient knows about these values already.