Merge pull request #1379 from SimonCropp/CancellationToken

baywet · web-flow · commit b7117944640d · 2023-10-02T09:42:06.000-04:00
cleanup CancellationToken
diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs
@@ -41,7 +41,7 @@ internal static class OpenApiService
         /// <summary>
         /// Implementation of the transform command
         /// </summary>
-        public static async Task TransformOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken)
+        public static async Task TransformOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(options.OpenApi) && string.IsNullOrEmpty(options.Csdl) && string.IsNullOrEmpty(options.FilterOptions?.FilterByApiManifest))
             {
@@ -85,7 +85,7 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l
                 }
 
                 // Load OpenAPI document
-                OpenApiDocument document = await GetOpenApi(options, logger, cancellationToken, options.MetadataVersion).ConfigureAwait(false);
+                OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);
 
                 if (options.FilterOptions != null)
                 {
@@ -116,7 +116,7 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l
             }
         }
 
-        private static async Task<ApiDependency?> FindApiDependency(string? apiManifestPath, ILogger logger, CancellationToken cancellationToken)
+        private static async Task<ApiDependency?> FindApiDependency(string? apiManifestPath, ILogger logger, CancellationToken cancellationToken = default)
         {
             ApiDependency? apiDependency = null;
             // If API Manifest is provided, load it, use it get the OpenAPI path
@@ -212,7 +212,7 @@ private static void WriteOpenApi(HidiOptions options, OpenApiFormat openApiForma
         }
 
         // Get OpenAPI document either from OpenAPI or CSDL 
-        private static async Task<OpenApiDocument> GetOpenApi(HidiOptions options, ILogger logger, CancellationToken cancellationToken, string? metadataVersion = null)
+        private static async Task<OpenApiDocument> GetOpenApi(HidiOptions options, ILogger logger, string? metadataVersion = null, CancellationToken cancellationToken = default)
         {
 
             OpenApiDocument document;
@@ -326,7 +326,7 @@ private static Stream ApplyFilterToCsdl(Stream csdlStream, string entitySetOrSin
         public static async Task ValidateOpenApiDocument(
             string openApi,
             ILogger logger,
-            CancellationToken cancellationToken)
+            CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(openApi))
             {
@@ -361,7 +361,7 @@ public static async Task ValidateOpenApiDocument(
             }
         }
 
-        private static async Task<ReadResult> ParseOpenApi(string openApiFile, bool inlineExternal, ILogger logger, Stream stream, CancellationToken cancellationToken)
+        private static async Task<ReadResult> ParseOpenApi(string openApiFile, bool inlineExternal, ILogger logger, Stream stream, CancellationToken cancellationToken = default)
         {
             ReadResult result;
             Stopwatch stopwatch = Stopwatch.StartNew();
@@ -480,7 +480,7 @@ private static Dictionary<string, List<string>> EnumerateJsonDocument(JsonElemen
         /// <summary>
         /// Reads stream from file system or makes HTTP request depending on the input string
         /// </summary>
-        private static async Task<Stream> GetStream(string input, ILogger logger, CancellationToken cancellationToken)
+        private static async Task<Stream> GetStream(string input, ILogger logger, CancellationToken cancellationToken = default)
         {
             Stream stream;
             using (logger.BeginScope("Reading input stream"))
@@ -556,7 +556,7 @@ private static string GetInputPathExtension(string? openapi = null, string? csdl
             return extension;
         }
 
-        internal static async Task<string?> ShowOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken)
+        internal static async Task<string?> ShowOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken = default)
         {
             try
             {
@@ -565,7 +565,7 @@ private static string GetInputPathExtension(string? openapi = null, string? csdl
                     throw new ArgumentException("Please input a file path or URL");
                 }
 
-                var document = await GetOpenApi(options, logger, cancellationToken).ConfigureAwait(false);
+                var document = await GetOpenApi(options, logger, null, cancellationToken).ConfigureAwait(false);
 
                 using (logger.BeginScope("Creating diagram"))
                 {
@@ -716,7 +716,7 @@ internal static void WriteTreeDocumentAsHtml(string sourceUrl, OpenApiDocument d
             writer.WriteLine("</html");
         }
 
-        internal static async Task PluginManifest(HidiOptions options, ILogger logger, CancellationToken cancellationToken)
+        internal static async Task PluginManifest(HidiOptions options, ILogger logger, CancellationToken cancellationToken = default)
         {
             // If ApiManifest is provided, set the referenced OpenAPI document
             var apiDependency = await FindApiDependency(options.FilterOptions?.FilterByApiManifest, logger, cancellationToken).ConfigureAwait(false);
@@ -726,7 +726,7 @@ internal static async Task PluginManifest(HidiOptions options, ILogger logger, C
             }
 
             // Load OpenAPI document
-            OpenApiDocument document = await GetOpenApi(options, logger, cancellationToken, options.MetadataVersion).ConfigureAwait(false);
+            OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);
 
             cancellationToken.ThrowIfCancellationRequested();
 
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs
@@ -139,15 +139,15 @@ public async Task<ReadResult> ReadAsync(YamlDocument input, CancellationToken ca
             };
         }
 
-        private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, CancellationToken cancellationToken)
+        private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, CancellationToken cancellationToken = default)
         {
             // Create workspace for all documents to live in.
             var openApiWorkSpace = new OpenApiWorkspace();
 
             // Load this root document into the workspace
             var streamLoader = new DefaultStreamLoader(_settings.BaseUrl);
             var workspaceLoader = new OpenApiWorkspaceLoader(openApiWorkSpace, _settings.CustomExternalLoader ?? streamLoader, _settings);
-            return await workspaceLoader.LoadAsync(new OpenApiReference { ExternalResource = "/" }, document, cancellationToken);
+            return await workspaceLoader.LoadAsync(new OpenApiReference { ExternalResource = "/" }, document, null, cancellationToken);
         }
 
         private void ResolveReferences(OpenApiDiagnostic diagnostic, OpenApiDocument document)
diff --git a/src/Microsoft.OpenApi.Readers/Services/OpenApiWorkspaceLoader.cs b/src/Microsoft.OpenApi.Readers/Services/OpenApiWorkspaceLoader.cs
@@ -20,7 +20,7 @@ public OpenApiWorkspaceLoader(OpenApiWorkspace workspace, IStreamLoader loader,
             _readerSettings = readerSettings;
         }
 
-        internal async Task<OpenApiDiagnostic> LoadAsync(OpenApiReference reference, OpenApiDocument document, CancellationToken cancellationToken, OpenApiDiagnostic diagnostic = null)
+        internal async Task<OpenApiDiagnostic> LoadAsync(OpenApiReference reference, OpenApiDocument document, OpenApiDiagnostic diagnostic = null, CancellationToken cancellationToken = default)
         {
             _workspace.AddDocument(reference.ExternalResource, document);
             document.Workspace = _workspace;
@@ -52,7 +52,7 @@ internal async Task<OpenApiDiagnostic> LoadAsync(OpenApiReference reference, Ope
                     }
                     if (result.OpenApiDocument != null)
                     {
-                        var loadDiagnostic = await LoadAsync(item, result.OpenApiDocument, cancellationToken, diagnostic);
+                        var loadDiagnostic = await LoadAsync(item, result.OpenApiDocument, diagnostic, cancellationToken);
                         diagnostic = loadDiagnostic;
                     }
                 }
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
@@ -141,7 +141,7 @@ public async Task ShowCommandGeneratesMermaidMarkdownFileWithMermaidDiagram()
                 Output = new FileInfo("sample.md")
             };
 
-            await OpenApiService.ShowOpenApiDocument(options, _logger, new CancellationToken());
+            await OpenApiService.ShowOpenApiDocument(options, _logger);
 
             var output = await File.ReadAllTextAsync(options.Output.FullName);
             Assert.Contains("graph LR", output, StringComparison.Ordinal);
@@ -154,7 +154,7 @@ public async Task ShowCommandGeneratesMermaidHtmlFileWithMermaidDiagram()
             {
                 OpenApi = Path.Combine("UtilityFiles", "SampleOpenApi.yml")
             };
-            var filePath = await OpenApiService.ShowOpenApiDocument(options, _logger, new CancellationToken());
+            var filePath = await OpenApiService.ShowOpenApiDocument(options, _logger);
             Assert.True(File.Exists(filePath));
         }
 
@@ -169,7 +169,7 @@ public async Task ShowCommandGeneratesMermaidMarkdownFileFromCsdlWithMermaidDiag
             };
 
             // create a dummy ILogger instance for testing
-            await OpenApiService.ShowOpenApiDocument(options, _logger, new CancellationToken());
+            await OpenApiService.ShowOpenApiDocument(options, _logger);
 
             var output = await File.ReadAllTextAsync(options.Output.FullName);
             Assert.Contains("graph LR", output, StringComparison.Ordinal);
@@ -179,29 +179,29 @@ public async Task ShowCommandGeneratesMermaidMarkdownFileFromCsdlWithMermaidDiag
         public async Task ThrowIfOpenApiUrlIsNotProvidedWhenValidating()
         {
             await Assert.ThrowsAsync<ArgumentNullException>(async () =>
-                await OpenApiService.ValidateOpenApiDocument("", _logger, new CancellationToken()));
+                await OpenApiService.ValidateOpenApiDocument("", _logger));
         }
 
 
         [Fact]
         public async Task ThrowIfURLIsNotResolvableWhenValidating()
         {
             await Assert.ThrowsAsync<InvalidOperationException>(async () =>
-                await OpenApiService.ValidateOpenApiDocument("https://example.org/itdoesnmatter", _logger, new CancellationToken()));
+                await OpenApiService.ValidateOpenApiDocument("https://example.org/itdoesnmatter", _logger));
         }
 
         [Fact]
         public async Task ThrowIfFileDoesNotExistWhenValidating()
         {
             await Assert.ThrowsAsync<InvalidOperationException>(async () =>
-                await OpenApiService.ValidateOpenApiDocument("aFileThatBetterNotExist.fake", _logger, new CancellationToken()));
+                await OpenApiService.ValidateOpenApiDocument("aFileThatBetterNotExist.fake", _logger));
         }
 
         [Fact]
         public async Task ValidateCommandProcessesOpenApi()
         {
             // create a dummy ILogger instance for testing
-            await OpenApiService.ValidateOpenApiDocument(Path.Combine("UtilityFiles", "SampleOpenApi.yml"), _logger, new CancellationToken());
+            await OpenApiService.ValidateOpenApiDocument(Path.Combine("UtilityFiles", "SampleOpenApi.yml"), _logger);
 
             Assert.True(true);
         }
@@ -220,7 +220,7 @@ public async Task TransformCommandConvertsOpenApi()
                 InlineExternal = false,
             };
             // create a dummy ILogger instance for testing
-            await OpenApiService.TransformOpenApiDocument(options, _logger, new CancellationToken());
+            await OpenApiService.TransformOpenApiDocument(options, _logger);
 
             var output = await File.ReadAllTextAsync("sample.json");
             Assert.NotEmpty(output);
@@ -239,7 +239,7 @@ public async Task TransformCommandConvertsOpenApiWithDefaultOutputName()
                 InlineExternal = false,
             };
             // create a dummy ILogger instance for testing
-            await OpenApiService.TransformOpenApiDocument(options, _logger, new CancellationToken());
+            await OpenApiService.TransformOpenApiDocument(options, _logger);
 
             var output = await File.ReadAllTextAsync("output.yml");
             Assert.NotEmpty(output);
@@ -257,7 +257,7 @@ public async Task TransformCommandConvertsCsdlWithDefaultOutputName()
                 InlineExternal = false,
             };
             // create a dummy ILogger instance for testing
-            await OpenApiService.TransformOpenApiDocument(options, _logger, new CancellationToken());
+            await OpenApiService.TransformOpenApiDocument(options, _logger);
 
             var output = await File.ReadAllTextAsync("output.yml");
             Assert.NotEmpty(output);
@@ -277,7 +277,7 @@ public async Task TransformCommandConvertsOpenApiWithDefaultOutputNameAndSwitchF
                 InlineExternal = false,
             };
             // create a dummy ILogger instance for testing
-            await OpenApiService.TransformOpenApiDocument(options, _logger, new CancellationToken());
+            await OpenApiService.TransformOpenApiDocument(options, _logger);
 
             var output = await File.ReadAllTextAsync("output.yml");
             Assert.NotEmpty(output);
@@ -294,7 +294,7 @@ public async Task ThrowTransformCommandIfOpenApiAndCsdlAreEmpty()
                 InlineExternal = false,
             };
             await Assert.ThrowsAsync<ArgumentException>(async () =>
-                await OpenApiService.TransformOpenApiDocument(options, _logger, new CancellationToken()));
+                await OpenApiService.TransformOpenApiDocument(options, _logger));
 
         }
 
@@ -314,7 +314,7 @@ public async Task TransformToPowerShellCompliantOpenApi()
                 SettingsConfig = SettingsUtilities.GetConfiguration(settingsPath)
             };
             // create a dummy ILogger instance for testing
-            await OpenApiService.TransformOpenApiDocument(options, _logger, new CancellationToken());
+            await OpenApiService.TransformOpenApiDocument(options, _logger);
 
             var output = await File.ReadAllTextAsync("output.yml");
             Assert.NotEmpty(output);

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ internal static class OpenApiService`
`41`	`41`	`/// <summary>`
`42`	`42`	`/// Implementation of the transform command`
`43`	`43`	`/// </summary>`
`44`		`- public static async Task TransformOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken)`
	`44`	`+ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken = default)`
`45`	`45`	`{`
`46`	`46`	`if (string.IsNullOrEmpty(options.OpenApi) && string.IsNullOrEmpty(options.Csdl) && string.IsNullOrEmpty(options.FilterOptions?.FilterByApiManifest))`
`47`	`47`	`{`
`@@ -85,7 +85,7 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// Load OpenAPI document`
`88`		`- OpenApiDocument document = await GetOpenApi(options, logger, cancellationToken, options.MetadataVersion).ConfigureAwait(false);`
	`88`	`+ OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);`
`89`	`89`
`90`	`90`	`if (options.FilterOptions != null)`
`91`	`91`	`{`
`@@ -116,7 +116,7 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`- private static async Task<ApiDependency?> FindApiDependency(string? apiManifestPath, ILogger logger, CancellationToken cancellationToken)`
	`119`	`+ private static async Task<ApiDependency?> FindApiDependency(string? apiManifestPath, ILogger logger, CancellationToken cancellationToken = default)`
`120`	`120`	`{`
`121`	`121`	`ApiDependency? apiDependency = null;`
`122`	`122`	`// If API Manifest is provided, load it, use it get the OpenAPI path`
`@@ -212,7 +212,7 @@ private static void WriteOpenApi(HidiOptions options, OpenApiFormat openApiForma`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`// Get OpenAPI document either from OpenAPI or CSDL`
`215`		`- private static async Task<OpenApiDocument> GetOpenApi(HidiOptions options, ILogger logger, CancellationToken cancellationToken, string? metadataVersion = null)`
	`215`	`+ private static async Task<OpenApiDocument> GetOpenApi(HidiOptions options, ILogger logger, string? metadataVersion = null, CancellationToken cancellationToken = default)`
`216`	`216`	`{`
`217`	`217`
`218`	`218`	`OpenApiDocument document;`
`@@ -326,7 +326,7 @@ private static Stream ApplyFilterToCsdl(Stream csdlStream, string entitySetOrSin`
`326`	`326`	`public static async Task ValidateOpenApiDocument(`
`327`	`327`	`string openApi,`
`328`	`328`	`ILogger logger,`
`329`		`- CancellationToken cancellationToken)`
	`329`	`+ CancellationToken cancellationToken = default)`
`330`	`330`	`{`
`331`	`331`	`if (string.IsNullOrEmpty(openApi))`
`332`	`332`	`{`
`@@ -361,7 +361,7 @@ public static async Task ValidateOpenApiDocument(`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`364`		`- private static async Task<ReadResult> ParseOpenApi(string openApiFile, bool inlineExternal, ILogger logger, Stream stream, CancellationToken cancellationToken)`
	`364`	`+ private static async Task<ReadResult> ParseOpenApi(string openApiFile, bool inlineExternal, ILogger logger, Stream stream, CancellationToken cancellationToken = default)`
`365`	`365`	`{`
`366`	`366`	`ReadResult result;`
`367`	`367`	`Stopwatch stopwatch = Stopwatch.StartNew();`
`@@ -480,7 +480,7 @@ private static Dictionary<string, List<string>> EnumerateJsonDocument(JsonElemen`
`480`	`480`	`/// <summary>`
`481`	`481`	`/// Reads stream from file system or makes HTTP request depending on the input string`
`482`	`482`	`/// </summary>`
`483`		`- private static async Task<Stream> GetStream(string input, ILogger logger, CancellationToken cancellationToken)`
	`483`	`+ private static async Task<Stream> GetStream(string input, ILogger logger, CancellationToken cancellationToken = default)`
`484`	`484`	`{`
`485`	`485`	`Stream stream;`
`486`	`486`	`using (logger.BeginScope("Reading input stream"))`
`@@ -556,7 +556,7 @@ private static string GetInputPathExtension(string? openapi = null, string? csdl`
`556`	`556`	`return extension;`
`557`	`557`	`}`
`558`	`558`
`559`		`- internal static async Task<string?> ShowOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken)`
	`559`	`+ internal static async Task<string?> ShowOpenApiDocument(HidiOptions options, ILogger logger, CancellationToken cancellationToken = default)`
`560`	`560`	`{`
`561`	`561`	`try`
`562`	`562`	`{`
`@@ -565,7 +565,7 @@ private static string GetInputPathExtension(string? openapi = null, string? csdl`
`565`	`565`	`throw new ArgumentException("Please input a file path or URL");`
`566`	`566`	`}`
`567`	`567`
`568`		`- var document = await GetOpenApi(options, logger, cancellationToken).ConfigureAwait(false);`
	`568`	`+ var document = await GetOpenApi(options, logger, null, cancellationToken).ConfigureAwait(false);`
`569`	`569`
`570`	`570`	`using (logger.BeginScope("Creating diagram"))`
`571`	`571`	`{`
`@@ -716,7 +716,7 @@ internal static void WriteTreeDocumentAsHtml(string sourceUrl, OpenApiDocument d`
`716`	`716`	`writer.WriteLine("</html");`
`717`	`717`	`}`
`718`	`718`
`719`		`- internal static async Task PluginManifest(HidiOptions options, ILogger logger, CancellationToken cancellationToken)`
	`719`	`+ internal static async Task PluginManifest(HidiOptions options, ILogger logger, CancellationToken cancellationToken = default)`
`720`	`720`	`{`
`721`	`721`	`// If ApiManifest is provided, set the referenced OpenAPI document`
`722`	`722`	`var apiDependency = await FindApiDependency(options.FilterOptions?.FilterByApiManifest, logger, cancellationToken).ConfigureAwait(false);`
`@@ -726,7 +726,7 @@ internal static async Task PluginManifest(HidiOptions options, ILogger logger, C`
`726`	`726`	`}`
`727`	`727`
`728`	`728`	`// Load OpenAPI document`
`729`		`- OpenApiDocument document = await GetOpenApi(options, logger, cancellationToken, options.MetadataVersion).ConfigureAwait(false);`
	`729`	`+ OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);`
`730`	`730`
`731`	`731`	`cancellationToken.ThrowIfCancellationRequested();`
`732`	`732`
Original file line number	Diff line number	Diff line change
`@@ -139,15 +139,15 @@ public async Task<ReadResult> ReadAsync(YamlDocument input, CancellationToken ca`
`139`	`139`	`};`
`140`	`140`	`}`
`141`	`141`
`142`		`- private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, CancellationToken cancellationToken)`
	`142`	`+ private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, CancellationToken cancellationToken = default)`
`143`	`143`	`{`
`144`	`144`	`// Create workspace for all documents to live in.`
`145`	`145`	`var openApiWorkSpace = new OpenApiWorkspace();`
`146`	`146`
`147`	`147`	`// Load this root document into the workspace`
`148`	`148`	`var streamLoader = new DefaultStreamLoader(_settings.BaseUrl);`
`149`	`149`	`var workspaceLoader = new OpenApiWorkspaceLoader(openApiWorkSpace, _settings.CustomExternalLoader ?? streamLoader, _settings);`
`150`		`- return await workspaceLoader.LoadAsync(new OpenApiReference { ExternalResource = "/" }, document, cancellationToken);`
	`150`	`+ return await workspaceLoader.LoadAsync(new OpenApiReference { ExternalResource = "/" }, document, null, cancellationToken);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`private void ResolveReferences(OpenApiDiagnostic diagnostic, OpenApiDocument document)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public OpenApiWorkspaceLoader(OpenApiWorkspace workspace, IStreamLoader loader,`
`20`	`20`	`_readerSettings = readerSettings;`
`21`	`21`	`}`
`22`	`22`
`23`		`- internal async Task<OpenApiDiagnostic> LoadAsync(OpenApiReference reference, OpenApiDocument document, CancellationToken cancellationToken, OpenApiDiagnostic diagnostic = null)`
	`23`	`+ internal async Task<OpenApiDiagnostic> LoadAsync(OpenApiReference reference, OpenApiDocument document, OpenApiDiagnostic diagnostic = null, CancellationToken cancellationToken = default)`
`24`	`24`	`{`
`25`	`25`	`_workspace.AddDocument(reference.ExternalResource, document);`
`26`	`26`	`document.Workspace = _workspace;`
`@@ -52,7 +52,7 @@ internal async Task<OpenApiDiagnostic> LoadAsync(OpenApiReference reference, Ope`
`52`	`52`	`}`
`53`	`53`	`if (result.OpenApiDocument != null)`
`54`	`54`	`{`
`55`		`- var loadDiagnostic = await LoadAsync(item, result.OpenApiDocument, cancellationToken, diagnostic);`
	`55`	`+ var loadDiagnostic = await LoadAsync(item, result.OpenApiDocument, diagnostic, cancellationToken);`
`56`	`56`	`diagnostic = loadDiagnostic;`
`57`	`57`	`}`
`58`	`58`	`}`