conflict merge

Author: mihaj

.github/workflows/sonarqube-analysis.yml

@@ -11,7 +11,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
-        # Disabling shallow clone is recommended for improving relevancy of reporting
         fetch-depth: 0
     - name: SonarScanner for .NET Core with pull request decoration support
       uses: highbyte/sonarscan-dotnet@1.0
@@ -20,9 +19,8 @@ jobs:
         sonarProjectName:  qatoolkit_qatoolkit-source-swagger-net
         sonarOrganization: qatoolkit
         dotnetBuildArguments: ./src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj
-        dotnetDisableTests: true
-        # Optional extra command arguments the the SonarScanner 'begin' command
-        sonarBeginArguments: /d:sonar.verbose="true" /d:sonar.language="cs"
+        dotnetTestArguments: ./src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+        sonarBeginArguments: /d:sonar.verbose="true" /d:sonar.language="cs" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover.xml" /d:sonar.coverage.exclusions="**Tests.cs"
         sonarHostname: "https://sonarcloud.io"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,6 +1,10 @@
 # QAToolKit.Source.Swagger
 ![.NET Core](https://github.com/qatoolkit/qatoolkit-source-swagger-net/workflows/.NET%20Core/badge.svg)
+![CodeQL Analyze](https://github.com/qatoolkit/qatoolkit-source-swagger-net/workflows/CodeQL%20Analyze/badge.svg)
+![Sonarqube Analyze](https://github.com/qatoolkit/qatoolkit-source-swagger-net/workflows/Sonarqube%20Analyze/badge.svg)
+![](https://img.shields.io/nuget/v/QAToolKit.Source.Swagger?label=QAToolKit.Source.Swagger)
 
+## Description
 `QAToolKit.Source.Swagger` is a .NET standard library, which generates `IEnumerable<HttpRequest>` object that is the input for other components.
 
 Major features:
@@ -120,8 +124,9 @@ check Swagger for example files and populate those.
 
 By default this option is set to false.
 
-## Limitations
+## To-do
 
+- **This library is an early alpha version**
 - Swagger processor only returns `application/json` content type. Support for other might come later.
 - Data generation and replacement is only supported for Path, Url and Json Body properties.
 

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

@@ -7,6 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="ExpectedObjects" Version="2.3.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.9" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />

src/QAToolKit.Source.Swagger/Exceptions/QAToolKitSwaggerException.cs

@@ -3,16 +3,29 @@
 
 namespace QAToolKit.Source.Swagger.Exceptions
 {
-    internal class QAToolKitSwaggerException : Exception
+    /// <summary>
+    /// QA Toolkit swagger exception
+    /// </summary>
+    [Serializable]
+    public class QAToolKitSwaggerException : Exception
     {
+        /// <summary>
+        /// QA Toolkit swagger exception
+        /// </summary>
         public QAToolKitSwaggerException(string message) : base(message)
         {
         }
 
+        /// <summary>
+        /// QA Toolkit swagger exception
+        /// </summary>
         public QAToolKitSwaggerException(string message, Exception innerException) : base(message, innerException)
         {
         }
 
+        /// <summary>
+        /// QA Toolkit swagger exception
+        /// </summary>
         protected QAToolKitSwaggerException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
         }

src/QAToolKit.Source.Swagger/SwaggerProcessor.cs

@@ -85,7 +85,7 @@ private IEnumerable<HttpRequest> GetRestRequestsForPath(Uri baseUri, KeyValuePai
                     Summary = GetSummary(operation),
                     Description = GetDescription(operation),
                     OperationId = GetOperationId(operation),
-                    Parameters = GetParameters(operation).ToList().ToList(),
+                    Parameters = GetParameters(operation).ToList(),
                     RequestBodies = GetRequestBodies(operation),
                     Responses = GetResponses(operation),
                     Tags = GetTags(operation),
@@ -425,11 +425,10 @@ private List<Property> GetPropertiesRecursively(KeyValuePair<string, OpenApiSche
             {
                 var propsTem = GetPropertiesRecursively(property);
 
-                if (propsTem != null)
-                    if (prop.Properties == null)
-                    {
-                        prop.Properties = new List<Property>();
-                    }
+                if (propsTem != null && prop.Properties == null)
+                {
+                    prop.Properties = new List<Property>();
+                }
                 prop.Properties.AddRange(propsTem);
             }
 

src/QAToolKit.Source.Swagger/SwaggerRequestFilter.cs

@@ -31,12 +31,12 @@ public IEnumerable<HttpRequest> FilterRequests(RequestFilter requestFilter)
 
             if (requestFilter.AuthenticationTypes != null)
             {
-                requestsLocal.AddRange(_requests.Where(request => requestFilter.AuthenticationTypes.ToList().Any(x => request.AuthenticationTypes.Contains(x))));
+                requestsLocal.AddRange(_requests.Where(request => requestFilter.AuthenticationTypes.Any(x => request.AuthenticationTypes.Contains(x))));
             }
 
             if (requestFilter.TestTypes != null)
             {
-                requestsLocal.AddRange(_requests.Where(request => requestFilter.TestTypes.ToList().Any(x => request.TestTypes.Contains(x))));
+                requestsLocal.AddRange(_requests.Where(request => requestFilter.TestTypes.Any(x => request.TestTypes.Contains(x))));
             }
 
             if (requestFilter.EndpointNameWhitelist != null)

src/QAToolKit.Source.Swagger/SwaggerUrlSource.cs

@@ -34,10 +34,15 @@ public SwaggerUrlSource(Action<SwaggerOptions> options = null)
         /// </summary>
         /// <param name="source"></param>
         /// <returns></returns>
-        public async Task<IEnumerable<HttpRequest>> Load(Uri[] source)
+        public Task<IEnumerable<HttpRequest>> Load(Uri[] source)
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
 
+            return LoadInternal(source);
+        }
+
+        private async Task<IEnumerable<HttpRequest>> LoadInternal(Uri[] source)
+        {
             var restRequests = new List<HttpRequest>();
             var processor = new SwaggerProcessor(_swaggerOptions);