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.

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

Typos: differnt, occured #4500

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public ReferenceTypeNullHandling DefaultResponseReferenceTypeNullHandling
set => Settings.DefaultResponseReferenceTypeNullHandling = value;
}

[Argument(Name = nameof(GenerateOriginalParameterNames), IsRequired = false, Description = "Generate x-originalName properties when parameter name is differnt in .NET and HTTP (default: true).")]
[Argument(Name = nameof(GenerateOriginalParameterNames), IsRequired = false, Description = "Generate x-originalName properties when parameter name is different in .NET and HTTP (default: true).")]
public bool GenerateOriginalParameterNames
{
get => Settings.GenerateOriginalParameterNames;
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Generation/OpenApiDocumentGeneratorSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public OpenApiDocumentGeneratorSettings()
/// <summary>Gets or sets the default response reference type null handling when no nullability information is available (if NotNullAttribute and CanBeNullAttribute are missing, default: NotNull).</summary>
public ReferenceTypeNullHandling DefaultResponseReferenceTypeNullHandling { get; set; }

/// <summary>Gets or sets a value indicating whether to generate x-originalName properties when parameter name is differnt in .NET and HTTP (default: true).</summary>
/// <summary>Gets or sets a value indicating whether to generate x-originalName properties when parameter name is different in .NET and HTTP (default: true).</summary>
public bool GenerateOriginalParameterNames { get; set; } = true;

/// <summary>Gets the operation processors.</summary>
Expand Down
6 changes: 3 additions & 3 deletions src/NSwag.Integration.ClientPCL/ServiceClients.cs
Original file line number Diff line number Diff line change
Expand Up @@ -645,15 +645,15 @@ public virtual async System.Threading.Tasks.Task<SwaggerResponse> UploadFilesAsy
}

/// <exception cref="GeoClientException">A server side error occurred.</exception>
/// <exception cref="GeoClientClientException{System.Exception}">A custom error occured.</exception>
/// <exception cref="GeoClientClientException{System.Exception}">A custom error occurred.</exception>
public virtual System.Threading.Tasks.Task<SwaggerResponse> SaveItemsAsync(GenericRequestOfAddressAndPerson request)
{
return SaveItemsAsync(request, System.Threading.CancellationToken.None);
}

/// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
/// <exception cref="GeoClientException">A server side error occurred.</exception>
/// <exception cref="GeoClientClientException{System.Exception}">A custom error occured.</exception>
/// <exception cref="GeoClientClientException{System.Exception}">A custom error occurred.</exception>
public virtual async System.Threading.Tasks.Task<SwaggerResponse> SaveItemsAsync(GenericRequestOfAddressAndPerson request, System.Threading.CancellationToken cancellationToken)
{
var urlBuilder_ = new System.Text.StringBuilder();
Expand Down Expand Up @@ -707,7 +707,7 @@ public virtual async System.Threading.Tasks.Task<SwaggerResponse> SaveItemsAsync
responseObject_.Data.Add("HttpStatus", status_.ToString());
responseObject_.Data.Add("HttpHeaders", headers_);
responseObject_.Data.Add("HttpResponse", objectResponse_.Text);
throw new GeoClientException("A custom error occured.", status_, objectResponse_.Text, headers_, responseObject_);
throw new GeoClientException("A custom error occurred.", status_, objectResponse_.Text, headers_, responseObject_);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Integration.ClientPCL/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
},
"450": {
"x-nullable": false,
"description": "A custom error occured.",
"description": "A custom error occurred.",
"schema": {
"$ref": "#/definitions/Exception"
}
Expand Down
6 changes: 3 additions & 3 deletions src/NSwag.Integration.Console/ServiceClients.cs
Original file line number Diff line number Diff line change
Expand Up @@ -638,15 +638,15 @@ public virtual async System.Threading.Tasks.Task UploadFilesAsync(System.Collect
}

/// <exception cref="SwaggerException">A server side error occurred.</exception>
/// <exception cref="SwaggerException{System.Exception}">A custom error occured.</exception>
/// <exception cref="SwaggerException{System.Exception}">A custom error occurred.</exception>
public virtual System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request)
{
return SaveItemsAsync(request, System.Threading.CancellationToken.None);
}

/// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
/// <exception cref="SwaggerException">A server side error occurred.</exception>
/// <exception cref="SwaggerException{System.Exception}">A custom error occured.</exception>
/// <exception cref="SwaggerException{System.Exception}">A custom error occurred.</exception>
public virtual async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request, System.Threading.CancellationToken cancellationToken)
{
var urlBuilder_ = new System.Text.StringBuilder();
Expand Down Expand Up @@ -700,7 +700,7 @@ public virtual async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOf
responseObject_.Data.Add("HttpStatus", status_.ToString());
responseObject_.Data.Add("HttpHeaders", headers_);
responseObject_.Data.Add("HttpResponse", objectResponse_.Text);
throw new SwaggerException("A custom error occured.", status_, objectResponse_.Text, headers_, responseObject_);
throw new SwaggerException("A custom error occurred.", status_, objectResponse_.Text, headers_, responseObject_);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Integration.WebAPI/Controllers/GeoController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void UploadFiles(IEnumerable<HttpPostedFileBase> files)

[HttpPost]
[ResponseType("204", typeof(void))]
[ResponseType("450", typeof(Exception), Description = "A custom error occured.")]
[ResponseType("450", typeof(Exception), Description = "A custom error occurred.")]
public void SaveItems(GenericRequest<Address, Person> request)
{
throw new ArgumentException("Test");
Expand Down
2 changes: 1 addition & 1 deletion src/NSwagStudio/ViewModels/ViewModelBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class ViewModelBase : MyToolkit.Mvvm.ViewModelBase
/// <param name="exception">The exception.</param>
public override void HandleException(Exception exception)
{
ExceptionBox.Show("An error occured", exception, Application.Current.MainWindow);
ExceptionBox.Show("An error occurred", exception, Application.Current.MainWindow);
}

protected string FromStringArray(string[] array)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
ToolTip="DefaultResponseReferenceTypeNullHandling" ItemsSource="{Binding ReferenceTypeNullHandlings}" Margin="0,0,0,12" />

<CheckBox IsChecked="{Binding Command.GenerateOriginalParameterNames, Mode=TwoWay}" Margin="0,0,0,12" ToolTip="GenerateOriginalParameterNames">
<TextBlock Text="Generate x-originalName properties when parameter name is differnt in .NET and HTTP." TextWrapping="Wrap" />
<TextBlock Text="Generate x-originalName properties when parameter name is different in .NET and HTTP." TextWrapping="Wrap" />
</CheckBox>

<CheckBox IsChecked="{Binding Command.GenerateAbstractProperties, Mode=TwoWay}" Margin="0,0,0,12" ToolTip="GenerateAbstractProperties">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
ToolTip="DefaultResponseReferenceTypeNullHandling" ItemsSource="{Binding ReferenceTypeNullHandlings}" Margin="0,0,0,12" />

<CheckBox IsChecked="{Binding Command.GenerateOriginalParameterNames, Mode=TwoWay}" Margin="0,0,0,12" ToolTip="GenerateOriginalParameterNames">
<TextBlock Text="Generate x-originalName properties when parameter name is differnt in .NET and HTTP." TextWrapping="Wrap" />
<TextBlock Text="Generate x-originalName properties when parameter name is different in .NET and HTTP." TextWrapping="Wrap" />
</CheckBox>

<CheckBox IsChecked="{Binding Command.GenerateAbstractProperties, Mode=TwoWay}" Margin="0,0,0,12" ToolTip="GenerateAbstractProperties">
Expand Down
Loading