diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..49de0d370 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,123 @@ +# To learn more about .editorconfig see https://aka.ms/editorconfigdocs +############################### +# Core EditorConfig Options # +############################### +# All files +[*] +indent_style = space +# Code files +[*.{cs,csx,vb,vbx}] +indent_size = 4 +insert_final_newline = true +charset = utf-8-bom +############################### +# .NET Coding Conventions # +############################### +[*.{cs,vb}] +# Organize usings +dotnet_sort_system_directives_first = true +# this. preferences +dotnet_style_qualification_for_field = false:silent +dotnet_style_qualification_for_property = false:silent +dotnet_style_qualification_for_method = false:silent +dotnet_style_qualification_for_event = false:silent +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true:silent +dotnet_style_predefined_type_for_member_access = true:silent +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent +dotnet_style_readonly_field = true:suggestion +# Expression-level preferences +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +############################### +# Naming Conventions # +############################### +# Style Definitions +dotnet_naming_style.pascal_case_style.capitalization = pascal_case +# Use PascalCase for constant fields +dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields +dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style +dotnet_naming_symbols.constant_fields.applicable_kinds = field +dotnet_naming_symbols.constant_fields.applicable_accessibilities = * +dotnet_naming_symbols.constant_fields.required_modifiers = const +############################### +# C# Coding Conventions # +############################### +[*.cs] +# var preferences +csharp_style_var_for_built_in_types = true:silent +csharp_style_var_when_type_is_apparent = true:silent +csharp_style_var_elsewhere = true:silent +# Expression-bodied members +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_accessors = true:silent +# Pattern matching preferences +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +# Null-checking preferences +csharp_style_throw_expression = true:suggestion +csharp_style_conditional_delegate_call = true:suggestion +# Modifier preferences +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion +# Expression-level preferences +csharp_prefer_braces = true:silent +csharp_style_deconstructed_variable_declaration = true:suggestion +csharp_prefer_simple_default_expression = true:suggestion +csharp_style_pattern_local_over_anonymous_function = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +############################### +# C# Formatting Rules # +############################### +# New line preferences +csharp_new_line_before_open_brace = all +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_between_query_expression_clauses = true +# Indentation preferences +csharp_indent_case_contents = true +csharp_indent_switch_labels = true +csharp_indent_labels = flush_left +# Space preferences +csharp_space_after_cast = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_around_binary_operators = before_and_after +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +# Wrapping preferences +csharp_preserve_single_line_statements = true +csharp_preserve_single_line_blocks = true +############################### +# VB Coding Conventions # +############################### +[*.vb] +# Modifier preferences +visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion diff --git a/Microsoft.OpenApi.sln b/Microsoft.OpenApi.sln index d957905d4..c71f28228 100644 --- a/Microsoft.OpenApi.sln +++ b/Microsoft.OpenApi.sln @@ -1,12 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi", "src\Microsoft.OpenApi\Microsoft.OpenApi.csproj", "{A8E50143-69B2-472A-9D45-3F9A05D13202}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4AEDAD90-F854-4940-BFEE-6374CC92CAB0}" ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig build.cmd = build.cmd readme.md = readme.md EndProjectSection diff --git a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiReaderException.cs b/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiReaderException.cs index ee829d6b3..03f80c93e 100644 --- a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiReaderException.cs +++ b/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiReaderException.cs @@ -33,7 +33,7 @@ public OpenApiReaderException(string message, YamlNode node) : base(message) { // This only includes line because using a char range causes tests to break due to CR/LF & LF differences // See https://tools.ietf.org/html/rfc5147 for syntax - Pointer = $"#line={node.Start.Line}"; + Pointer = $"#line={node.Start.Line}"; } /// @@ -43,4 +43,4 @@ public OpenApiReaderException(string message, YamlNode node) : base(message) /// Inner exception that caused this exception to be thrown. public OpenApiReaderException(string message, Exception innerException) : base(message, innerException) { } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiUnsupportedSpecVersionException.cs b/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiUnsupportedSpecVersionException.cs index 199020784..705b212d0 100644 --- a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiUnsupportedSpecVersionException.cs +++ b/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiUnsupportedSpecVersionException.cs @@ -41,4 +41,4 @@ public OpenApiUnsupportedSpecVersionException(string specificationVersion, Excep /// public string SpecificationVersion { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs b/src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs index 22d31e7a7..da3381f7e 100644 --- a/src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs +++ b/src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs @@ -9,4 +9,4 @@ namespace Microsoft.OpenApi.Readers.Interface public interface IDiagnostic { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs b/src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs index 170cde6fb..39724b3c6 100644 --- a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs +++ b/src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs @@ -20,4 +20,4 @@ public interface IOpenApiReader where TDiagnostic : IDiagno /// The Open API document. OpenApiDocument Read(TInput input, out TDiagnostic diagnostic); } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiVersionService.cs b/src/Microsoft.OpenApi.Readers/Interface/IOpenApiVersionService.cs index 32dd420f4..a7a98d781 100644 --- a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiVersionService.cs +++ b/src/Microsoft.OpenApi.Readers/Interface/IOpenApiVersionService.cs @@ -37,4 +37,4 @@ internal interface IOpenApiVersionService /// Instance of OpenApiDocument populated with data from rootNode OpenApiDocument LoadDocument(RootNode rootNode); } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs b/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs index cd3258eaa..ea11c7939 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs @@ -22,4 +22,4 @@ public class OpenApiDiagnostic : IDiagnostic /// public OpenApiSpecVersion SpecificationVersion { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs b/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs index 1b1c2f367..8821aa8c3 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs @@ -42,7 +42,7 @@ public class OpenApiReaderSettings /// /// Dictionary of parsers for converting extensions into strongly typed classes /// - public Dictionary> ExtensionParsers { get; set; } = new Dictionary>(); + public Dictionary> ExtensionParsers { get; set; } = new Dictionary>(); /// /// Rules to use for validating OpenAPI specification. If none are provided a default set of rules are applied. @@ -52,6 +52,6 @@ public class OpenApiReaderSettings /// /// URL where relative references should be resolved from if the description does not contain Server definitions /// - public Uri BaseUrl { get; set; } + public Uri BaseUrl { get; set; } } } diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs index 36008032e..9dc14a7bd 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs @@ -53,4 +53,4 @@ public T ReadFragment(Stream input, OpenApiSpecVersion version, out OpenApiDi } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs index 547698e70..0cb9605dd 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs @@ -46,4 +46,4 @@ public T ReadFragment(string input, OpenApiSpecVersion version, out OpenApiDi } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/OpenApiTextReaderReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiTextReaderReader.cs index 5c8dd55e7..c604007c7 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiTextReaderReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiTextReaderReader.cs @@ -89,4 +89,4 @@ static YamlDocument LoadYamlDocument(TextReader input) return yamlStream.Documents.First(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs index 19738be19..73a31eac3 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs @@ -124,4 +124,4 @@ public T ReadFragment(YamlDocument input, OpenApiSpecVersion version, out Ope return (T)element; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMap.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMap.cs index ef11c448b..a135f7f02 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMap.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMap.cs @@ -8,4 +8,4 @@ namespace Microsoft.OpenApi.Readers.ParseNodes internal class AnyFieldMap : Dictionary> { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs index acae8a976..dbc9eabeb 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs @@ -9,4 +9,4 @@ internal class AnyListFieldMap : Dictionary : Dictionary : Dictionary> { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs index de4d14aa3..d30863955 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs @@ -53,4 +53,4 @@ public static YamlNode Find(this JsonPointer currentPointer, YamlNode baseYamlNo } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs index 41d5ab803..e1149cc5a 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs @@ -79,4 +79,4 @@ public override IOpenApiAny CreateAny() return array; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs index 709dbb317..26fc81076 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs @@ -196,4 +196,4 @@ public override IOpenApiAny CreateAny() return apiObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs index 093e329c6..25f0eabc1 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs @@ -97,4 +97,4 @@ public virtual List CreateListOfAny() } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs index 8dadfcee2..bbd153688 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs @@ -9,4 +9,4 @@ namespace Microsoft.OpenApi.Readers.ParseNodes internal class PatternFieldMap : Dictionary, Action> { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs index 24373443c..2dd2c7e8a 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs @@ -91,4 +91,4 @@ public override IOpenApiAny CreateAny() throw new NotImplementedException(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs index 1f93dfc75..42909bee6 100644 --- a/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs @@ -35,4 +35,4 @@ public MapNode GetMap() return new MapNode(Context, (YamlMappingNode)_yamlDocument.RootNode); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/ParsingContext.cs b/src/Microsoft.OpenApi.Readers/ParsingContext.cs index b14e6ccbf..8cb9f5fd2 100644 --- a/src/Microsoft.OpenApi.Readers/ParsingContext.cs +++ b/src/Microsoft.OpenApi.Readers/ParsingContext.cs @@ -240,4 +240,4 @@ public void PopLoop(string loopid) } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi.Readers/Properties/AssemblyInfo.cs index 1d8941520..b42e91bd1 100644 --- a/src/Microsoft.OpenApi.Readers/Properties/AssemblyInfo.cs +++ b/src/Microsoft.OpenApi.Readers/Properties/AssemblyInfo.cs @@ -5,4 +5,4 @@ [assembly: InternalsVisibleTo( - "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")] \ No newline at end of file + "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")] diff --git a/src/Microsoft.OpenApi.Readers/Services/OpenApiReferenceResolver.cs b/src/Microsoft.OpenApi.Readers/Services/OpenApiReferenceResolver.cs index 3c9bf704d..c6ebe24b3 100644 --- a/src/Microsoft.OpenApi.Readers/Services/OpenApiReferenceResolver.cs +++ b/src/Microsoft.OpenApi.Readers/Services/OpenApiReferenceResolver.cs @@ -20,7 +20,7 @@ internal class OpenApiReferenceResolver : OpenApiVisitorBase private bool _resolveRemoteReferences; private List _errors = new List(); - public OpenApiReferenceResolver(OpenApiDocument currentDocument, bool resolveRemoteReferences = true) + public OpenApiReferenceResolver(OpenApiDocument currentDocument, bool resolveRemoteReferences = true) { _currentDocument = currentDocument; _resolveRemoteReferences = resolveRemoteReferences; @@ -66,7 +66,7 @@ public override void Visit(OpenApiOperation operation) { ResolveObject(operation.RequestBody, r => operation.RequestBody = r); ResolveList(operation.Parameters); - + if (operation.Tags != null) { ResolveTags(operation.Tags); diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs index 2469c887f..99bc4451a 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs @@ -51,4 +51,4 @@ public static OpenApiContact LoadContact(ParseNode node) return contact; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs index cf3e484af..6302eaf84 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs @@ -324,4 +324,4 @@ public override void Visit(OpenApiOperation operation) } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs index b0d2df871..4d57e7b3f 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs @@ -44,4 +44,4 @@ public static OpenApiExternalDocs LoadExternalDocs(ParseNode node) return externalDocs; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs index 3ebdb0e1d..32caf86aa 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs @@ -199,4 +199,4 @@ private static void LoadStyle(OpenApiHeader header, string style) } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs index b2a3083f7..5854672d3 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs @@ -71,4 +71,4 @@ public static OpenApiInfo LoadInfo(ParseNode node) return info; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs index 567d37de1..4c4009f57 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs @@ -46,4 +46,4 @@ public static OpenApiLicense LoadLicense(ParseNode node) return license; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs index 4782d8b8a..785ed6ee7 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs @@ -220,4 +220,4 @@ private static OpenApiTag LoadTagByReference( return tagObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs index 601003862..5be08c71e 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs @@ -302,4 +302,4 @@ public static OpenApiParameter LoadParameter(ParseNode node, bool loadRequestBod return parameter; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs index 5b3a782e9..d8ff7b961 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs @@ -53,4 +53,4 @@ public static OpenApiPathItem LoadPathItem(ParseNode node) return pathItem; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs index 5b8a1a24a..2aa5de979 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs @@ -32,4 +32,4 @@ public static OpenApiPaths LoadPaths(ParseNode node) return domainObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs index 2cdcc0a09..343dcd2ce 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs @@ -166,4 +166,4 @@ public static OpenApiResponse LoadResponse(ParseNode node) return response; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs index 195965cbd..41c40e497 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs @@ -214,15 +214,15 @@ internal static partial class OpenApiV2Deserializer { OpenApiConstants.Default, new AnyFieldMapParameter( - s => s.Default, - (s, v) => s.Default = v, + s => s.Default, + (s, v) => s.Default = v, s => s) }, { OpenApiConstants.Example, new AnyFieldMapParameter( - s => s.Example, - (s, v) => s.Example = v, + s => s.Example, + (s, v) => s.Example = v, s => s) } }; @@ -231,8 +231,8 @@ internal static partial class OpenApiV2Deserializer { OpenApiConstants.Enum, new AnyListFieldMapParameter( - s => s.Enum, - (s, v) => s.Enum = v, + s => s.Enum, + (s, v) => s.Enum = v, s => s) } }; @@ -260,4 +260,4 @@ public static OpenApiSchema LoadSchema(ParseNode node) return schema; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs index e2487455e..c5e0776ee 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs @@ -58,4 +58,4 @@ private static OpenApiSecurityScheme LoadSecuritySchemeByReference( return securitySchemeObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs index 117d1f3c4..7e0c6c1dc 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs @@ -128,4 +128,4 @@ public static OpenApiSecurityScheme LoadSecurityScheme(ParseNode node) return securityScheme; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs index 380999475..12fae8660 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs @@ -54,4 +54,4 @@ public static OpenApiTag LoadTag(ParseNode n) return domainObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs index 436e2d693..4bb15a8d9 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs @@ -169,4 +169,4 @@ private static string LoadString(ParseNode node) return node.GetScalarValue(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs index e9561b367..99dfcd225 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs @@ -59,7 +59,7 @@ private static OpenApiReference ParseLocalReference(string localReference) var id = localReference.Substring( segments[0].Length + "/".Length + segments[1].Length + "/".Length); - return new OpenApiReference {Type = referenceType, Id = id}; + return new OpenApiReference { Type = referenceType, Id = id }; } throw new OpenApiException( @@ -179,4 +179,4 @@ public T LoadElement(ParseNode node) where T : IOpenApiElement return (T)_loaders[typeof(T)](node); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs index 6e2273839..ac7db2db6 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs @@ -76,4 +76,4 @@ public static OpenApiXml LoadXml(ParseNode node) return xml; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V2/TempStorageKeys.cs b/src/Microsoft.OpenApi.Readers/V2/TempStorageKeys.cs index 7945d49f7..5a216e086 100644 --- a/src/Microsoft.OpenApi.Readers/V2/TempStorageKeys.cs +++ b/src/Microsoft.OpenApi.Readers/V2/TempStorageKeys.cs @@ -18,4 +18,4 @@ internal static class TempStorageKeys public const string GlobalProduces = "globalProduces"; public const string ParameterIsBodyOrFormData = "parameterIsBodyOrFormData"; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs index 60d69b9e5..af1376580 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs @@ -41,4 +41,4 @@ public static OpenApiCallback LoadCallback(ParseNode node) return domainObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs index febeda730..30d711d33 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs @@ -47,4 +47,4 @@ public static OpenApiComponents LoadComponents(ParseNode node) return components; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs index 154ed23c0..151a12354 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs @@ -51,4 +51,4 @@ public static OpenApiContact LoadContact(ParseNode node) return contact; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiDiscriminatorDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiDiscriminatorDeserializer.cs index 8978e4238..867057d32 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiDiscriminatorDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiDiscriminatorDeserializer.cs @@ -45,4 +45,4 @@ public static OpenApiDiscriminator LoadDiscriminator(ParseNode node) return discriminator; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs index 2221584f1..df1434cd9 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs @@ -58,4 +58,4 @@ public static OpenApiDocument LoadOpenApi(RootNode rootNode) return openApidoc; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs index 18f1154c3..b3bda4b61 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs @@ -75,4 +75,4 @@ public static OpenApiEncoding LoadEncoding(ParseNode node) return encoding; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs index 36f591a9a..1e114ad73 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs @@ -67,4 +67,4 @@ public static OpenApiExample LoadExample(ParseNode node) return example; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiExternalDocsDeserializer.cs index ec2c16ff1..2fef79b6a 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiExternalDocsDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiExternalDocsDeserializer.cs @@ -45,4 +45,4 @@ public static OpenApiExternalDocs LoadExternalDocs(ParseNode node) return externalDocs; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs index 86e86237e..1616d67f0 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs @@ -101,4 +101,4 @@ public static OpenApiHeader LoadHeader(ParseNode node) return header; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs index 17a97c117..d5de92852 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs @@ -65,11 +65,11 @@ public static OpenApiInfo LoadInfo(ParseNode node) var mapNode = node.CheckMapNode("Info"); var info = new OpenApiInfo(); - var required = new List {"title", "version"}; + var required = new List { "title", "version" }; ParseMap(mapNode, info, InfoFixedFields, InfoPatternFields); return info; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs index 6bd352f53..3c38d8b9a 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs @@ -46,4 +46,4 @@ internal static OpenApiLicense LoadLicense(ParseNode node) return license; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs index 06ec8de3e..7bf4c650b 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs @@ -69,4 +69,4 @@ public static OpenApiLink LoadLink(ParseNode node) return link; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs index 52e99a8f9..695f1cc1b 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs @@ -64,7 +64,7 @@ internal static partial class OpenApiV3Deserializer }; - private static readonly AnyMapFieldMap _mediaTypeAnyMapOpenApiExampleFields = + private static readonly AnyMapFieldMap _mediaTypeAnyMapOpenApiExampleFields = new AnyMapFieldMap { { @@ -96,4 +96,4 @@ public static OpenApiMediaType LoadMediaType(ParseNode node) return mediaType; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs index adc814f33..2653ce631 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs @@ -57,4 +57,4 @@ public static OpenApiOAuthFlow LoadOAuthFlow(ParseNode node) return oauthFlow; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs index 022ed35fd..bd19f2716 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs @@ -41,4 +41,4 @@ public static OpenApiOAuthFlows LoadOAuthFlows(ParseNode node) return oAuthFlows; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs index 5c7013bde..16f7a16f4 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs @@ -125,4 +125,4 @@ private static OpenApiTag LoadTagByReference( return tagObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs index 61dbbc7fa..e8fad07a5 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs @@ -158,4 +158,4 @@ public static OpenApiParameter LoadParameter(ParseNode node) return parameter; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs index ff08ce186..70f53b83a 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs @@ -57,4 +57,4 @@ public static OpenApiPathItem LoadPathItem(ParseNode node) return pathItem; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs index 2020628d0..fcfad096c 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs @@ -32,4 +32,4 @@ public static OpenApiPaths LoadPaths(ParseNode node) return domainObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs index efd54b101..a2633028e 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs @@ -61,4 +61,4 @@ public static OpenApiRequestBody LoadRequestBody(ParseNode node) return requestBody; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs index 30ea4a52e..70ea0c9bf 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs @@ -58,11 +58,11 @@ public static OpenApiResponse LoadResponse(ParseNode node) return mapNode.GetReferencedObject(ReferenceType.Response, pointer); } - var requiredFields = new List {"description"}; + var requiredFields = new List { "description" }; var response = new OpenApiResponse(); ParseMap(mapNode, response, _responseFixedFields, _responsePatternFields); return response; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs index 580d3ff67..9fe4d075f 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs @@ -32,4 +32,4 @@ public static OpenApiResponses LoadResponses(ParseNode node) return domainObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs index db1380bd8..87769c7c9 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs @@ -255,8 +255,8 @@ internal static partial class OpenApiV3Deserializer { OpenApiConstants.Example, new AnyFieldMapParameter( - s => s.Example, - (s, v) => s.Example = v, + s => s.Example, + (s, v) => s.Example = v, s => s) } }; @@ -266,7 +266,7 @@ internal static partial class OpenApiV3Deserializer { OpenApiConstants.Enum, new AnyListFieldMapParameter( - s => s.Enum, + s => s.Enum, (s, v) => s.Enum = v, s => s) } @@ -280,11 +280,11 @@ public static OpenApiSchema LoadSchema(ParseNode node) if (pointer != null) { - return new OpenApiSchema() - { - UnresolvedReference = true, - Reference = node.Context.VersionService.ConvertToOpenApiReference(pointer,ReferenceType.Schema) - }; + return new OpenApiSchema() + { + UnresolvedReference = true, + Reference = node.Context.VersionService.ConvertToOpenApiReference(pointer, ReferenceType.Schema) + }; } var schema = new OpenApiSchema(); @@ -300,4 +300,4 @@ public static OpenApiSchema LoadSchema(ParseNode node) return schema; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs index b507c0d77..b6b80cf7b 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs @@ -57,4 +57,4 @@ private static OpenApiSecurityScheme LoadSecuritySchemeByReference( return securitySchemeObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs index 8657faceb..0e7b1c39c 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs @@ -86,4 +86,4 @@ public static OpenApiSecurityScheme LoadSecurityScheme(ParseNode node) return securityScheme; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs index 39842c974..e278abc90 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs @@ -51,4 +51,4 @@ public static OpenApiServer LoadServer(ParseNode node) return server; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs index 9fc955a78..9b6acbc8d 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs @@ -53,4 +53,4 @@ public static OpenApiServerVariable LoadServerVariable(ParseNode node) return serverVariable; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs index 1f3a36afb..6a987969b 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs @@ -54,4 +54,4 @@ public static OpenApiTag LoadTag(ParseNode n) return domainObject; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs index 41eab8c0c..9689c8fe1 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs @@ -189,4 +189,4 @@ private static string LoadString(ParseNode node) return node.GetScalarValue(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs index 891822a21..1630e60e1 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs @@ -19,7 +19,8 @@ namespace Microsoft.OpenApi.Readers.V3 /// internal class OpenApiV3VersionService : IOpenApiVersionService { - private IDictionary> _loaders = new Dictionary> { + private IDictionary> _loaders = new Dictionary> + { [typeof(IOpenApiAny)] = OpenApiV3Deserializer.LoadAny, [typeof(OpenApiCallback)] = OpenApiV3Deserializer.LoadCallback, [typeof(OpenApiComponents)] = OpenApiV3Deserializer.LoadComponents, @@ -48,7 +49,7 @@ internal class OpenApiV3VersionService : IOpenApiVersionService [typeof(OpenApiTag)] = OpenApiV3Deserializer.LoadTag, [typeof(OpenApiXml)] = OpenApiV3Deserializer.LoadXml }; - + /// /// Parse the string to a object. /// @@ -108,7 +109,7 @@ public OpenApiDocument LoadDocument(RootNode rootNode) public T LoadElement(ParseNode node) where T : IOpenApiElement { - return (T)_loaders[typeof(T)](node); + return (T)_loaders[typeof(T)](node); } private OpenApiReference ParseLocalReference(string localReference) @@ -125,11 +126,11 @@ private OpenApiReference ParseLocalReference(string localReference) if (segments[1] == "components") { var referenceType = segments[2].GetEnumFromDisplayName(); - return new OpenApiReference {Type = referenceType, Id = segments[3]}; + return new OpenApiReference { Type = referenceType, Id = segments[3] }; } } throw new OpenApiException(string.Format(SRResource.ReferenceHasInvalidFormat, localReference)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs index 0b6196c65..dc05da1c2 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs @@ -67,4 +67,4 @@ public static OpenApiXml LoadXml(ParseNode node) return xml; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Readers/YamlHelper.cs b/src/Microsoft.OpenApi.Readers/YamlHelper.cs index a283ea0d3..90794b080 100644 --- a/src/Microsoft.OpenApi.Readers/YamlHelper.cs +++ b/src/Microsoft.OpenApi.Readers/YamlHelper.cs @@ -31,4 +31,4 @@ public static YamlNode ParseYamlString(string yamlString) return yamlDocument.RootNode; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Workbench/App.xaml.cs b/src/Microsoft.OpenApi.Workbench/App.xaml.cs index 6b849bd1f..d3fc6dcb7 100644 --- a/src/Microsoft.OpenApi.Workbench/App.xaml.cs +++ b/src/Microsoft.OpenApi.Workbench/App.xaml.cs @@ -11,4 +11,4 @@ namespace Microsoft.OpenApi.Workbench public partial class App : Application { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Workbench/MainModel.cs b/src/Microsoft.OpenApi.Workbench/MainModel.cs index 087340f14..7906d88d7 100644 --- a/src/Microsoft.OpenApi.Workbench/MainModel.cs +++ b/src/Microsoft.OpenApi.Workbench/MainModel.cs @@ -176,16 +176,16 @@ internal void ParseDocument() { stream = CreateStream(_input); } - + var stopwatch = new Stopwatch(); stopwatch.Start(); var document = new OpenApiStreamReader(new OpenApiReaderSettings - { - ReferenceResolution = ReferenceResolutionSetting.ResolveLocalReferences, - RuleSet = ValidationRuleSet.GetDefaultRuleSet() - } + { + ReferenceResolution = ReferenceResolutionSetting.ResolveLocalReferences, + RuleSet = ValidationRuleSet.GetDefaultRuleSet() + } ).Read(stream, out var context); stopwatch.Stop(); ParseTime = $"{stopwatch.ElapsedMilliseconds} ms"; @@ -217,7 +217,7 @@ internal void ParseDocument() var walker = new OpenApiWalker(statsVisitor); walker.Walk(document); - Errors += Environment.NewLine + "Statistics:" + Environment.NewLine + statsVisitor.GetStatisticsReport(); + Errors += Environment.NewLine + "Statistics:" + Environment.NewLine + statsVisitor.GetStatisticsReport(); } catch (Exception ex) { @@ -236,7 +236,7 @@ private string WriteContents(OpenApiDocument document) outputStream, Version, Format); - + outputStream.Position = 0; return new StreamReader(outputStream).ReadToEnd(); @@ -259,4 +259,4 @@ private MemoryStream CreateStream(string text) /// public event PropertyChangedEventHandler PropertyChanged; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs b/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs index 214232d04..f33132359 100644 --- a/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs +++ b/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs @@ -23,4 +23,4 @@ private void Button_Click(object sender, RoutedEventArgs e) _mainModel.ParseDocument(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs index 6b1d07384..b9a41106f 100644 --- a/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs +++ b/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs @@ -33,11 +33,11 @@ [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) + //(used if a resource is not found in the page, + // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) )] // Version information for an assembly consists of the following four values: @@ -51,4 +51,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Microsoft.OpenApi/Any/AnyType.cs b/src/Microsoft.OpenApi/Any/AnyType.cs index 12bbec6d4..d0addd808 100644 --- a/src/Microsoft.OpenApi/Any/AnyType.cs +++ b/src/Microsoft.OpenApi/Any/AnyType.cs @@ -28,4 +28,4 @@ public enum AnyType /// Object } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/IOpenApiAny.cs b/src/Microsoft.OpenApi/Any/IOpenApiAny.cs index c8e5f2dea..26c5f4d87 100644 --- a/src/Microsoft.OpenApi/Any/IOpenApiAny.cs +++ b/src/Microsoft.OpenApi/Any/IOpenApiAny.cs @@ -15,4 +15,4 @@ public interface IOpenApiAny : IOpenApiElement, IOpenApiExtension /// AnyType AnyType { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs b/src/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs index 79dda83bd..0e286d1a4 100644 --- a/src/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs +++ b/src/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs @@ -74,4 +74,4 @@ public interface IOpenApiPrimitive : IOpenApiAny /// PrimitiveType PrimitiveType { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiArray.cs b/src/Microsoft.OpenApi/Any/OpenApiArray.cs index abd4ae099..5ef0087f2 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiArray.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiArray.cs @@ -34,4 +34,4 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion) } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiBinary.cs b/src/Microsoft.OpenApi/Any/OpenApiBinary.cs index d08493912..da1bedad8 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiBinary.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiBinary.cs @@ -22,4 +22,4 @@ public OpenApiBinary(byte[] value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Binary; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiBoolean.cs b/src/Microsoft.OpenApi/Any/OpenApiBoolean.cs index a476bfe38..f531e0135 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiBoolean.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiBoolean.cs @@ -22,4 +22,4 @@ public OpenApiBoolean(bool value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Boolean; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiByte.cs b/src/Microsoft.OpenApi/Any/OpenApiByte.cs index a0cc3a1ac..5e91b888e 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiByte.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiByte.cs @@ -29,4 +29,4 @@ public OpenApiByte(byte[] value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Byte; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiDate.cs b/src/Microsoft.OpenApi/Any/OpenApiDate.cs index deec825c9..c285799b6 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiDate.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiDate.cs @@ -23,4 +23,4 @@ public OpenApiDate(DateTime value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Date; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiDateTime.cs b/src/Microsoft.OpenApi/Any/OpenApiDateTime.cs index 4f885fedd..81b647288 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiDateTime.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiDateTime.cs @@ -23,4 +23,4 @@ public OpenApiDateTime(DateTimeOffset value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.DateTime; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiDouble.cs b/src/Microsoft.OpenApi/Any/OpenApiDouble.cs index a86279fb2..35711a191 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiDouble.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiDouble.cs @@ -21,4 +21,4 @@ public OpenApiDouble(double value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Double; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiFloat.cs b/src/Microsoft.OpenApi/Any/OpenApiFloat.cs index fd0189835..3a64fb04c 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiFloat.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiFloat.cs @@ -21,4 +21,4 @@ public OpenApiFloat(float value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Float; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiInteger.cs b/src/Microsoft.OpenApi/Any/OpenApiInteger.cs index aa7a9284d..a0aa88fe8 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiInteger.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiInteger.cs @@ -21,4 +21,4 @@ public OpenApiInteger(int value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Integer; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiLong.cs b/src/Microsoft.OpenApi/Any/OpenApiLong.cs index cf3c9efa6..30b42fbf3 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiLong.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiLong.cs @@ -21,4 +21,4 @@ public OpenApiLong(long value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Long; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiNull.cs b/src/Microsoft.OpenApi/Any/OpenApiNull.cs index de6d4ff79..229409d95 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiNull.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiNull.cs @@ -25,4 +25,4 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion) writer.WriteAny(this); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiObject.cs b/src/Microsoft.OpenApi/Any/OpenApiObject.cs index 795f9dbe6..cd2f6ee64 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiObject.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiObject.cs @@ -35,4 +35,4 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion) } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiPassword.cs b/src/Microsoft.OpenApi/Any/OpenApiPassword.cs index caf771690..aaa56e72b 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiPassword.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiPassword.cs @@ -21,4 +21,4 @@ public OpenApiPassword(string value) /// public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Password; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs b/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs index 1207c96df..624dbd395 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs @@ -128,4 +128,4 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion) } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Any/OpenApiString.cs b/src/Microsoft.OpenApi/Any/OpenApiString.cs index 2ead9b6c5..00bfbe2cd 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiString.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiString.cs @@ -33,4 +33,4 @@ public bool IsExplicit() return this.isExplicit; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs b/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs index 0d30d313a..920593bbd 100644 --- a/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs +++ b/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs @@ -30,4 +30,4 @@ public DisplayAttribute(string name) /// public string Name { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Error.cs b/src/Microsoft.OpenApi/Error.cs index 4d9af0810..d0c41780d 100644 --- a/src/Microsoft.OpenApi/Error.cs +++ b/src/Microsoft.OpenApi/Error.cs @@ -95,4 +95,4 @@ internal static NotSupportedException NotSupported(string messageFormat, params return new NotSupportedException(Format(messageFormat, messageArgs)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs b/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs index 78c2ff6a8..410e0dd78 100644 --- a/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs +++ b/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs @@ -43,4 +43,4 @@ public OpenApiException(string message, Exception innerException) /// public string Pointer { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs b/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs index fca2538ef..494608b1f 100644 --- a/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs +++ b/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs @@ -38,4 +38,4 @@ public OpenApiWriterException(string message, Exception innerException) { } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Expressions/BodyExpression.cs b/src/Microsoft.OpenApi/Expressions/BodyExpression.cs index 5fc6e25dd..cd5c86bd9 100644 --- a/src/Microsoft.OpenApi/Expressions/BodyExpression.cs +++ b/src/Microsoft.OpenApi/Expressions/BodyExpression.cs @@ -66,4 +66,4 @@ public string Fragment } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs b/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs index 2165ca230..f6642cb08 100644 --- a/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs +++ b/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs @@ -48,4 +48,4 @@ public string Token } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs b/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs index 5132efb64..965572dfd 100644 --- a/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs +++ b/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs @@ -34,9 +34,9 @@ public static RuntimeExpression Build(string expression) throw Error.ArgumentNullOrWhiteSpace(nameof(expression)); } - if ( !expression.StartsWith( Prefix ) ) + if (!expression.StartsWith(Prefix)) { - return new CompositeExpression( expression ); + return new CompositeExpression(expression); } // $url @@ -73,7 +73,7 @@ public static RuntimeExpression Build(string expression) return new ResponseExpression(source); } - throw new OpenApiException( string.Format( SRResource.RuntimeExpressionHasInvalidFormat, expression ) ); + throw new OpenApiException(string.Format(SRResource.RuntimeExpressionHasInvalidFormat, expression)); } /// diff --git a/src/Microsoft.OpenApi/Expressions/UrlExpression.cs b/src/Microsoft.OpenApi/Expressions/UrlExpression.cs index 16ca00f0a..4dc10bb77 100644 --- a/src/Microsoft.OpenApi/Expressions/UrlExpression.cs +++ b/src/Microsoft.OpenApi/Expressions/UrlExpression.cs @@ -25,4 +25,4 @@ public UrlExpression() { } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs b/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs index f146e0ee7..d7c778c19 100644 --- a/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs +++ b/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs @@ -43,4 +43,4 @@ public static string GetDisplayName(this Enum enumValue) return attribute == null ? enumValue.ToString() : attribute.Name; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs index f7e138e2e..81893a3b2 100644 --- a/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs +++ b/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs @@ -28,4 +28,4 @@ public static IEnumerable Validate(this IOpenApiElement element, V return validator.Errors; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs index b41802794..aee0d44a5 100644 --- a/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs +++ b/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs @@ -42,4 +42,4 @@ public static void AddExtension(this T element, string name, IOpenApiExtensio element.Extensions[name] = any ?? throw Error.ArgumentNull(nameof(any)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs index 2f943148f..5fc49a53d 100644 --- a/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs +++ b/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs @@ -174,4 +174,4 @@ public static string Serialize( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Extensions/StringExtensions.cs b/src/Microsoft.OpenApi/Extensions/StringExtensions.cs index 1f8fa9f16..980abda86 100644 --- a/src/Microsoft.OpenApi/Extensions/StringExtensions.cs +++ b/src/Microsoft.OpenApi/Extensions/StringExtensions.cs @@ -38,4 +38,4 @@ public static T GetEnumFromDisplayName(this string displayName) return default(T); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs index 59279eb3c..45f7bad11 100644 --- a/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs +++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs @@ -9,4 +9,4 @@ namespace Microsoft.OpenApi.Interfaces public interface IOpenApiElement { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs index 1760c14e3..7abd1bfdd 100644 --- a/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs +++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs @@ -16,4 +16,4 @@ public interface IOpenApiExtensible : IOpenApiElement /// IDictionary Extensions { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs index cf39f5004..eb47c64bc 100644 --- a/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs +++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs @@ -15,7 +15,7 @@ public interface IOpenApiReferenceable : IOpenApiSerializable /// /// Indicates if object is populated with data or is just a reference to the data /// - bool UnresolvedReference { get; set;} + bool UnresolvedReference { get; set; } /// /// Reference object. @@ -32,4 +32,4 @@ public interface IOpenApiReferenceable : IOpenApiSerializable /// void SerializeAsV2WithoutReference(IOpenApiWriter writer); } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs index d33ec2088..582bd49cd 100644 --- a/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs +++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs @@ -22,4 +22,4 @@ public interface IOpenApiSerializable : IOpenApiElement /// The writer. void SerializeAsV2(IOpenApiWriter writer); } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/JsonPointer.cs b/src/Microsoft.OpenApi/JsonPointer.cs index 6ef6b95ef..07e1305d6 100644 --- a/src/Microsoft.OpenApi/JsonPointer.cs +++ b/src/Microsoft.OpenApi/JsonPointer.cs @@ -66,4 +66,4 @@ public override string ToString() return "/" + string.Join("/", Tokens); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiCallback.cs b/src/Microsoft.OpenApi/Models/OpenApiCallback.cs index fc6db76dc..512202691 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiCallback.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiCallback.cs @@ -23,7 +23,7 @@ public class OpenApiCallback : IOpenApiSerializable, IOpenApiReferenceable, IOpe /// /// Indicates if object is populated with data or is just a reference to the data /// - public bool UnresolvedReference { get; set;} + public bool UnresolvedReference { get; set; } /// /// Reference pointer. @@ -75,7 +75,7 @@ public void SerializeAsV3(IOpenApiWriter writer) Reference.SerializeAsV3(writer); return; } - + SerializeAsV3WithoutReference(writer); } @@ -116,4 +116,4 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) // Callback object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs index 6adab4b13..6c114f722 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs @@ -257,4 +257,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // Components object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiConstants.cs b/src/Microsoft.OpenApi/Models/OpenApiConstants.cs index 526ed25e1..11e6d8f70 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiConstants.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiConstants.cs @@ -624,4 +624,4 @@ public static class OpenApiConstants #endregion } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiContact.cs b/src/Microsoft.OpenApi/Models/OpenApiContact.cs index ecba3d3c4..848560ead 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiContact.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiContact.cs @@ -75,4 +75,4 @@ private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs b/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs index cee77aadb..a0739dc25 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs @@ -51,4 +51,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // Discriminator object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs index 78d532f22..b77208742 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs @@ -282,7 +282,7 @@ public IOpenApiReferenceable ResolveReference(OpenApiReference reference) if (reference.IsExternal) { // Should not attempt to resolve external references against a single document. - throw new ArgumentException(Properties.SRResource.RemoteReferenceNotSupported); + throw new ArgumentException(Properties.SRResource.RemoteReferenceNotSupported); } if (!reference.Type.HasValue) @@ -305,7 +305,8 @@ public IOpenApiReferenceable ResolveReference(OpenApiReference reference) return null; } - if (this.Components == null) { + if (this.Components == null) + { throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id)); } @@ -343,10 +344,11 @@ public IOpenApiReferenceable ResolveReference(OpenApiReference reference) default: throw new OpenApiException(Properties.SRResource.InvalidReferenceType); } - } catch(KeyNotFoundException) + } + catch (KeyNotFoundException) { - throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId,reference.Id)); + throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id)); } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs b/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs index 74fb943b6..0d02c384e 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs @@ -94,4 +94,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // nothing here } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiError.cs b/src/Microsoft.OpenApi/Models/OpenApiError.cs index dbd34845c..98bf7ec82 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiError.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiError.cs @@ -41,7 +41,7 @@ public OpenApiError(string pointer, string message) /// public override string ToString() { - return Message + (!string.IsNullOrEmpty(Pointer) ? " [" + Pointer + "]" : "" ); + return Message + (!string.IsNullOrEmpty(Pointer) ? " [" + Pointer + "]" : ""); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiExample.cs b/src/Microsoft.OpenApi/Models/OpenApiExample.cs index 0ebce156b..6f4a59d9b 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiExample.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiExample.cs @@ -118,4 +118,4 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) // in Response object, so it will be serialized as a part of the Response object. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs b/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs index d3fc5117c..0a43255fb 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs @@ -66,4 +66,4 @@ public void SerializeAsV2(IOpenApiWriter writer) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs b/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs index 9485eea55..a47fb9906 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs @@ -66,4 +66,4 @@ private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiHeader.cs b/src/Microsoft.OpenApi/Models/OpenApiHeader.cs index c5fa288ae..cf634735a 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiHeader.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiHeader.cs @@ -18,7 +18,7 @@ public class OpenApiHeader : IOpenApiSerializable, IOpenApiReferenceable, IOpenA /// /// Indicates if object is populated with data or is just a reference to the data /// - public bool UnresolvedReference { get; set;} + public bool UnresolvedReference { get; set; } /// /// Reference pointer. @@ -210,4 +210,4 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiInfo.cs b/src/Microsoft.OpenApi/Models/OpenApiInfo.cs index 03020cf56..17364ba3b 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiInfo.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiInfo.cs @@ -121,4 +121,4 @@ public void SerializeAsV2(IOpenApiWriter writer) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiLicense.cs b/src/Microsoft.OpenApi/Models/OpenApiLicense.cs index dcd2223b5..0de7540c8 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiLicense.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiLicense.cs @@ -66,4 +66,4 @@ private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiLink.cs b/src/Microsoft.OpenApi/Models/OpenApiLink.cs index 4bd7ef4bf..3f7b23caf 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiLink.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiLink.cs @@ -54,7 +54,7 @@ public class OpenApiLink : IOpenApiSerializable, IOpenApiReferenceable, IOpenApi /// /// Indicates if object is populated with data or is just a reference to the data /// - public bool UnresolvedReference { get; set;} + public bool UnresolvedReference { get; set; } /// /// Reference pointer. @@ -124,4 +124,4 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) // Link object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs b/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs index 93098f836..414f46b30 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs @@ -81,4 +81,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // Media type does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs index ee16dc7ba..e478944aa 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs @@ -79,4 +79,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // OAuthFlow object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs index 91e17368b..fa2db10db 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs @@ -82,4 +82,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // OAuthFlows object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiOperation.cs b/src/Microsoft.OpenApi/Models/OpenApiOperation.cs index d90637945..50c6fa584 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiOperation.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiOperation.cs @@ -314,4 +314,4 @@ public void SerializeAsV2(IOpenApiWriter writer) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs index a34116723..e500e0736 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs @@ -17,7 +17,7 @@ public class OpenApiParameter : IOpenApiSerializable, IOpenApiReferenceable, IOp /// /// Indicates if object is populated with data or is just a reference to the data /// - public bool UnresolvedReference { get; set;} + public bool UnresolvedReference { get; set; } /// /// Reference object. @@ -101,7 +101,7 @@ public class OpenApiParameter : IOpenApiSerializable, IOpenApiReferenceable, IOp /// Furthermore, if referencing a schema which contains an example, /// the examples value SHALL override the example provided by the schema. /// - public IDictionary Examples { get; set; } = new Dictionary(); + public IDictionary Examples { get; set; } = new Dictionary(); /// /// Example of the media type. The example SHOULD match the specified schema and encoding properties @@ -259,7 +259,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) } // In V2 parameter's type can't be a reference to a custom object schema or can't be of type object // So in that case map the type as string. - else + else if (Schema?.UnresolvedReference == true || Schema?.Type == "object") { writer.WriteProperty(OpenApiConstants.Type, "string"); @@ -288,7 +288,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) // allowEmptyValue writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false); - if (this.In == ParameterLocation.Query ) + if (this.In == ParameterLocation.Query) { if (this.Style == ParameterStyle.Form && this.Explode == true) { @@ -326,4 +326,4 @@ internal class OpenApiBodyParameter : OpenApiParameter internal class OpenApiFormDataParameter : OpenApiParameter { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs b/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs index aecabdefb..3143e94cb 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs @@ -136,4 +136,4 @@ public void SerializeAsV2(IOpenApiWriter writer) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs index c998a101a..72d0576d3 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs @@ -9,4 +9,4 @@ namespace Microsoft.OpenApi.Models public class OpenApiPaths : OpenApiExtensibleDictionary { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiReference.cs b/src/Microsoft.OpenApi/Models/OpenApiReference.cs index 6e925efd5..2c8f738ca 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiReference.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiReference.cs @@ -210,4 +210,4 @@ private string GetReferenceTypeNameAsV2(ReferenceType type) } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs index 9b2842e8b..d6308efcf 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs @@ -16,7 +16,7 @@ public class OpenApiRequestBody : IOpenApiSerializable, IOpenApiReferenceable, I /// /// Indicates if object is populated with data or is just a reference to the data /// - public bool UnresolvedReference { get; set;} + public bool UnresolvedReference { get; set; } /// /// Reference object. @@ -102,4 +102,4 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) // RequestBody object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiResponse.cs b/src/Microsoft.OpenApi/Models/OpenApiResponse.cs index a802f79af..20cdb8abd 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiResponse.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiResponse.cs @@ -164,4 +164,4 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiResponses.cs b/src/Microsoft.OpenApi/Models/OpenApiResponses.cs index 0244d99cf..818bf4ced 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiResponses.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiResponses.cs @@ -9,4 +9,4 @@ namespace Microsoft.OpenApi.Models public class OpenApiResponses : OpenApiExtensibleDictionary { } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs index 008f4ae21..612264b36 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs @@ -629,4 +629,4 @@ internal void WriteAsSchemaProperties( writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs b/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs index a94797b6f..d2564daf2 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs @@ -146,4 +146,4 @@ public int GetHashCode(OpenApiSecurityScheme obj) } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs b/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs index f77893592..7694c5fd4 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs @@ -66,7 +66,7 @@ public class OpenApiSecurityScheme : IOpenApiSerializable, IOpenApiReferenceable /// /// Indicates if object is populated with data or is just a reference to the data /// - public bool UnresolvedReference { get; set;} + public bool UnresolvedReference { get; set; } /// /// Reference object. @@ -259,4 +259,4 @@ private static void WriteOAuthFlowForV2(IOpenApiWriter writer, string flowValue, writer.WriteOptionalMap(OpenApiConstants.Scopes, flow.Scopes, (w, s) => w.WriteValue(s)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiServer.cs b/src/Microsoft.OpenApi/Models/OpenApiServer.cs index 72cf492d5..ea988ec13 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiServer.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiServer.cs @@ -71,4 +71,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // Server object does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs b/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs index 3a8c462c5..8ae39a04c 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs @@ -69,4 +69,4 @@ public void SerializeAsV2(IOpenApiWriter writer) // ServerVariable does not exist in V2. } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiTag.cs b/src/Microsoft.OpenApi/Models/OpenApiTag.cs index 10e4bf0d1..4d743a13a 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiTag.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiTag.cs @@ -36,7 +36,7 @@ public class OpenApiTag : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiE /// /// Indicates if object is populated with data or is just a reference to the data /// - public bool UnresolvedReference { get; set;} + public bool UnresolvedReference { get; set; } /// /// Reference. @@ -125,4 +125,4 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OpenApiXml.cs b/src/Microsoft.OpenApi/Models/OpenApiXml.cs index 24d084eb9..59218970f 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiXml.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiXml.cs @@ -92,4 +92,4 @@ private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/OperationType.cs b/src/Microsoft.OpenApi/Models/OperationType.cs index 8c0d9038e..a85933d9b 100644 --- a/src/Microsoft.OpenApi/Models/OperationType.cs +++ b/src/Microsoft.OpenApi/Models/OperationType.cs @@ -50,4 +50,4 @@ public enum OperationType /// [Display("trace")] Trace } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/ParameterLocation.cs b/src/Microsoft.OpenApi/Models/ParameterLocation.cs index 4b15a335c..a729f314e 100644 --- a/src/Microsoft.OpenApi/Models/ParameterLocation.cs +++ b/src/Microsoft.OpenApi/Models/ParameterLocation.cs @@ -31,4 +31,4 @@ public enum ParameterLocation /// [Display("cookie")] Cookie } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/ParameterStyle.cs b/src/Microsoft.OpenApi/Models/ParameterStyle.cs index 5837d3704..a1df27962 100644 --- a/src/Microsoft.OpenApi/Models/ParameterStyle.cs +++ b/src/Microsoft.OpenApi/Models/ParameterStyle.cs @@ -45,4 +45,4 @@ public enum ParameterStyle /// [Display("deepObject")] DeepObject } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/ReferenceType.cs b/src/Microsoft.OpenApi/Models/ReferenceType.cs index 18205dcb4..6ac0c9ed2 100644 --- a/src/Microsoft.OpenApi/Models/ReferenceType.cs +++ b/src/Microsoft.OpenApi/Models/ReferenceType.cs @@ -60,4 +60,4 @@ public enum ReferenceType /// [Display("tags")] Tag } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs b/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs index 1bff9c146..12a525b4f 100644 --- a/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs +++ b/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs @@ -68,4 +68,4 @@ public void WriteValue(IOpenApiWriter writer) } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs b/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs index a52b6a70a..d75524bd6 100644 --- a/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs +++ b/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs @@ -30,4 +30,4 @@ public enum SecuritySchemeType /// [Display("openIdConnect")] OpenIdConnect } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/OpenApiFormat.cs b/src/Microsoft.OpenApi/OpenApiFormat.cs index 140d71bb1..8f4c55b68 100644 --- a/src/Microsoft.OpenApi/OpenApiFormat.cs +++ b/src/Microsoft.OpenApi/OpenApiFormat.cs @@ -18,4 +18,4 @@ public enum OpenApiFormat /// Yaml } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/OpenApiSpecVersion.cs b/src/Microsoft.OpenApi/OpenApiSpecVersion.cs index 687f6d774..20e49af80 100644 --- a/src/Microsoft.OpenApi/OpenApiSpecVersion.cs +++ b/src/Microsoft.OpenApi/OpenApiSpecVersion.cs @@ -18,4 +18,4 @@ public enum OpenApiSpecVersion /// OpenApi3_0 } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs index 24ddadb3e..159c979dd 100644 --- a/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs +++ b/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ "Microsoft.OpenApi.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")] [assembly: InternalsVisibleTo( - "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")] \ No newline at end of file + "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")] diff --git a/src/Microsoft.OpenApi/Services/ComparisonContext.cs b/src/Microsoft.OpenApi/Services/ComparisonContext.cs index 02b6e20e1..42acf5bda 100644 --- a/src/Microsoft.OpenApi/Services/ComparisonContext.cs +++ b/src/Microsoft.OpenApi/Services/ComparisonContext.cs @@ -84,4 +84,4 @@ internal OpenApiComparerBase GetComparer() return OpenApiComparerFactory.GetComparer(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiAnyComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiAnyComparer.cs index 2b3d2ad11..886f4313d 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiAnyComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiAnyComparer.cs @@ -69,4 +69,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiComparer.cs index 818e30274..cfe73e65e 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiComparer.cs @@ -33,4 +33,4 @@ public static IEnumerable Compare(OpenApiDocument source, Ope return comparisonContext.OpenApiDifferences; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiComparerBase.cs b/src/Microsoft.OpenApi/Services/OpenApiComparerBase.cs index 1fe80577e..53762688b 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiComparerBase.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiComparerBase.cs @@ -260,4 +260,4 @@ protected virtual void WalkAndCompare( comparisonContext.Exit(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiComparerFactory.cs b/src/Microsoft.OpenApi/Services/OpenApiComparerFactory.cs index b1ad1e269..5ff7b6481 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiComparerFactory.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiComparerFactory.cs @@ -90,7 +90,7 @@ internal OpenApiComparerBase GetComparer() if (_typeToComparerMap.TryGetValue(requestedComparerType, out object comparerInstance)) { - return (OpenApiComparerBase) comparerInstance; + return (OpenApiComparerBase)comparerInstance; } if (!TypeToDefaultComparerMap.TryGetValue(requestedComparerType, out comparerInstance)) @@ -99,7 +99,7 @@ internal OpenApiComparerBase GetComparer() $"No comparer is registered for type {requestedComparerType.Name}."); } - return (OpenApiComparerBase) comparerInstance; + return (OpenApiComparerBase)comparerInstance; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiComponentsComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiComponentsComparer.cs index e1b04dae4..2dd397ef7 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiComponentsComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiComponentsComparer.cs @@ -95,4 +95,4 @@ public override void Compare( // To Do compare Callbacks } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiContactComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiContactComparer.cs index 06f65c62c..1c0626ade 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiContactComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiContactComparer.cs @@ -51,4 +51,4 @@ public override void Compare( () => Compare(sourceContact.Url, targetContact.Url, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiDictionaryComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiDictionaryComparer.cs index 34c797f14..89e9c7431 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiDictionaryComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiDictionaryComparer.cs @@ -85,4 +85,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiDifference.cs b/src/Microsoft.OpenApi/Services/OpenApiDifference.cs index 73cf6e3f7..bd6262c5b 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiDifference.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiDifference.cs @@ -36,4 +36,4 @@ public class OpenApiDifference /// public object TargetValue { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiDifferenceOperation.cs b/src/Microsoft.OpenApi/Services/OpenApiDifferenceOperation.cs index 3afc67268..273763839 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiDifferenceOperation.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiDifferenceOperation.cs @@ -12,4 +12,4 @@ public enum OpenApiDifferenceOperation Remove, Update } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiDocumentComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiDocumentComparer.cs index 5e1c6ecf5..7ac8786b7 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiDocumentComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiDocumentComparer.cs @@ -73,4 +73,4 @@ public override void Compare( .Compare(sourceDocument.ExternalDocs, targetDocument.ExternalDocs, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiEncodingComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiEncodingComparer.cs index 1e1aa7fef..ed7349299 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiEncodingComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiEncodingComparer.cs @@ -62,4 +62,4 @@ public override void Compare( .Compare(sourceEncoding.Headers, targetEncoding.Headers, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiExampleComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiExampleComparer.cs index 70ab5082f..73c35668b 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiExampleComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiExampleComparer.cs @@ -62,4 +62,4 @@ public override void Compare( .Compare(sourceExample.Value, targetExample.Value, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiExternalDocsComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiExternalDocsComparer.cs index 31e9d5bcf..b5eea40e4 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiExternalDocsComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiExternalDocsComparer.cs @@ -45,4 +45,4 @@ public override void Compare(OpenApiExternalDocs sourceDocs, OpenApiExternalDocs () => Compare(sourceDocs.Url, targetDocs.Url, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiHeaderComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiHeaderComparer.cs index 9f25751b2..f80fa977c 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiHeaderComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiHeaderComparer.cs @@ -63,13 +63,13 @@ public override void Compare( if (sourceHeader.Reference != null) { - sourceHeader = (OpenApiHeader) comparisonContext.SourceDocument.ResolveReference( + sourceHeader = (OpenApiHeader)comparisonContext.SourceDocument.ResolveReference( sourceHeader.Reference); } if (targetHeader.Reference != null) { - targetHeader = (OpenApiHeader) comparisonContext.TargetDocument.ResolveReference( + targetHeader = (OpenApiHeader)comparisonContext.TargetDocument.ResolveReference( targetHeader.Reference); } @@ -120,4 +120,4 @@ public override void Compare( .Compare(sourceHeader.Example, targetHeader.Example, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiInfoComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiInfoComparer.cs index ec71059dc..0d391ed82 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiInfoComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiInfoComparer.cs @@ -68,4 +68,4 @@ public override void Compare( .Compare(sourceInfo.License, targetInfo.License, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiLicenseComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiLicenseComparer.cs index be61db7c8..ad0b06e17 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiLicenseComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiLicenseComparer.cs @@ -48,4 +48,4 @@ public override void Compare( () => Compare(sourceLicense.Url, targetLicense.Url, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiMediaTypeComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiMediaTypeComparer.cs index b93b33e45..69767e88e 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiMediaTypeComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiMediaTypeComparer.cs @@ -72,4 +72,4 @@ public override void Compare( .Compare(sourceMediaType.Example, targetMediaType.Example, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowComparer.cs index cfee18a60..56bcfd47d 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowComparer.cs @@ -52,4 +52,4 @@ public override void Compare(OpenApiOAuthFlow sourceFlow, OpenApiOAuthFlow targe () => Compare(sourceFlow.Scopes, targetFlow.Scopes, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowsComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowsComparer.cs index 9334bc9b0..8856107d3 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowsComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiOAuthFlowsComparer.cs @@ -70,4 +70,4 @@ public override void Compare( .Compare(sourceFlows.AuthorizationCode, targetFlows.AuthorizationCode, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiOperationComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiOperationComparer.cs index 354e36906..64e38cff4 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiOperationComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiOperationComparer.cs @@ -93,4 +93,4 @@ public override void Compare( // Compare CallBack } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiOperationsComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiOperationsComparer.cs index d64351302..78b8e0aa1 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiOperationsComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiOperationsComparer.cs @@ -85,4 +85,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiOrderedListComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiOrderedListComparer.cs index 405f06e21..b4ac53a5c 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiOrderedListComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiOrderedListComparer.cs @@ -87,4 +87,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiParameterComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiParameterComparer.cs index 43b185e4e..f3540bacc 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiParameterComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiParameterComparer.cs @@ -102,4 +102,4 @@ public override void Compare( .Compare(sourceParameter.Example, targetParameter.Example, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiParametersComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiParametersComparer.cs index f6ad885ef..81fd8905f 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiParametersComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiParametersComparer.cs @@ -98,4 +98,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiPathItemComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiPathItemComparer.cs index 6a5657e0f..8e33dc8be 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiPathItemComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiPathItemComparer.cs @@ -55,4 +55,4 @@ public override void Compare( .Compare(sourcePathItem?.Servers, targetPathItem?.Servers, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiPathsComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiPathsComparer.cs index a94ac8349..83b0f58df 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiPathsComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiPathsComparer.cs @@ -83,4 +83,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiReferenceComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiReferenceComparer.cs index 9a819db08..c3909b986 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiReferenceComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiReferenceComparer.cs @@ -58,10 +58,10 @@ public override void Compare( return; } - var source = (T) comparisonContext.SourceDocument.ResolveReference( + var source = (T)comparisonContext.SourceDocument.ResolveReference( sourceReference); - var target = (T) comparisonContext.TargetDocument.ResolveReference( + var target = (T)comparisonContext.TargetDocument.ResolveReference( targetReference); comparisonContext @@ -69,4 +69,4 @@ public override void Compare( .Compare(source, target, comparisonContext); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiRequestBodyComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiRequestBodyComparer.cs index cce69dad2..c49dd3697 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiRequestBodyComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiRequestBodyComparer.cs @@ -59,4 +59,4 @@ public override void Compare( .Compare(sourceRequestBody.Content, targetRequestBody.Content, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiResponseComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiResponseComparer.cs index 4f47516b7..1b5af7170 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiResponseComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiResponseComparer.cs @@ -62,13 +62,13 @@ public override void Compare( if (sourceResponse.Reference != null) { - sourceResponse = (OpenApiResponse) comparisonContext.SourceDocument.ResolveReference( + sourceResponse = (OpenApiResponse)comparisonContext.SourceDocument.ResolveReference( sourceResponse.Reference); } if (targetResponse.Reference != null) { - targetResponse = (OpenApiResponse) comparisonContext.TargetDocument.ResolveReference( + targetResponse = (OpenApiResponse)comparisonContext.TargetDocument.ResolveReference( targetResponse.Reference); } @@ -92,4 +92,4 @@ public override void Compare( // To Do Compare Link } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiSchemaComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiSchemaComparer.cs index 2fbb98694..f9c1163ce 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiSchemaComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiSchemaComparer.cs @@ -72,13 +72,13 @@ public override void Compare( if (sourceSchema.Reference != null) { - sourceSchema = (OpenApiSchema) comparisonContext.SourceDocument.ResolveReference( + sourceSchema = (OpenApiSchema)comparisonContext.SourceDocument.ResolveReference( sourceSchema.Reference); } if (targetSchema.Reference != null) { - targetSchema = (OpenApiSchema) comparisonContext.TargetDocument.ResolveReference( + targetSchema = (OpenApiSchema)comparisonContext.TargetDocument.ResolveReference( targetSchema.Reference); } @@ -174,4 +174,4 @@ public override void Compare( comparisonContext.TargetSchemaLoop.Pop(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiSecurityRequirementComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiSecurityRequirementComparer.cs index c9e5422e7..0753aecb7 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiSecurityRequirementComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiSecurityRequirementComparer.cs @@ -89,4 +89,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiSecuritySchemeComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiSecuritySchemeComparer.cs index bdee35bf4..537c7e1b4 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiSecuritySchemeComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiSecuritySchemeComparer.cs @@ -77,4 +77,4 @@ public override void Compare( .Compare(sourcecSecurityScheme.Flows, targetSecurityScheme.Flows, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiServerComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiServerComparer.cs index c5d17d443..4ceabd768 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiServerComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiServerComparer.cs @@ -56,4 +56,4 @@ public override void Compare( .Compare(sourceServer.Variables, sourceServer.Variables, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiServerVariableComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiServerVariableComparer.cs index 802994243..348366c6e 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiServerVariableComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiServerVariableComparer.cs @@ -51,4 +51,4 @@ public override void Compare( // To Do compare extensions } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiServersComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiServersComparer.cs index 00be2544e..7428338cd 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiServersComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiServersComparer.cs @@ -96,4 +96,4 @@ public override void Compare( } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiTagComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiTagComparer.cs index 6290f38f3..bc9eb1d5d 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiTagComparer.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiTagComparer.cs @@ -52,4 +52,4 @@ public override void Compare(OpenApiTag sourceTag, OpenApiTag targetTag, Compari () => Compare(sourceTag.Name, targetTag.Name, comparisonContext)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs b/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs index cb0430956..bc65fdfc2 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs @@ -303,7 +303,7 @@ public virtual void Visit(IList openApiTags) public virtual void Visit(IList openApiSecurityRequirements) { } - + /// /// Visits /// @@ -348,4 +348,4 @@ public virtual void Visit(IOpenApiReferenceable referenceable) { } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs index 065faddf3..a1b91985c 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs @@ -43,7 +43,7 @@ public void Walk(OpenApiDocument doc) _visitor.Visit(doc); - Walk(OpenApiConstants.Info,() => Walk(doc.Info)); + Walk(OpenApiConstants.Info, () => Walk(doc.Info)); Walk(OpenApiConstants.Servers, () => Walk(doc.Servers)); Walk(OpenApiConstants.Paths, () => Walk(doc.Paths)); Walk(OpenApiConstants.Components, () => Walk(doc.Components)); @@ -238,7 +238,7 @@ internal void Walk(IList servers) { for (int i = 0; i < servers.Count; i++) { - Walk(i.ToString(),() => Walk(servers[i])); + Walk(i.ToString(), () => Walk(servers[i])); } } } @@ -254,7 +254,8 @@ internal void Walk(OpenApiInfo info) } _visitor.Visit(info); - if (info != null) { + if (info != null) + { Walk(OpenApiConstants.Contact, () => Walk(info.Contact)); Walk(OpenApiConstants.License, () => Walk(info.License)); } @@ -380,7 +381,7 @@ internal void Walk(OpenApiServer server) /// /// Visits dictionary of /// - internal void Walk(IDictionary serverVariables) + internal void Walk(IDictionary serverVariables) { if (serverVariables == null) { @@ -684,13 +685,13 @@ internal void Walk(IDictionary content) /// internal void Walk(OpenApiMediaType mediaType) { - if (mediaType == null) + if (mediaType == null) { return; } _visitor.Visit(mediaType); - + Walk(OpenApiConstants.Example, () => Walk(mediaType.Examples)); Walk(OpenApiConstants.Schema, () => Walk(mediaType.Schema)); Walk(OpenApiConstants.Encoding, () => Walk(mediaType.Encoding)); @@ -747,14 +748,16 @@ internal void Walk(OpenApiSchema schema, bool isComponent = false) if (_schemaLoop.Contains(schema)) { return; // Loop detected, this schema has already been walked. - } else + } + else { _schemaLoop.Push(schema); } _visitor.Visit(schema); - if (schema.Items != null) { + if (schema.Items != null) + { Walk("items", () => Walk(schema.Items)); } @@ -768,7 +771,8 @@ internal void Walk(OpenApiSchema schema, bool isComponent = false) Walk("anyOf", () => Walk(schema.AnyOf)); } - if (schema.Properties != null) { + if (schema.Properties != null) + { Walk("properties", () => { foreach (var item in schema.Properties) @@ -788,7 +792,7 @@ internal void Walk(OpenApiSchema schema, bool isComponent = false) /// /// Visits dictionary of /// - internal void Walk(IDictionary examples) + internal void Walk(IDictionary examples) { if (examples == null) { @@ -876,7 +880,7 @@ internal void Walk(IList schemas) } } } - + /// /// Visits and child objects /// @@ -907,7 +911,7 @@ internal void Walk(OpenApiOAuthFlow oAuthFlow) /// /// Visits dictionary of and child objects /// - internal void Walk(IDictionary links) + internal void Walk(IDictionary links) { if (links == null) { @@ -1127,4 +1131,4 @@ public class CurrentKeys /// public string ServerVariable { get; internal set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Validations/IValidationContext.cs b/src/Microsoft.OpenApi/Validations/IValidationContext.cs index db2f32019..58f324bab 100644 --- a/src/Microsoft.OpenApi/Validations/IValidationContext.cs +++ b/src/Microsoft.OpenApi/Validations/IValidationContext.cs @@ -6,7 +6,7 @@ namespace Microsoft.OpenApi.Validations /// /// Constrained interface used to provide context to rule implementation /// - public interface IValidationContext + public interface IValidationContext { /// /// Register an error with the validation context. diff --git a/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs b/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs index 87d747507..69bcda93d 100644 --- a/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs +++ b/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs @@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Validations /// /// Class containing dispatchers to execute validation rules on for Open API document. /// - public class OpenApiValidator : OpenApiVisitorBase, IValidationContext + public class OpenApiValidator : OpenApiVisitorBase, IValidationContext { private readonly ValidationRuleSet _ruleSet; private readonly IList _errors = new List(); @@ -22,11 +22,11 @@ public class OpenApiValidator : OpenApiVisitorBase, IValidationContext /// Create a vistor that will validate an OpenAPIDocument /// /// - public OpenApiValidator(ValidationRuleSet ruleSet) + public OpenApiValidator(ValidationRuleSet ruleSet) { _ruleSet = ruleSet; } - + /// /// Gets the validation errors. /// @@ -195,7 +195,7 @@ private void Validate(object item, Type type) var potentialReference = item as IOpenApiReferenceable; if (potentialReference != null && potentialReference.UnresolvedReference) { - type = typeof(IOpenApiReferenceable); + type = typeof(IOpenApiReferenceable); } var rules = _ruleSet.FindRules(type); @@ -205,4 +205,4 @@ private void Validate(object item, Type type) } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs index 624059705..60267a26d 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs @@ -57,7 +57,7 @@ private static void ValidateKeys(IValidationContext context, IEnumerable { if (!KeyRegex.IsMatch(key)) { - context.CreateError(nameof(KeyMustBeRegularExpression), + context.CreateError(nameof(KeyMustBeRegularExpression), string.Format(SRResource.Validation_ComponentsKeyMustMatchRegularExpr, key, component, KeyRegex.ToString())); } } diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs index 6380a7899..f518453f7 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs @@ -26,7 +26,7 @@ public static class OpenApiContactRules { if (!item.Email.IsEmailAddress()) { - context.CreateError(nameof(EmailMustBeEmailFormat), + context.CreateError(nameof(EmailMustBeEmailFormat), String.Format(SRResource.Validation_StringMustBeEmailAddress, item.Email)); } } diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs index 789ed5c59..e5193b4c2 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs @@ -33,7 +33,7 @@ public static class OpenApiDocumentRules context.Enter("paths"); if (item.Paths == null) { - context.CreateError(nameof(OpenApiDocumentFieldIsMissing), + context.CreateError(nameof(OpenApiDocumentFieldIsMissing), String.Format(SRResource.Validation_FieldIsRequired, "paths", "document")); } context.Exit(); diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs index f96901abe..e02f019e2 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs @@ -34,7 +34,7 @@ public static class OpenApiInfoRules context.Enter("version"); if (item.Version == null) { - context.CreateError(nameof(InfoRequiredFields), + context.CreateError(nameof(InfoRequiredFields), String.Format(SRResource.Validation_FieldIsRequired, "version", "info")); } context.Exit(); diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs index 37c0dfb1b..7d900e1b4 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs @@ -33,7 +33,7 @@ public static class OpenApiOAuthFlowRules context.Enter("tokenUrl"); if (flow.TokenUrl == null) { - context.CreateError(nameof(OAuthFlowRequiredFields), + context.CreateError(nameof(OAuthFlowRequiredFields), String.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow")); } context.Exit(); @@ -42,7 +42,7 @@ public static class OpenApiOAuthFlowRules context.Enter("scopes"); if (flow.Scopes == null) { - context.CreateError(nameof(OAuthFlowRequiredFields), + context.CreateError(nameof(OAuthFlowRequiredFields), String.Format(SRResource.Validation_FieldIsRequired, "scopes", "OAuth Flow")); } context.Exit(); diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs index 80030b2f6..d1ad41781 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs @@ -33,7 +33,7 @@ public static class OpenApiParameterRules context.Enter("in"); if (item.In == null) { - context.CreateError(nameof(ParameterRequiredFields), + context.CreateError(nameof(ParameterRequiredFields), String.Format(SRResource.Validation_FieldIsRequired, "in", "parameter")); } context.Exit(); @@ -48,7 +48,7 @@ public static class OpenApiParameterRules { // required context.Enter("required"); - if ( item.In == ParameterLocation.Path && !item.Required ) + if (item.In == ParameterLocation.Path && !item.Required) { context.CreateError( nameof(RequiredMustBeTrueWhenInIsPath), diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs index 40e5eba6f..7ac374b62 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs @@ -24,7 +24,7 @@ public static class OpenApiPathsRules { context.Enter(pathName); - if (pathName == null || !pathName.StartsWith("/")) + if (pathName == null || !pathName.StartsWith("/")) { context.CreateError(nameof(PathNameMustBeginWithSlash), string.Format(SRResource.Validation_PathItemMustBeginWithSlash, pathName)); @@ -36,4 +36,4 @@ public static class OpenApiPathsRules // add more rules } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs index c3bcd2fae..d05a1229c 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs @@ -40,7 +40,7 @@ public static class OpenApiResponsesRules if (key != "default" && !Regex.IsMatch(key, "^[1-5](?>[0-9]{2}|XX)$")) { - context.CreateError(nameof(ResponsesMustBeIdentifiedByDefaultOrStatusCode), + context.CreateError(nameof(ResponsesMustBeIdentifiedByDefaultOrStatusCode), "Responses key must be 'default', an HTTP status code, " + "or one of the following strings representing a range of HTTP status codes: " + "'1XX', '2XX', '3XX', '4XX', '5XX'"); diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs index 3d009b931..8c45c8ff9 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs @@ -67,7 +67,7 @@ public static class OpenApiSchemaRules // discriminator context.Enter("discriminator"); - if(schema.Reference != null && schema.Discriminator != null) + if (schema.Reference != null && schema.Discriminator != null) { if (!schema.Required.Contains(schema.Discriminator?.PropertyName)) { diff --git a/src/Microsoft.OpenApi/Validations/ValidationRule.cs b/src/Microsoft.OpenApi/Validations/ValidationRule.cs index 297691e8c..fdbf5c330 100644 --- a/src/Microsoft.OpenApi/Validations/ValidationRule.cs +++ b/src/Microsoft.OpenApi/Validations/ValidationRule.cs @@ -29,7 +29,7 @@ public abstract class ValidationRule /// Class containing validation rule logic for . /// /// - public class ValidationRule : ValidationRule where T: IOpenApiElement + public class ValidationRule : ValidationRule where T : IOpenApiElement { private readonly Action _validate; diff --git a/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs b/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs index c6bc5854d..eca7bc8de 100644 --- a/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs +++ b/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs @@ -167,7 +167,7 @@ private static ValidationRuleSet BuildDefaultRuleSet() Type validationRuleType = typeof(ValidationRule); IEnumerable rules = typeof(ValidationRuleSet).Assembly.GetTypes() - .Where(t => t.IsClass + .Where(t => t.IsClass && t != typeof(object) && t.GetCustomAttributes(typeof(OpenApiRuleAttribute), false).Any()) .SelectMany(t2 => t2.GetProperties(BindingFlags.Static | BindingFlags.Public) @@ -175,12 +175,12 @@ private static ValidationRuleSet BuildDefaultRuleSet() foreach (var property in rules) { - var propertyValue = property.GetValue(null); // static property - ValidationRule rule = propertyValue as ValidationRule; - if (rule != null) - { - ruleSet.Add(rule); - } + var propertyValue = property.GetValue(null); // static property + ValidationRule rule = propertyValue as ValidationRule; + if (rule != null) + { + ruleSet.Add(rule); + } } return ruleSet; diff --git a/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs b/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs index 5fc3848d7..8fcbf10ed 100644 --- a/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs +++ b/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs @@ -73,4 +73,4 @@ public interface IOpenApiWriter /// void Flush(); } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs b/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs index 19e5b16ab..56e0300a1 100644 --- a/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs +++ b/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs @@ -204,4 +204,4 @@ public override void WriteRaw(string value) Writer.Write(value); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs index a14628d42..361da3b2a 100644 --- a/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs +++ b/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs @@ -138,4 +138,4 @@ private static void WritePrimitive(this IOpenApiWriter writer, IOpenApiPrimitive primitive.Write(writer, OpenApiSpecVersion.OpenApi3_0); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs index 172e3fa2a..321791d5e 100644 --- a/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs +++ b/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs @@ -105,7 +105,7 @@ public void Flush() /// /// The string value. public abstract void WriteValue(string value); - + /// /// Write float value. /// @@ -226,7 +226,7 @@ public virtual void WriteValue(object value) { WriteValue((decimal)value); } - else if ( type == typeof(DateTime) || type == typeof(DateTime?) ) + else if (type == typeof(DateTime) || type == typeof(DateTime?)) { WriteValue((DateTime)value); } @@ -390,4 +390,4 @@ protected void VerifyCanWritePropertyName(string name) } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs index 1c82d2cb9..537273cac 100644 --- a/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs +++ b/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs @@ -434,4 +434,4 @@ private static void CheckArguments(IOpenApiWriter writer, string name) } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs b/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs index d213e6154..eb5ab5cbc 100644 --- a/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs +++ b/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs @@ -205,4 +205,4 @@ public override void WriteRaw(string value) Writer.Write(value); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/Scope.cs b/src/Microsoft.OpenApi/Writers/Scope.cs index 2e912e397..37093cffc 100644 --- a/src/Microsoft.OpenApi/Writers/Scope.cs +++ b/src/Microsoft.OpenApi/Writers/Scope.cs @@ -59,4 +59,4 @@ public ScopeType Type /// public bool IsInArray { get; set; } = false; } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs b/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs index 9be16bfdf..5c6831cb1 100644 --- a/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs +++ b/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs @@ -226,4 +226,4 @@ internal static string GetJsonCompatibleString(this string value) return $"\"{value}\""; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.OpenApi/Writers/WriterConstants.cs b/src/Microsoft.OpenApi/Writers/WriterConstants.cs index 398ffc2ee..bfc943797 100644 --- a/src/Microsoft.OpenApi/Writers/WriterConstants.cs +++ b/src/Microsoft.OpenApi/Writers/WriterConstants.cs @@ -115,4 +115,4 @@ internal static class WriterConstants /// To indicate empty array in YAML. internal const string EmptyArray = "[ ]"; } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs b/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs index f9ee5434b..64e25fcfb 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs @@ -25,4 +25,4 @@ public DefaultSettingsFixture() .WithStrictOrdering()); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixtureCollection.cs b/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixtureCollection.cs index 97f8c17fc..1b9bd1107 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixtureCollection.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixtureCollection.cs @@ -16,4 +16,4 @@ namespace Microsoft.OpenApi.Readers.Tests public class DefaultSettingsFixtureCollection : ICollectionFixture { } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs index 2004be7b1..1bcd7b9d9 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs @@ -29,8 +29,8 @@ public void DetectedSpecificationVersionShouldBeV3_0() new OpenApiStreamReader().Read(stream, out var diagnostic); diagnostic.Should().NotBeNull(); - diagnostic.SpecificationVersion.Should().Be( OpenApiSpecVersion.OpenApi3_0); + diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi3_0); } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs index f20529115..cd60aa630 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs @@ -22,8 +22,8 @@ public void ThrowOpenApiUnsupportedSpecVersionException() catch (OpenApiUnsupportedSpecVersionException exception) { exception.SpecificationVersion.Should().Be("1.0.0"); - } + } } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs index 7df225015..263c28fec 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs @@ -126,4 +126,4 @@ public void ParseScalarDateTimeAsAnyShouldSucceed() ); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs index e5290a693..e374dc205 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs @@ -101,4 +101,4 @@ public void ParseSecuritySchemeReference() reference.Id.Should().Be(id); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs index 4f34ed562..6acf70500 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs @@ -101,4 +101,4 @@ public void ParseSecuritySchemeReference() reference.Id.Should().Be(id); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs index cfe6226d5..d7f110b10 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs @@ -185,7 +185,7 @@ public void LoadResponseReference() Type = ReferenceType.Response, Id = "NotFound" }, - Content = new Dictionary + Content = new Dictionary { ["application/json"] = new OpenApiMediaType() } @@ -255,4 +255,4 @@ public void LoadResponseAndSchemaReference() ); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs index e3dbfa19b..88866fd95 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs @@ -36,7 +36,7 @@ public void ParseCustomExtension() }; var reader = new OpenApiStringReader(settings); - + var diag = new OpenApiDiagnostic(); var doc = reader.Read(description, out diag); diff --git a/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs b/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs index d92e4eac0..c97e35e9b 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs @@ -21,4 +21,4 @@ public static MapNode CreateYamlMapNode(Stream stream) return new MapNode(context, (YamlMappingNode)yamlNode); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs index 3e16e7819..1ae3678d6 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs @@ -22,7 +22,7 @@ public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string file using (var streamV3 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml"))) { var openApiDocV2 = new OpenApiStreamReader().Read(streamV2, out var diagnosticV2); - var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var diagnosticV3 ); + var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var diagnosticV3); openApiDocV3.Should().BeEquivalentTo(openApiDocV2); @@ -30,4 +30,4 @@ public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string file } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs index 2eacc216e..1499dbed7 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs @@ -439,4 +439,4 @@ public void ShouldAllowComponentsThatJustContainAReference() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs index c3924406d..7a98c7a6d 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs @@ -74,4 +74,4 @@ public void ParseHeaderWithEnumShouldSucceed() }); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs index cb9607639..83620aa29 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs @@ -372,4 +372,4 @@ public void ParseOperationWithResponseExamplesShouldSucceed() ); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs index 4f6fa18da..fc4e84f50 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs @@ -394,4 +394,4 @@ public void ParseParameterWithEnumShouldSucceed() }); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs index 9ec8701f8..5d3331207 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs @@ -259,4 +259,4 @@ public void ParseBasicPathItemWithFormDataShouldSucceed() operation.Should().BeEquivalentTo(_basicPathItemWithFormData); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs index 07d025064..9a75e5c8d 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs @@ -91,4 +91,4 @@ public void ParseSchemaWithEnumShouldSucceed() }); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs index 69093df4d..1a4a2a3d7 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs @@ -219,4 +219,4 @@ static YamlDocument LoadYamlDocument(Stream input) } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs index d77b537ef..c87b491ab 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs @@ -22,7 +22,8 @@ public void NoServer() version: 1.0.0 paths: {} "; - var reader = new OpenApiStringReader(new OpenApiReaderSettings() { + var reader = new OpenApiStringReader(new OpenApiReaderSettings() + { }); var doc = reader.Read(input, out var diagnostic); @@ -274,7 +275,7 @@ public void InvalidHostShouldYieldError() "; var reader = new OpenApiStringReader(new OpenApiReaderSettings() { -BaseUrl = new Uri("https://bing.com") + BaseUrl = new Uri("https://bing.com") }); var doc = reader.Read(input, out var diagnostic); diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs index 493087111..f23bee9f9 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs @@ -269,4 +269,4 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs index 2425fada9..0768592b3 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs @@ -48,4 +48,4 @@ public void ParseBasicDiscriminatorShouldSucceed() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs index e05543a77..4888abebe 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs @@ -1277,4 +1277,4 @@ public void HeaderParameterShouldAllowExample() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs index 047dc8332..7f33491ff 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs @@ -81,4 +81,4 @@ public void ParseAdvancedEncodingShouldSucceed() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs index 3e98316ac..ead84f201 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs @@ -86,4 +86,4 @@ public void ParseExampleForcedStringSucceed() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs index ff9fb46fd..29b23cb31 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs @@ -146,4 +146,4 @@ public void ParseMinimalInfoShouldSucceed() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs index ef3eac152..e62eabb53 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs @@ -78,4 +78,4 @@ public void ParseMediaTypeWithExamplesShouldSucceed() }); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs index 479155026..a74c64154 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs @@ -33,7 +33,7 @@ public void ParseOperationWithParameterWithNoLocationShouldSucceed() { // Arrange MapNode node; - using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "operationWithParameterWithNoLocation.json")) ) + using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "operationWithParameterWithNoLocation.json"))) { node = TestHelper.CreateYamlMapNode(stream); } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs index e74e4d866..44ba3316d 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs @@ -83,7 +83,7 @@ public void ParseQueryParameterWithObjectTypeShouldSucceed() { // Arrange MapNode node; - using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameterWithObjectType.yaml")) ) + using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameterWithObjectType.yaml"))) { node = TestHelper.CreateYamlMapNode(stream); } @@ -114,7 +114,7 @@ public void ParseQueryParameterWithObjectTypeAndContentShouldSucceed() { // Arrange MapNode node; - using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameterWithObjectTypeAndContent.yaml")) ) + using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameterWithObjectTypeAndContent.yaml"))) { node = TestHelper.CreateYamlMapNode(stream); } @@ -179,7 +179,7 @@ public void ParseHeaderParameterShouldSucceed() Description = "token to be passed as a header", Required = true, Style = ParameterStyle.Simple, - + Schema = new OpenApiSchema { Type = "array", @@ -197,7 +197,7 @@ public void ParseParameterWithNullLocationShouldSucceed() { // Arrange MapNode node; - using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNullLocation.yaml")) ) + using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNullLocation.yaml"))) { node = TestHelper.CreateYamlMapNode(stream); } @@ -225,7 +225,7 @@ public void ParseParameterWithNoLocationShouldSucceed() { // Arrange MapNode node; - using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoLocation.yaml")) ) + using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoLocation.yaml"))) { node = TestHelper.CreateYamlMapNode(stream); } @@ -253,7 +253,7 @@ public void ParseParameterWithUnknownLocationShouldSucceed() { // Arrange MapNode node; - using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithUnknownLocation.yaml")) ) + using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithUnknownLocation.yaml"))) { node = TestHelper.CreateYamlMapNode(stream); } @@ -346,4 +346,4 @@ public void ParseParameterWithExamplesShouldSucceed() }); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs index 13c0f9f47..dbf0cf3f6 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs @@ -647,4 +647,4 @@ public void ParseSelfReferencingSchemaShouldNotStackOverflow() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs index d9443b0fd..57c156cc0 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs @@ -167,4 +167,4 @@ public void ParseOpenIdConnectSecuritySchemeShouldSucceed() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs index 439054354..a10d674a9 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs @@ -47,4 +47,4 @@ public void ParseBasicXmlShouldSucceed() } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs index 7c8418115..79656c865 100644 --- a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs +++ b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs @@ -19,7 +19,7 @@ public class ApisGuruTests { private static HttpClient _httpClient; private readonly ITestOutputHelper _output; - + public ApisGuruTests(ITestOutputHelper output) { _output = output; @@ -42,22 +42,22 @@ public static IEnumerable GetSchemas() .GetStringAsync("https://api.apis.guru/v2/list.json") .GetAwaiter().GetResult(); - var json = JObject.Parse(listJsonStr); - foreach (var item in json.Properties()) + var json = JObject.Parse(listJsonStr); + foreach (var item in json.Properties()) + { + var versions = GetProp(item.Value, "versions") as JObject; + if (versions == null) + continue; + foreach (var prop in versions.Properties()) { - var versions = GetProp(item.Value, "versions") as JObject; - if (versions == null) - continue; - foreach (var prop in versions.Properties()) - { - var urlToJson = GetProp(prop.Value, "swaggerUrl")?.ToObject(); - if (urlToJson != null) - yield return new object[] { urlToJson }; + var urlToJson = GetProp(prop.Value, "swaggerUrl")?.ToObject(); + if (urlToJson != null) + yield return new object[] { urlToJson }; - var utlToYaml = GetProp(prop.Value, "swaggerYamlUrl")?.ToObject(); - if (utlToYaml != null) - yield return new object[] { utlToYaml }; - } + var utlToYaml = GetProp(prop.Value, "swaggerYamlUrl")?.ToObject(); + if (utlToYaml != null) + yield return new object[] { utlToYaml }; + } } JToken GetProp(JToken obj, string prop) @@ -73,7 +73,7 @@ JToken GetProp(JToken obj, string prop) // Disable as some APIs are currently invalid [Theory(DisplayName = "APIs.guru")] [MemberData(nameof(GetSchemas))] public async Task EnsureThatICouldParse(string url) - { + { var response = await _httpClient.GetAsync(url); if (!response.IsSuccessStatusCode) { @@ -94,12 +94,12 @@ public async Task EnsureThatICouldParse(string url) { _output.WriteLine($"Errors parsing {url}"); _output.WriteLine(String.Join("\n", diagnostic.Errors)); - // Assert.True(false); // Uncomment to identify descriptions with errors. + // Assert.True(false); // Uncomment to identify descriptions with errors. } Assert.NotNull(openApiDocument); stopwatch.Stop(); - _output.WriteLine($"Parsing {url} took {stopwatch.ElapsedMilliseconds} ms."); + _output.WriteLine($"Parsing {url} took {stopwatch.ElapsedMilliseconds} ms."); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixture.cs b/test/Microsoft.OpenApi.Tests/DefaultSettingsFixture.cs index 7cad2949a..9bb685ddc 100644 --- a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixture.cs +++ b/test/Microsoft.OpenApi.Tests/DefaultSettingsFixture.cs @@ -25,4 +25,4 @@ public DefaultSettingsFixture() .WithStrictOrdering()); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixtureCollection.cs b/test/Microsoft.OpenApi.Tests/DefaultSettingsFixtureCollection.cs index 21180a7c5..4fdfe0b16 100644 --- a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixtureCollection.cs +++ b/test/Microsoft.OpenApi.Tests/DefaultSettingsFixtureCollection.cs @@ -16,4 +16,4 @@ namespace Microsoft.OpenApi.Tests public class DefaultSettingsFixtureCollection : ICollectionFixture { } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs index e7e794cb5..5c91249d3 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs @@ -186,7 +186,7 @@ public void CompositeRuntimeExpressionContainsMultipleExpressions() Assert.Equal(expression, response.Expression); var compositeExpression = runtimeExpression as CompositeExpression; - Assert.Equal(2,compositeExpression.ContainedExpressions.Count); + Assert.Equal(2, compositeExpression.ContainedExpressions.Count); compositeExpression.ContainedExpressions.Should().BeEquivalentTo(new List() { diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs index ae006679c..fbc86e7f9 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs @@ -203,4 +203,4 @@ public void SerializeReferencedCallbackAsV3JsonWithoutReferenceWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs index b06866087..002143b15 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs @@ -379,7 +379,7 @@ public void SerializeAdvancedComponentsWithReferenceAsJsonV3Works() // Act var actual = AdvancedComponentsWithReference.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -454,7 +454,7 @@ public void SerializeAdvancedComponentsWithReferenceAsYamlV3Works() // Act var actual = AdvancedComponentsWithReference.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -538,7 +538,7 @@ public void SerializeTopLevelReferencingComponentsAsYamlV3Works() // Act var actual = TopLevelReferencingComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -579,11 +579,11 @@ public void SerializeTopLevelSelfReferencingWithOtherPropertiesComponentsAsYamlV // Act var actual = TopLevelSelfReferencingComponentsWithOtherProperties.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs index 1441be7c5..1a99241d1 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs @@ -91,4 +91,4 @@ public void SerializeAdvanceContactAsYamlWorks(OpenApiSpecVersion version) actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs index 95a213920..d62e3bc77 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs @@ -2148,7 +2148,7 @@ public void SerializeAdvancedDocumentAsV2JsonWorks() AdvancedDocument.SerializeAsV2(writer); writer.Flush(); var actual = outputStringWriter.GetStringBuilder().ToString(); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -2416,7 +2416,7 @@ public void SerializeAdvancedDocumentWithReferenceAsV2JsonWorks() AdvancedDocumentWithReference.SerializeAsV2(writer); writer.Flush(); var actual = outputStringWriter.GetStringBuilder().ToString(); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -2442,7 +2442,7 @@ public void SerializeSimpleDocumentWithTopLevelReferencingComponentsAsYamlV2Work // Act var actual = SimpleDocumentWithTopLevelReferencingComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -2462,7 +2462,7 @@ public void SerializeSimpleDocumentWithTopLevelSelfReferencingComponentsAsYamlV3 // Act var actual = SimpleDocumentWithTopLevelSelfReferencingComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -2491,7 +2491,7 @@ public void SerializeSimpleDocumentWithTopLevelSelfReferencingWithOtherPropertie // Act var actual = SimpleDocumentWithTopLevelSelfReferencingComponentsWithOtherProperties.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0); - + // Assert actual = actual.MakeLineBreaksEnvironmentNeutral(); expected = expected.MakeLineBreaksEnvironmentNeutral(); @@ -2553,4 +2553,4 @@ public void SerializeDocumentWithReferenceButNoComponents() Assert.NotEmpty(actual); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs index cec2bc58a..24bfca242 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs @@ -75,4 +75,4 @@ public void SerializeAdvanceEncodingAsV3YamlWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs index e93d36b85..896b96215 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs @@ -218,4 +218,4 @@ public void SerializeReferencedExampleAsV3JsonWithoutReferenceWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs index 62c93925a..7d37fc9a4 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs @@ -78,4 +78,4 @@ public void SerializeAdvanceExDocsAsV3YamlWorks() #endregion } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs index 3ec936b1d..5c2671e54 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs @@ -190,4 +190,4 @@ public void SerializeReferencedHeaderAsV2JsonWithoutReferenceWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs index e2301b3f0..b2395a9ed 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs @@ -37,7 +37,7 @@ public class OpenApiInfoTests public static IEnumerable BasicInfoJsonExpected() { - var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0}; + var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 }; foreach (var specVersion in specVersions) { yield return new object[] @@ -66,7 +66,7 @@ public void SerializeBasicInfoAsJsonWorks(OpenApiSpecVersion version, string exp public static IEnumerable BasicInfoYamlExpected() { - var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0}; + var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 }; foreach (var specVersion in specVersions) { yield return new object[] @@ -93,7 +93,7 @@ public void SerializeBasicInfoAsYamlWorks(OpenApiSpecVersion version, string exp public static IEnumerable AdvanceInfoJsonExpect() { - var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0}; + var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 }; foreach (var specVersion in specVersions) { yield return new object[] @@ -136,7 +136,7 @@ public void SerializeAdvanceInfoAsJsonWorks(OpenApiSpecVersion version, string e public static IEnumerable AdvanceInfoYamlExpect() { - var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0}; + var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 }; foreach (var specVersion in specVersions) { yield return new object[] @@ -196,4 +196,4 @@ public void InfoVersionShouldAcceptDateStyledAsVersions() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs index 888d247fe..52e99b0b4 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs @@ -109,4 +109,4 @@ public void SerializeAdvanceLicenseAsYamlWorks(OpenApiSpecVersion version) actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs index 4fb92c006..ffcaa8804 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs @@ -162,4 +162,4 @@ public void SerializeReferencedLinkAsV3JsonWithoutReferenceWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs index da71c1acb..c59da1e86 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs @@ -407,4 +407,4 @@ public void SerializeMediaTypeWithObjectExamplesAsV3JsonWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs index 0a8afe496..80040f566 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs @@ -125,4 +125,4 @@ public void SerializeCompleteOAuthFlowAsV3JsonWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs index f90750d61..7d4882bbb 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs @@ -147,4 +147,4 @@ public void SerializeOAuthFlowsWithMultipleFlowsAsV3JsonWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs index f83950ef3..a59746214 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs @@ -783,4 +783,4 @@ public void SerializeOperationWithNullCollectionAsV2JsonWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs index 9833b5859..f37d18ed7 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs @@ -49,7 +49,7 @@ public class OpenApiParameterTests Title = "title2", Description = "description2" }, - Examples = new Dictionary + Examples = new Dictionary { ["test"] = new OpenApiExample { @@ -424,4 +424,4 @@ public void SerializeParameterWithFormStyleAndExplodeTrueWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs index 9e5b347ab..c251814db 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs @@ -65,7 +65,7 @@ public void SettingExternalReferenceShouldSucceed(string expected, string extern public void SerializeSchemaReferenceAsJsonV3Works() { // Arrange - var reference = new OpenApiReference {Type = ReferenceType.Schema, Id = "Pet"}; + var reference = new OpenApiReference { Type = ReferenceType.Schema, Id = "Pet" }; var expected = @"{ ""$ref"": ""#/components/schemas/Pet"" }"; @@ -182,7 +182,7 @@ public void SerializeExternalReferenceAsYamlV2Works() public void SerializeExternalReferenceAsJsonV3Works() { // Arrange - var reference = new OpenApiReference {ExternalResource = "main.json", Id = "Pets"}; + var reference = new OpenApiReference { ExternalResource = "main.json", Id = "Pets" }; var expected = @"{ ""$ref"": ""main.json#/Pets"" @@ -201,7 +201,7 @@ public void SerializeExternalReferenceAsJsonV3Works() public void SerializeExternalReferenceAsYamlV3Works() { // Arrange - var reference = new OpenApiReference {ExternalResource = "main.json", Id = "Pets"}; + var reference = new OpenApiReference { ExternalResource = "main.json", Id = "Pets" }; var expected = @"$ref: main.json#/Pets"; // Act @@ -211,4 +211,4 @@ public void SerializeExternalReferenceAsYamlV3Works() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs index 0ad882e9e..b225417fc 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs @@ -140,4 +140,4 @@ public void SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs index fce3bf097..93ed45b60 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs @@ -397,4 +397,4 @@ public void SerializeReferencedResponseAsV2JsonWithoutReferenceWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs index 2015985e4..4f9510132 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs @@ -164,7 +164,7 @@ public class OpenApiSchemaTests public static OpenApiSchema AdvancedSchemaWithRequiredPropertiesObject = new OpenApiSchema { Title = "title1", - Required = new HashSet(){ "property1" }, + Required = new HashSet() { "property1" }, Properties = new Dictionary { ["property1"] = new OpenApiSchema @@ -478,4 +478,4 @@ public void SerializeSchemaWRequiredPropertiesAsV2JsonWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs index f27efc40c..7d630c5f6 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs @@ -21,7 +21,7 @@ public class OpenApiSecurityRequirementTests [ new OpenApiSecurityScheme { - Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme1"} + Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "scheme1" } } ] = new List { @@ -32,7 +32,7 @@ public class OpenApiSecurityRequirementTests [ new OpenApiSecurityScheme { - Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme2"} + Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "scheme2" } } ] = new List { @@ -42,7 +42,7 @@ public class OpenApiSecurityRequirementTests [ new OpenApiSecurityScheme { - Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme3"} + Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "scheme3" } } ] = new List() }; @@ -53,7 +53,7 @@ public class OpenApiSecurityRequirementTests [ new OpenApiSecurityScheme { - Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme1"} + Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "scheme1" } } ] = new List { @@ -75,7 +75,7 @@ public class OpenApiSecurityRequirementTests [ new OpenApiSecurityScheme { - Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme3"} + Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "scheme3" } } ] = new List() }; @@ -255,7 +255,7 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality() // Act securityRequirement.Add(securityScheme1, new List()); - securityRequirement.Add(securityScheme2, new List {"scope1", "scope2"}); + securityRequirement.Add(securityScheme2, new List { "scope1", "scope2" }); Action addSecurityScheme1Duplicate = () => securityRequirement.Add(securityScheme1Duplicate, new List()); @@ -276,8 +276,8 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality() // This should work with any security scheme object // as long as Reference.Id os securityScheme1 [securityScheme1WithDifferentProperties] = new List(), - [securityScheme2] = new List {"scope1", "scope2"}, + [securityScheme2] = new List { "scope1", "scope2" }, }); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs index 78b6b4b4b..5fb99cb95 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs @@ -348,4 +348,4 @@ public void SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs index 5557d7e0e..e4d4f36fb 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs @@ -101,4 +101,4 @@ public void SerializeAdvancedServerAsV3JsonWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs index 613c95971..9d50f76f6 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs @@ -82,4 +82,4 @@ public void SerializeAdvancedServerVariableAsV3YamlWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs index 30c5f28af..4920e165d 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs @@ -386,4 +386,4 @@ public void SerializeReferencedTagAsV2YamlWorks() actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs index 77c834042..9e79c5211 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs @@ -95,4 +95,4 @@ public void SerializeAdvancedXmlAsYamlWorks(OpenApiSpecVersion version) actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTestCases.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTestCases.cs index 76df51c25..69ab1d1ae 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTestCases.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTestCases.cs @@ -2404,4 +2404,4 @@ public static IEnumerable GetTestCasesForOpenApiComparerShouldSucceed( }; } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs index cab0642fb..a100517f0 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs @@ -79,4 +79,4 @@ public void OpenApiComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs index 23223a60d..221661bff 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs @@ -905,4 +905,4 @@ public void OpenApiComponentsComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs index 467ac5e72..2982f40de 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs @@ -335,8 +335,8 @@ public static IEnumerable GetTestCasesForOpenApiEncodingComparerShould }; } - - [Theory(Skip="Need to fix")] + + [Theory(Skip = "Need to fix")] [MemberData(nameof(GetTestCasesForOpenApiEncodingComparerShouldSucceed))] public void OpenApiEncodingComparerShouldSucceed( string testCaseName, @@ -357,4 +357,4 @@ public void OpenApiEncodingComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs index 5d089a4ac..716c75783 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs @@ -458,4 +458,4 @@ public void OpenApiExampleComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs index 8e2daf371..b5c9b70df 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs @@ -294,4 +294,4 @@ public void OpenApiInfoComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs index bd881d7f6..a2455bbae 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs @@ -474,4 +474,4 @@ public void OpenApiParameterComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs index be325f28b..6d7c2129a 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs @@ -429,4 +429,4 @@ public void OpenApiParametersComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs index 3e8bdf8b8..957708e8c 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs @@ -584,4 +584,4 @@ public void OpenApiRequestBodyComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs index 9f55e16de..7cbf858b3 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs @@ -815,4 +815,4 @@ public void OpenApiResponsesComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs index 9d216f473..840b74bea 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs @@ -286,4 +286,4 @@ public void OpenApiSecurityRequirementComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs index 62a351dea..1e0392843 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs @@ -305,4 +305,4 @@ public void OpenApiSecuritySchemeComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs index 2ab4e87b4..4b2e17dc2 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs @@ -284,4 +284,4 @@ public void OpenApiServerVariableComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs index 23a2e6eea..66ae5c102 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs @@ -514,4 +514,4 @@ public void OpenApiServersComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs index 71b42e52e..ab8173577 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs @@ -301,4 +301,4 @@ public void OpenApiTagServerVariableComparerShouldSucceed( differences.Should().BeEquivalentTo(expectedDifferences); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs index f6f8ab5f2..45cc9c3d9 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs @@ -104,7 +104,7 @@ public void ServersShouldBeReferencedByIndex() public void ValidateCustomExtension() { var ruleset = ValidationRuleSet.GetDefaultRuleSet(); - + ruleset.Add( new ValidationRule( (context, item) => @@ -131,7 +131,7 @@ public void ValidateCustomExtension() Baz = "baz" }; - openApiDocument.Info.Extensions.Add("x-foo",fooExtension); + openApiDocument.Info.Extensions.Add("x-foo", fooExtension); var validator = new OpenApiValidator(ruleset); var walker = new OpenApiWalker(validator); @@ -160,4 +160,4 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion) writer.WriteEndObject(); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/StringExtensions.cs b/test/Microsoft.OpenApi.Tests/StringExtensions.cs index c2741035e..5b01c97ac 100644 --- a/test/Microsoft.OpenApi.Tests/StringExtensions.cs +++ b/test/Microsoft.OpenApi.Tests/StringExtensions.cs @@ -21,4 +21,4 @@ public static string MakeLineBreaksEnvironmentNeutral(this string input) .Replace("\n", Environment.NewLine); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs index 0edfc93a7..d10eaf590 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs @@ -20,7 +20,7 @@ public void ValidateKeyMustMatchRegularExpressionInComponents() { // Arrange const string key = "%@abc"; - + OpenApiComponents components = new OpenApiComponents() { Responses = new Dictionary @@ -33,7 +33,7 @@ public void ValidateKeyMustMatchRegularExpressionInComponents() // Act bool result = !errors.Any(); - + // Assert Assert.False(result); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs index ac499708d..ec6bba7b5 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs @@ -19,7 +19,7 @@ public void ValidateEmailFieldIsEmailAddressInContact() { // Arrange const string testEmail = "support/example.com"; - + OpenApiContact contact = new OpenApiContact() { Email = testEmail diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs index 4c1325894..fee728f76 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs @@ -24,7 +24,7 @@ public void ValidateUrlIsRequiredInExternalDocs() var errors = externalDocs.Validate(ValidationRuleSet.GetDefaultRuleSet()); // Assert - + bool result = !errors.Any(); Assert.False(result); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs index d6e30010b..3ed365c8d 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs @@ -44,7 +44,7 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce() { ["/"] = new OpenApiPathItem() { - Operations = new Dictionary + Operations = new Dictionary { [OperationType.Get] = new OpenApiOperation() { @@ -52,7 +52,7 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce() { ["200"] = new OpenApiResponse() { - Content = new Dictionary() + Content = new Dictionary() { ["application/json"] = new OpenApiMediaType() { @@ -67,11 +67,11 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce() }; // Act - var errors = document.Validate(new ValidationRuleSet() { new AlwaysFailRule()}); + var errors = document.Validate(new ValidationRuleSet() { new AlwaysFailRule() }); // Assert - Assert.True(errors.Count() == 1); + Assert.True(errors.Count() == 1); } [Fact] @@ -154,11 +154,11 @@ public void UnresolvedSchemaReferencedShouldNotBeValidated() } } - public class AlwaysFailRule : ValidationRule where T: IOpenApiElement + public class AlwaysFailRule : ValidationRule where T : IOpenApiElement { - public AlwaysFailRule() : base( (c,t) => c.CreateError("x","y")) + public AlwaysFailRule() : base((c, t) => c.CreateError("x", "y")) { - + } } } diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs index a00f5e502..a039b39c2 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs @@ -50,7 +50,7 @@ public void ValidateExtensionNameStartsWithXDashInTag() var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet()); validator.Visit(tag as IOpenApiExtensible); errors = validator.Errors; - bool result = !errors.Any(); + bool result = !errors.Any(); // Assert Assert.False(result); diff --git a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs index 0a1193e90..fc947da20 100644 --- a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs @@ -211,7 +211,7 @@ public void LocateReferences() { ["application/json"] = new OpenApiMediaType() { - Schema = derivedSchema + Schema = derivedSchema } }, Headers = new Dictionary() @@ -226,13 +226,14 @@ public void LocateReferences() }, Components = new OpenApiComponents() { - Schemas = new Dictionary() { + Schemas = new Dictionary() + { ["derived"] = derivedSchema, ["base"] = baseSchema, }, Headers = new Dictionary() { - ["test-header"] = testHeader + ["test-header"] = testHeader } } }; diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs index d9d2e9124..06d95c9ad 100644 --- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs +++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs @@ -196,10 +196,10 @@ public static IEnumerable WriteMapAsJsonShouldMatchExpectedTestCasesCo private void WriteValueRecursive(OpenApiJsonWriter writer, object value) { - if (value == null - || value.GetType().IsPrimitive - || value is decimal - || value is string + if (value == null + || value.GetType().IsPrimitive + || value is decimal + || value is string || value is DateTimeOffset || value is DateTime) { @@ -293,4 +293,4 @@ public void WriteDateTimeAsJsonShouldMatchExpected(DateTimeOffset dateTimeOffset writtenString.Should().Be(expectedString); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs index eb51c9f3e..2ecf93f42 100644 --- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs +++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs @@ -217,4 +217,4 @@ private static string WriteAsJson(IOpenApiAny any) return value.MakeLineBreaksEnvironmentNeutral(); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs index 477d64166..60e598882 100644 --- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs +++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs @@ -76,4 +76,4 @@ public void WriteStringWithSpecialCharactersAsYamlWorks(string input, string exp actual.Should().Be(expected); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs index e6b81e0fb..4b0df7624 100644 --- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs +++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs @@ -264,7 +264,7 @@ private void WriteValueRecursive(OpenApiYamlWriter writer, object value) } else if (value.GetType().IsGenericType && (typeof(IDictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()) || - typeof(Dictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()) ) ) + typeof(Dictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()))) { writer.WriteStartObject(); foreach (var elementValue in (dynamic)(value)) @@ -347,4 +347,4 @@ public void WriteDateTimeAsJsonShouldMatchExpected(DateTimeOffset dateTimeOffset writtenString.Should().Be(expectedString); } } -} \ No newline at end of file +}