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

Code style and syntax clean up #18445

Merged
merged 2 commits into from
Feb 4, 2021
Merged

Code style and syntax clean up #18445

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b6e75c
Code style and syntax clean up
Feb 4, 2021
82f1bf4
regenrate the code.
azabbasi Feb 4, 2021
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
28 changes: 22 additions & 6 deletions sdk/digitaltwins/Azure.DigitalTwins.Core/src/Customized/DigitalTwinModelsRestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ internal partial class DigitalTwinModelsRestClient
{
// The modelUpdates parameter needs to be changed from IEnumerable<object> to IEnumerable<string>
// and not parsed like a json object.
internal async Task<Response<IReadOnlyList<DigitalTwinsModelData>>> AddAsync(IEnumerable<string> models = null, CreateModelsOptions digitalTwinModelsAddOptions = null, CancellationToken cancellationToken = default)
internal async Task<Response<IReadOnlyList<DigitalTwinsModelData>>> AddAsync(
IEnumerable<string> models = null,
CreateModelsOptions digitalTwinModelsAddOptions = null,
CancellationToken cancellationToken = default)
{
using DiagnosticScope scope = _clientDiagnostics.CreateScope("DigitalTwinModelsClient.Add");
scope.Start();
Expand All @@ -30,7 +33,9 @@ internal async Task<Response<IReadOnlyList<DigitalTwinsModelData>>> AddAsync(IEn
case 201:
{
IReadOnlyList<DigitalTwinsModelData> value = default;
using JsonDocument document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false);
using JsonDocument document = await JsonDocument
.ParseAsync(message.Response.ContentStream, default, cancellationToken)
.ConfigureAwait(false);
List<DigitalTwinsModelData> array = new List<DigitalTwinsModelData>(document.RootElement.GetArrayLength());
foreach (JsonElement item in document.RootElement.EnumerateArray())
{
Expand All @@ -52,7 +57,10 @@ internal async Task<Response<IReadOnlyList<DigitalTwinsModelData>>> AddAsync(IEn

// The modelUpdates parameter needs to be changed from IEnumerable<object> to IEnumerable<string>
// and not parsed like a json object.
internal Response<IReadOnlyList<DigitalTwinsModelData>> Add(IEnumerable<string> models = null, CreateModelsOptions digitalTwinModelsAddOptions = null, CancellationToken cancellationToken = default)
internal Response<IReadOnlyList<DigitalTwinsModelData>> Add(
IEnumerable<string> models = null,
CreateModelsOptions digitalTwinModelsAddOptions = null,
CancellationToken cancellationToken = default)
{
using DiagnosticScope scope = _clientDiagnostics.CreateScope("DigitalTwinModelsClient.Add");
scope.Start();
Expand Down Expand Up @@ -88,7 +96,11 @@ internal Response<IReadOnlyList<DigitalTwinsModelData>> Add(IEnumerable<string>

// The modelUpdates parameter needs to be changed from IEnumerable<object> to IEnumerable<string>
// and not parsed like a json object.
internal async Task<Response> UpdateAsync(string id, IEnumerable<string> modelUpdates, DecomissionModelOptions digitalTwinModelsUpdateOptions = null, CancellationToken cancellationToken = default)
internal async Task<Response> UpdateAsync(
string id,
IEnumerable<string> modelUpdates,
DecommissionModelOptions digitalTwinModelsUpdateOptions = null,
CancellationToken cancellationToken = default)
{
if (id == null)
{
Expand Down Expand Up @@ -120,7 +132,11 @@ internal async Task<Response> UpdateAsync(string id, IEnumerable<string> modelUp

// The modelUpdates parameter needs to be changed from IEnumerable<object> to IEnumerable<string>
// and not parsed like a json object.
internal Response Update(string id, IEnumerable<string> modelUpdates, DecomissionModelOptions digitalTwinModelsUpdateOptions = null, CancellationToken cancellationToken = default)
internal Response Update(
string id,
IEnumerable<string> modelUpdates,
DecommissionModelOptions digitalTwinModelsUpdateOptions = null,
CancellationToken cancellationToken = default)
{
if (id == null)
{
Expand Down Expand Up @@ -182,7 +198,7 @@ private HttpMessage CreateAddRequest(IEnumerable<string> models, CreateModelsOpt

// The strings are already json, so we do not want them to be serialized.
// Instead, the payloads need to be concatenated into a json array.
private HttpMessage CreateUpdateRequest(string id, IEnumerable<string> modelUpdates, DecomissionModelOptions digitalTwinModelsUpdateOptions)
private HttpMessage CreateUpdateRequest(string id, IEnumerable<string> modelUpdates, DecommissionModelOptions digitalTwinModelsUpdateOptions)
{
var message = _pipeline.CreateMessage();
var request = message.Request;
Expand Down
16 changes: 11 additions & 5 deletions sdk/digitaltwins/Azure.DigitalTwins.Core/src/Customized/DigitalTwinsRestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ internal async Task<Response<Stream>> AddAsync(
}
case 202:
return Response.FromValue<Stream>(null, message.Response);

default:
throw await _clientDiagnostics.CreateRequestFailedExceptionAsync(message.Response).ConfigureAwait(false);
}
Expand All @@ -90,7 +91,11 @@ internal async Task<Response<Stream>> AddAsync(
}
}

internal Response<Stream> Add(string id, Stream twin, CreateOrReplaceDigitalTwinOptions digitalTwinsAddOptions = null, CancellationToken cancellationToken = default)
internal Response<Stream> Add(
string id,
Stream twin,
CreateOrReplaceDigitalTwinOptions digitalTwinsAddOptions = null,
CancellationToken cancellationToken = default)
{
if (id == null)
{
Expand All @@ -112,6 +117,7 @@ internal Response<Stream> Add(string id, Stream twin, CreateOrReplaceDigitalTwin
}
case 202:
return Response.FromValue<Stream>(null, message.Response);

default:
throw _clientDiagnostics.CreateRequestFailedException(message.Response);
}
Expand Down Expand Up @@ -760,10 +766,10 @@ private HttpMessage CreateUpdateRequest(
}

private HttpMessage CreateAddRelationshipRequest(
string id,
string relationshipId,
Stream relationship,
CreateOrReplaceRelationshipOptions digitalTwinsAddRelationshipOptions)
string id,
string relationshipId,
Stream relationship,
CreateOrReplaceRelationshipOptions digitalTwinsAddRelationshipOptions)
{
HttpMessage message = _pipeline.CreateMessage();
Request request = message.Request;
Expand Down
2 changes: 1 addition & 1 deletion ...tomized/Models/DecomissionModelOptions.cs → ...omized/Models/DecommissionModelOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Azure.DigitalTwins.Core
{
/// <inheritdoc />
[CodeGenModel("DigitalTwinModelsUpdateOptions")]
internal partial class DecomissionModelOptions
internal partial class DecommissionModelOptions
{
// This class declaration changes the namespace, class name and property visibility; do not remove.

Expand Down
Loading