Custom exception, cleanup

Author: mihaj

src/QAToolKit.Source.Swagger.Test/Fixtures/BicycleApi/Get/GetBicycleByIdResponse.cs

@@ -1,6 +1,5 @@
 using QAToolKit.Core.Models;
 using QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get.Helpers;
-using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get.Helpers;
 using System.Collections.Generic;
 
 namespace QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get

src/QAToolKit.Source.Swagger.Test/SwaggerFileSourceIntegrationTest.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using QAToolKit.Source.Swagger.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -40,7 +41,7 @@ public async void SwaggerFileSourceWithoutOptionsTest_Fails()
         {
             var fileSource = new SwaggerFileSource();
 
-            var exception = await Assert.ThrowsAsync<Exception>(async () => await fileSource.Load(new List<FileInfo>() {
+            var exception = await Assert.ThrowsAsync<QAToolKitSwaggerException>(async () => await fileSource.Load(new List<FileInfo>() {
                 new FileInfo("Assets/swagger-pets-test.json")
             }));
 

src/QAToolKit.Source.Swagger.Test/SwaggerTests/BicycleApi/Get/SwaggerProcessorGetBicycleByIdTests.cs

@@ -4,11 +4,7 @@
 using QAToolKit.Core.Models;
 using QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get;
 using QAToolKit.Source.Swagger.Test.Fixtures.BicycleApi.Get.Helpers;
-using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Get;
-using QAToolKit.Source.Swagger.Test.Fixtures.PetApi.Post;
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;

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

@@ -0,0 +1,20 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace QAToolKit.Source.Swagger.Exceptions
+{
+    internal class QAToolKitSwaggerException : Exception
+    {
+        public QAToolKitSwaggerException(string message) : base(message)
+        {
+        }
+
+        public QAToolKitSwaggerException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected QAToolKitSwaggerException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}

src/QAToolKit.Source.Swagger/SwaggerOptions.cs

@@ -47,6 +47,11 @@ public class SwaggerOptions
         /// <returns></returns>
         public SwaggerOptions AddBasicAuthentication(string userName, string password)
         {
+            if (string.IsNullOrEmpty(userName))
+                throw new ArgumentException(nameof(userName));
+            if (string.IsNullOrEmpty(password))
+                throw new ArgumentException(nameof(password));
+
             UseBasicAuth = true;
             UserName = userName;
             Password = password;
@@ -60,6 +65,9 @@ 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;
             return this;
@@ -72,6 +80,9 @@ public SwaggerOptions AddRequestFilters(RequestFilter requestFilter)
         /// <returns></returns>
         public SwaggerOptions AddBaseUrl(Uri baseUrl)
         {
+            if (baseUrl == null)
+                throw new ArgumentException(nameof(baseUrl));
+
             BaseUrl = baseUrl;
             return this;
         }

src/QAToolKit.Source.Swagger/SwaggerProcessor.cs

@@ -2,6 +2,7 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Writers;
 using QAToolKit.Core.Models;
+using QAToolKit.Source.Swagger.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -50,7 +51,7 @@ public IList<HttpRequest> MapFromOpenApiDocument(Uri baseUri, OpenApiDocument op
                 {
                     if (baseUri == null)
                     {
-                        throw new Exception("Swagger from file source needs BaseUrl defined. Inject baseUrl with AddBaseUrl in your SwaggerSource instantiation.");
+                        throw new QAToolKitSwaggerException("Swagger from file source needs BaseUrl defined. Inject baseUrl with AddBaseUrl in your SwaggerSource instantiation.");
                     }
 
                     baseUri = new Uri(baseUri, tempUri);
@@ -192,7 +193,7 @@ private HttpMethod GetHttpMethod(KeyValuePair<OperationType, OpenApiOperation> o
                     return HttpMethod.Patch;
 #endif
                 default:
-                    throw new Exception("HttpMethod invalid.");
+                    throw new QAToolKitSwaggerException("HttpMethod invalid.");
             }
         }
 
@@ -225,7 +226,7 @@ private HttpMethod GetHttpMethod(KeyValuePair<OperationType, OpenApiOperation> o
                 case "default":
                     return null;
                 default:
-                    throw new Exception("HttpStatusCode not found.");
+                    throw new QAToolKitSwaggerException("HttpStatusCode not found.");
             }
         }
 

src/QAToolKit.Source.Swagger/SwaggerRequestFilter.cs

@@ -1,4 +1,5 @@
 using QAToolKit.Core.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -17,7 +18,7 @@ public class SwaggerRequestFilter
         /// <param name="requests"></param>
         public SwaggerRequestFilter(IList<HttpRequest> requests)
         {
-            _requests = requests;
+            _requests = requests ?? throw new ArgumentNullException(nameof(requests));
         }
         /// <summary>
         /// Filter out the requests by the specified filters

src/QAToolKit.Source.Swagger/SwaggerUrlSource.cs

@@ -1,6 +1,5 @@
 using Microsoft.OpenApi.Readers;
 using Microsoft.OpenApi.Writers;
-using Newtonsoft.Json;
 using QAToolKit.Core.Interfaces;
 using QAToolKit.Core.Models;
 using System;