Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

use some var #1417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baywet merged 1 commit into from
Oct 10, 2023
Merged

use some var #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private static string SingularizeAndDeduplicateOperationId(IList<string> operati
var lastSegmentIndex = segmentsCount - 1;
var singularizedSegments = new List<string>();

for (int x = 0; x < segmentsCount; x++)
for (var x = 0; x < segmentsCount; x++)
{
var segment = operationIdSegments[x].Singularize(inputIsKnownToBePlural: false);

Expand Down
4 changes: 2 additions & 2 deletions 4 src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public int Invoke(InvocationContext context)
}
public async Task<int> InvokeAsync(InvocationContext context)
{
HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));

using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
var logger = loggerFactory.CreateLogger<PluginCommandHandler>();
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public int Invoke(InvocationContext context)
}
public async Task<int> InvokeAsync(InvocationContext context)
{
HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));

using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
var logger = loggerFactory.CreateLogger<ShowCommandHandler>();
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public int Invoke(InvocationContext context)
}
public async Task<int> InvokeAsync(InvocationContext context)
{
HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));

using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
var logger = loggerFactory.CreateLogger<TransformCommandHandler>();
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public int Invoke(InvocationContext context)
}
public async Task<int> InvokeAsync(InvocationContext context)
{
HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
var logger = loggerFactory.CreateLogger<ValidateCommandHandler>();
try
Expand Down
18 changes: 9 additions & 9 deletions 18 src/Microsoft.OpenApi.Hidi/OpenApiService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l
}

// Default to yaml and OpenApiVersion 3 during csdl to OpenApi conversion
OpenApiFormat openApiFormat = options.OpenApiFormat ?? (!string.IsNullOrEmpty(options.OpenApi) ? GetOpenApiFormat(options.OpenApi, logger) : OpenApiFormat.Yaml);
OpenApiSpecVersion openApiVersion = options.Version != null ? TryParseOpenApiSpecVersion(options.Version) : OpenApiSpecVersion.OpenApi3_0;
var openApiFormat = options.OpenApiFormat ?? (!string.IsNullOrEmpty(options.OpenApi) ? GetOpenApiFormat(options.OpenApi, logger) : OpenApiFormat.Yaml);
var openApiVersion = options.Version != null ? TryParseOpenApiSpecVersion(options.Version) : OpenApiSpecVersion.OpenApi3_0;

// If ApiManifest is provided, set the referenced OpenAPI document
var apiDependency = await FindApiDependency(options.FilterOptions.FilterByApiManifest, logger, cancellationToken).ConfigureAwait(false);
Expand All @@ -85,7 +85,7 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l
}

// Load OpenAPI document
OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);
var document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);

if (options.FilterOptions != null)
{
Expand Down Expand Up @@ -227,7 +227,7 @@ private static async Task<OpenApiDocument> GetOpenApi(HidiOptions options, ILogg
Stream? filteredStream = null;
if (!string.IsNullOrEmpty(options.CsdlFilter))
{
XslCompiledTransform transform = GetFilterTransform();
var transform = GetFilterTransform();
filteredStream = ApplyFilterToCsdl(stream, options.CsdlFilter, transform);
filteredStream.Position = 0;
await stream.DisposeAsync().ConfigureAwait(false);
Expand Down Expand Up @@ -299,7 +299,7 @@ private static Dictionary<string, List<string>> GetRequestUrlsFromManifest(ApiDe
private static XslCompiledTransform GetFilterTransform()
{
XslCompiledTransform transform = new();
Assembly assembly = typeof(OpenApiService).GetTypeInfo().Assembly;
var assembly = typeof(OpenApiService).GetTypeInfo().Assembly;
using var xslt = assembly.GetManifestResourceStream("Microsoft.OpenApi.Hidi.CsdlFilter.xslt") ?? throw new InvalidOperationException("Could not find the Microsoft.OpenApi.Hidi.CsdlFilter.xslt file in the assembly. Check build configuration.");
using var streamReader = new StreamReader(xslt);
using var textReader = new XmlTextReader(streamReader);
Expand All @@ -310,7 +310,7 @@ private static XslCompiledTransform GetFilterTransform()
private static Stream ApplyFilterToCsdl(Stream csdlStream, string entitySetOrSingleton, XslCompiledTransform transform)
{
using StreamReader inputReader = new(csdlStream, leaveOpen: true);
using XmlReader inputXmlReader = XmlReader.Create(inputReader);
using var inputXmlReader = XmlReader.Create(inputReader);
MemoryStream filteredStream = new();
using StreamWriter writer = new(filteredStream, leaveOpen: true);
XsltArgumentList args = new();
Expand Down Expand Up @@ -363,7 +363,7 @@ public static async Task ValidateOpenApiDocument(
private static async Task<ReadResult> ParseOpenApi(string openApiFile, bool inlineExternal, ILogger logger, Stream stream, CancellationToken cancellationToken = default)
{
ReadResult result;
Stopwatch stopwatch = Stopwatch.StartNew();
var stopwatch = Stopwatch.StartNew();
using (logger.BeginScope("Parsing OpenAPI: {OpenApiFile}", openApiFile))
{
stopwatch.Start();
Expand Down Expand Up @@ -398,7 +398,7 @@ public static async Task<OpenApiDocument> ConvertCsdlToOpenApi(Stream csdl, stri
var edmModel = CsdlReader.Parse(XElement.Parse(csdlText).CreateReader());
settings ??= SettingsUtilities.GetConfiguration();

OpenApiDocument document = edmModel.ConvertToOpenApi(SettingsUtilities.GetOpenApiConvertSettings(settings, metadataVersion));
var document = edmModel.ConvertToOpenApi(SettingsUtilities.GetOpenApiConvertSettings(settings, metadataVersion));
document = FixReferences(document);

return document;
Expand Down Expand Up @@ -725,7 +725,7 @@ internal static async Task PluginManifest(HidiOptions options, ILogger logger, C
}

// Load OpenAPI document
OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);
var document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false);

cancellationToken.ThrowIfCancellationRequested();

Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi.Hidi/OpenApiSpecVersionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static OpenApiSpecVersion TryParseOpenApiSpecVersion(string value)
}
var res = value.Split('.', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();

if (int.TryParse(res, out int result))
if (int.TryParse(res, out var result))
{
if (result >= 2 && result < 3)
{
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ private Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, Cance

private void ResolveReferences(OpenApiDiagnostic diagnostic, OpenApiDocument document)
{
List<OpenApiError> errors = new List<OpenApiError>();
var errors = new List<OpenApiError>();

// Resolve References if requested
switch (_settings.ReferenceResolution)
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi.Readers/ParsingContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ internal T ParseFragment<T>(YamlDocument yamlDocument, OpenApiSpecVersion versio
{
var node = ParseNode.Create(this, yamlDocument.RootNode);

T element = default(T);
var element = default(T);

switch (version)
{
Expand Down
6 changes: 3 additions & 3 deletions 6 src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private static void MakeServers(IList<OpenApiServer> servers, ParsingContext con
var host = context.GetFromTempStorage<string>("host");
var basePath = context.GetFromTempStorage<string>("basePath");
var schemes = context.GetFromTempStorage<List<string>>("schemes");
Uri defaultUrl = rootNode.Context.BaseUrl;
var defaultUrl = rootNode.Context.BaseUrl;

// so we don't default to the document path when a host is provided
if (string.IsNullOrEmpty(basePath) && !string.IsNullOrEmpty(host))
Expand Down Expand Up @@ -172,7 +172,7 @@ private static void MakeServers(IList<OpenApiServer> servers, ParsingContext con
}

// Create the Server objects
if (schemes != null && schemes.Count > 0)
if (schemes is {Count: > 0})
{
foreach (var scheme in schemes)
{
Expand Down Expand Up @@ -295,7 +295,7 @@ private static void FixRequestBodyReferences(OpenApiDocument doc)
{
// Walk all unresolved parameter references
// if id matches with request body Id, change type
if (doc.Components?.RequestBodies != null && doc.Components?.RequestBodies.Count > 0)
if (doc.Components?.RequestBodies is {Count: > 0})
{
var fixer = new RequestBodyReferenceFixer(doc.Components?.RequestBodies);
var walker = new OpenApiWalker(fixer);
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public static OpenApiParameter LoadParameter(ParseNode node, bool loadRequestBod
node.Context.SetTempStorage("schema", null);
}

bool isBodyOrFormData = (bool)node.Context.GetFromTempStorage<object>(TempStorageKeys.ParameterIsBodyOrFormData);
var isBodyOrFormData = (bool)node.Context.GetFromTempStorage<object>(TempStorageKeys.ParameterIsBodyOrFormData);
if (isBodyOrFormData && !loadRequestBody)
{
return null; // Don't include Form or Body parameters when normal parameters are loaded.
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public OpenApiReference ConvertToOpenApiReference(string reference, ReferenceTyp
}

// Where fragments point into a non-OpenAPI document, the id will be the complete fragment identifier
string id = segments[1];
var id = segments[1];
// $ref: externalSource.yaml#/Pet
if (id.StartsWith("/definitions/"))
{
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public OpenApiReference ConvertToOpenApiReference(
}
}
// Where fragments point into a non-OpenAPI document, the id will be the complete fragment identifier
string id = segments[1];
var id = segments[1];
var openApiReference = new OpenApiReference();

// $ref: externalSource.yaml#/Pet
Expand Down
8 changes: 4 additions & 4 deletions 8 src/Microsoft.OpenApi.Workbench/EnumBindingSourceExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public Type EnumType
{
if (null != value)
{
Type enumType = Nullable.GetUnderlyingType(value) ?? value;
var enumType = Nullable.GetUnderlyingType(value) ?? value;
if (!enumType.IsEnum)
throw new ArgumentException("Type must be for an Enum.");
}
Expand All @@ -38,13 +38,13 @@ public override object ProvideValue(IServiceProvider serviceProvider)
if (null == this._enumType)
throw new InvalidOperationException("The EnumType must be specified.");

Type actualEnumType = Nullable.GetUnderlyingType(this._enumType) ?? this._enumType;
Array enumValues = Enum.GetValues(actualEnumType);
var actualEnumType = Nullable.GetUnderlyingType(this._enumType) ?? this._enumType;
var enumValues = Enum.GetValues(actualEnumType);

if (actualEnumType == this._enumType)
return enumValues;

Array tempArray = Array.CreateInstance(actualEnumType, enumValues.Length + 1);
var tempArray = Array.CreateInstance(actualEnumType, enumValues.Length + 1);
enumValues.CopyTo(tempArray, 1);
return tempArray;
}
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public static IOpenApiAny CloneFromCopyConstructor(IOpenApiAny obj)
if (obj != null)
{
var t = obj.GetType();
foreach (ConstructorInfo ci in t.GetConstructors())
foreach (var ci in t.GetConstructors())
{
ParameterInfo[] pi = ci.GetParameters();
var pi = ci.GetParameters();
if (pi.Length == 1 && pi[0].ParameterType == t)
{
return (IOpenApiAny)ci.Invoke(new object[] { obj });
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi/Models/OpenApiComponents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
{
var loops = writer.GetSettings().LoopDetector.Loops;
writer.WriteStartObject();
if (loops.TryGetValue(typeof(OpenApiSchema), out List<object> schemas))
if (loops.TryGetValue(typeof(OpenApiSchema), out var schemas))
{
var openApiSchemas = schemas.Cast<OpenApiSchema>().Distinct().ToList()
.ToDictionary<OpenApiSchema, string>(k => k.Reference.Id);
Expand Down
6 changes: 3 additions & 3 deletions 6 src/Microsoft.OpenApi/Models/OpenApiDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
{
var loops = writer.GetSettings().LoopDetector.Loops;

if (loops.TryGetValue(typeof(OpenApiSchema), out List<object> schemas))
if (loops.TryGetValue(typeof(OpenApiSchema), out var schemas))
{
var openApiSchemas = schemas.Cast<OpenApiSchema>().Distinct().ToList()
.ToDictionary<OpenApiSchema, string>(k => k.Reference.Id);
Expand Down Expand Up @@ -425,8 +425,8 @@ private static string ConvertByteArrayToString(byte[] hash)
{
// Build the final string by converting each byte
// into hex and appending it to a StringBuilder
StringBuilder sb = new StringBuilder();
for (int i = 0; i < hash.Length; i++)
var sb = new StringBuilder();
for (var i = 0; i < hash.Length; i++)
{
sb.Append(hash[i].ToString("X2"));
}
Expand Down
4 changes: 2 additions & 2 deletions 4 src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public override void Visit(OpenApiSchema schema)
/// </summary>
private void ResolveTags(IList<OpenApiTag> tags)
{
for (int i = 0; i < tags.Count; i++)
for (var i = 0; i < tags.Count; i++)
{
var tag = tags[i];
if (IsUnresolvedReference(tag))
Expand Down Expand Up @@ -229,7 +229,7 @@ private void ResolveTags(IList<OpenApiTag> tags)
{
if (list == null) return;

for (int i = 0; i < list.Count; i++)
for (var i = 0; i < list.Count; i++)
{
var entity = list[i];
if (IsUnresolvedReference(entity))
Expand Down
19 changes: 8 additions & 11 deletions 19 src/Microsoft.OpenApi/Services/OpenApiWalker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ internal void Walk(IList<OpenApiTag> tags)
// Visit tags
if (tags != null)
{
for (int i = 0; i < tags.Count; i++)
for (var i = 0; i < tags.Count; i++)
{
Walk(i.ToString(), () => Walk(tags[i]));
}
Expand Down Expand Up @@ -246,7 +246,7 @@ internal void Walk(IList<OpenApiServer> servers)
// Visit Servers
if (servers != null)
{
for (int i = 0; i < servers.Count; i++)
for (var i = 0; i < servers.Count; i++)
{
Walk(i.ToString(), () => Walk(servers[i]));
}
Expand Down Expand Up @@ -515,7 +515,7 @@ internal void Walk(IList<OpenApiSecurityRequirement> securityRequirements)

if (securityRequirements != null)
{
for (int i = 0; i < securityRequirements.Count; i++)
for (var i = 0; i < securityRequirements.Count; i++)
{
Walk(i.ToString(), () => Walk(securityRequirements[i]));
}
Expand All @@ -536,7 +536,7 @@ internal void Walk(IList<OpenApiParameter> parameters)

if (parameters != null)
{
for (int i = 0; i < parameters.Count; i++)
for (var i = 0; i < parameters.Count; i++)
{
Walk(i.ToString(), () => Walk(parameters[i]));
}
Expand Down Expand Up @@ -614,12 +614,9 @@ internal void Walk(OpenApiRequestBody requestBody, bool isComponent = false)

_visitor.Visit(requestBody);

if (requestBody != null)
if (requestBody is {Content: not null})
{
if (requestBody.Content != null)
{
Walk(OpenApiConstants.Content, () => Walk(requestBody.Content));
}
Walk(OpenApiConstants.Content, () => Walk(requestBody.Content));
}
Walk(requestBody as IOpenApiExtensible);
}
Expand Down Expand Up @@ -879,7 +876,7 @@ internal void Walk(IList<OpenApiExample> examples)
// Visit Examples
if (examples != null)
{
for (int i = 0; i < examples.Count; i++)
for (var i = 0; i < examples.Count; i++)
{
Walk(i.ToString(), () => Walk(examples[i]));
}
Expand All @@ -899,7 +896,7 @@ internal void Walk(IList<OpenApiSchema> schemas)
// Visit Schemas
if (schemas != null)
{
for (int i = 0; i < schemas.Count; i++)
for (var i = 0; i < schemas.Count; i++)
{
Walk(i.ToString(), () => Walk(schemas[i]));
}
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public OpenApiWorkspace(OpenApiWorkspace workspace){}
/// <returns>Returns true if a matching document is found.</returns>
public bool Contains(string location)
{
Uri key = ToLocationUrl(location);
var key = ToLocationUrl(location);
return _documents.ContainsKey(key) || _fragments.ContainsKey(key) || _artifacts.ContainsKey(key);
}

Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.