cleanup

Author: mihaj

src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj

@@ -37,7 +37,7 @@
 		<PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
 		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="QAToolKit.Core" Version="0.1.7" />
+		<PackageReference Include="QAToolKit.Core" Version="0.2.0" />
 	</ItemGroup>
 
 </Project>

src/QAToolKit.Source.Swagger/SwaggerOptions.cs

@@ -65,11 +65,8 @@ public SwaggerOptions AddBasicAuthentication(string userName, string password)
         /// <returns></returns>
         public SwaggerOptions AddRequestFilters(RequestFilter requestFilter)
         {
-            if (requestFilter == null)
-                throw new ArgumentException(nameof(requestFilter));
-
             UseRequestFilter = true;
-            RequestFilter = requestFilter;
+            RequestFilter = requestFilter ?? throw new ArgumentException(nameof(requestFilter));
             return this;
         }
 
@@ -80,10 +77,7 @@ public SwaggerOptions AddRequestFilters(RequestFilter requestFilter)
         /// <returns></returns>
         public SwaggerOptions AddBaseUrl(Uri baseUrl)
         {
-            if (baseUrl == null)
-                throw new ArgumentException(nameof(baseUrl));
-
-            BaseUrl = baseUrl;
+            BaseUrl = baseUrl ?? throw new ArgumentException(nameof(baseUrl));
             return this;
         }
     }

src/QAToolKit.Source.Swagger/SwaggerProcessor.cs

@@ -199,35 +199,22 @@ private HttpMethod GetHttpMethod(KeyValuePair<OperationType, OpenApiOperation> o
 
         private HttpStatusCode? GetHttpStatus(string statusCode)
         {
-            switch (statusCode)
-            {
-                case "200":
-                    return HttpStatusCode.OK;
-                case "201":
-                    return HttpStatusCode.Created;
-                case "202":
-                    return HttpStatusCode.Accepted;
-                case "204":
-                    return HttpStatusCode.NoContent;
-                case "400":
-                    return HttpStatusCode.BadRequest;
-                case "401":
-                    return HttpStatusCode.Unauthorized;
-                case "403":
-                    return HttpStatusCode.Forbidden;
-                case "404":
-                    return HttpStatusCode.NotFound;
-                case "405":
-                    return HttpStatusCode.MethodNotAllowed;
-                case "409":
-                    return HttpStatusCode.Conflict;
-                case "500":
-                    return HttpStatusCode.InternalServerError;
-                case "default":
-                    return null;
-                default:
-                    throw new QAToolKitSwaggerException("HttpStatusCode not found.");
-            }
+            return statusCode switch
+            {
+                "200" => HttpStatusCode.OK,
+                "201" => HttpStatusCode.Created,
+                "202" => HttpStatusCode.Accepted,
+                "204" => HttpStatusCode.NoContent,
+                "400" => HttpStatusCode.BadRequest,
+                "401" => HttpStatusCode.Unauthorized,
+                "403" => HttpStatusCode.Forbidden,
+                "404" => HttpStatusCode.NotFound,
+                "405" => HttpStatusCode.MethodNotAllowed,
+                "409" => HttpStatusCode.Conflict,
+                "500" => HttpStatusCode.InternalServerError,
+                "default" => null,
+                _ => throw new QAToolKitSwaggerException("HttpStatusCode not found."),
+            };
         }
 
         private string GetSummary(KeyValuePair<OperationType, OpenApiOperation> openApiOperation)
@@ -311,7 +298,7 @@ private List<RequestBody> GetRequestBodies(KeyValuePair<OperationType, OpenApiOp
                 {
                     var requestBody = new RequestBody
                     {
-                        Name = contentType.Value.Schema.Reference != null ? contentType.Value.Schema.Reference.Id : null,
+                        Name = contentType.Value.Schema.Reference?.Id,
                         ContentType = ContentType.ToEnum(contentType.Key),
                         Properties = null,
                         Required = openApiOperation.Value.RequestBody.Required
@@ -334,9 +321,8 @@ private List<RequestBody> GetRequestBodies(KeyValuePair<OperationType, OpenApiOp
 
                 return requests;
             }
-            catch (Exception ex)
+            catch
             {
-                var msg = ex.Message;
                 return new List<RequestBody>();
             }
         }
@@ -357,7 +343,7 @@ private List<Property> GetPropertiesRecursively(KeyValuePair<string, OpenApiSche
                     Format = source.Value.Items.Description,
                     Type = source.Value.Items.Type,
                     Properties = null,
-                    Name = source.Value.Items.Reference != null ? source.Value.Items.Reference.Id : null
+                    Name = source.Value.Items.Reference?.Id
                 };
                 itemsProperty.Required = source.Value.Items.Required.Contains(itemsProperty.Name);
 
@@ -390,7 +376,7 @@ private List<Property> GetPropertiesRecursively(KeyValuePair<string, OpenApiSche
                     Format = null,
                     Type = "enum",
                     Properties = new List<Property>(),
-                    Name = source.Value.Reference != null ? source.Value.Reference.Id : null,
+                    Name = source.Value.Reference?.Id,
                 };
                 enumProperty.Required = source.Value.Required.Contains(enumProperty.Name);