Refactor to not send the same element through multiple objects #3282
Conversation
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
abhipsaMisra
requested review from
drwill-ms,
timtay-microsoft,
andyk-ms,
brycewang-microsoft,
tmahmood-microsoft and
patilsnr
as code owners
abhipsaMisra
commented
Apr 18, 2023
| @@ -60,6 +60,7 @@ public abstract class IotHubBaseClient : IAsyncDisposable | |||
| ModelId = _clientOptions.ModelId, | |||
| PayloadConvention = _clientOptions.PayloadConvention, | |||
| IotHubClientTransportSettings = _clientOptions.TransportSettings, | |||
| FileUploadTransportSettings = _clientOptions.FileUploadTransportSettings, | |||
There was a problem hiding this comment.
This is in preparation for adding file upload into the delegating handler pipeline
abhipsaMisra
commented
Apr 18, 2023
| if (customCertificateValidation != null) | ||
| { | ||
| httpClientHandler = new HttpClientHandler | ||
| { | ||
| ServerCertificateCustomValidationCallback = customCertificateValidation, | ||
| SslProtocols = transportSettings.SslProtocols, | ||
| SslProtocols = SslProtocols.None, |
There was a problem hiding this comment.
This is the default value set on our transport settings.
abhipsaMisra
commented
Apr 18, 2023
| @@ -197,11 +197,11 @@ internal MqttTransportHandler(PipelineContext context, IotHubClientMqttSettings | |||
| string uri = $"wss://{_hostName}/$iothub/websocket"; | |||
| _mqttClientOptionsBuilder.WithWebSocketServer(uri); | |||
|
|
|||
| IWebProxy proxy = _transportSettings.Proxy; | |||
| IWebProxy proxy = _mqttTransportSettings.Proxy; | |||
There was a problem hiding this comment.
Retrieve the required values from the transport settings passed in through the context
abhipsaMisra
commented
Apr 18, 2023
| @@ -28,13 +28,12 @@ internal static MqttTransportHandler CreateTransportHandler(IMqttClient mockMqtt | |||
| { | |||
| var pipelineContext = new PipelineContext(); | |||
| var clientConfigurationMock = new IotHubConnectionCredentials(); | |||
| //clientConfigurationMock.SetupGet(x => x.ClientOptions).Returns(clientOptionsMock.Object); | |||
There was a problem hiding this comment.
This had been commented out, so I removed it.
abhipsaMisra
commented
Apr 18, 2023
| @@ -38,6 +38,8 @@ protected set | |||
| } | |||
| } | |||
|
|
|||
| public virtual bool IsUsable => NextHandler?.IsUsable ?? true; | |||
There was a problem hiding this comment.
Property before methods
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
abhipsaMisra
commented
Apr 18, 2023
| }; | ||
|
|
||
| using var httpTransport = new HttpTransportHandler(pipelineContext, transportSettings, httpClientHandler); | ||
| using var httpTransport = new HttpTransportHandler(pipelineContext, httpClientHandler); |
There was a problem hiding this comment.
This should hopefully be refactored out to not require a separate pipeline context instance once we have integrated http into the pipeline flow. (This might be similar to the file upload flow we have on the device client).
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
timtay-microsoft
approved these changes
Apr 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The transport settings are available through the PipelineContext, but were being set on the TransportHandler explicitly again.