Cleanup exception and error handling

src/RestClient/RestClient/src/Error.cs

@@ -1,17 +1,10 @@
-namespace ClickView.Extensions.RestClient
-{
-    using System.Net;
+namespace ClickView.Extensions.RestClient;
 
-    public class Error
-    {
-        public Error(HttpStatusCode httpStatusCode, ErrorBody body)
-        {
-            HttpStatusCode = httpStatusCode;
-            Body = body;
-        }
+using System.Net;
 
-        public HttpStatusCode HttpStatusCode { get; }
-        public string Content { get; set; } = null!;
-        public ErrorBody Body { get; }
-    }
+public class Error(HttpStatusCode httpStatusCode, ErrorBody? body, string content)
+{
+    public HttpStatusCode HttpStatusCode { get; } = httpStatusCode;
+    public string Content { get; } = content;
+    public ErrorBody? Body { get; } = body;
 }

src/RestClient/RestClient/src/ErrorBody.cs

@@ -1,7 +1,6 @@
-namespace ClickView.Extensions.RestClient
+namespace ClickView.Extensions.RestClient;
+
+public class ErrorBody
 {
-    public class ErrorBody
-    {
-        public string Message { get; set; } = null!;
-    }
+    public string? Message { get; set; }
 }

src/RestClient/RestClient/src/Exceptions/ClickViewClientException.cs

@@ -1,19 +1,18 @@
-namespace ClickView.Extensions.RestClient.Exceptions
-{
-    using System;
+namespace ClickView.Extensions.RestClient.Exceptions;
+
+using System;
 
-    /// <inheritdoc />
-    /// <summary>
-    ///     The base exception thrown by the ClickView Clients
-    /// </summary>
-    public class ClickViewClientException : Exception
+/// <inheritdoc />
+/// <summary>
+///     The base exception thrown by the ClickView Clients
+/// </summary>
+public class ClickViewClientException : Exception
+{
+    public ClickViewClientException(string message) : base(message)
     {
-        public ClickViewClientException(string message) : base(message)
-        {
-        }
+    }
 
-        public ClickViewClientException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
+    public ClickViewClientException(string message, Exception innerException) : base(message, innerException)
+    {
     }
 }

src/RestClient/RestClient/src/Exceptions/Http/BadRequestException.cs

@@ -1,17 +1,17 @@
-namespace ClickView.Extensions.RestClient.Exceptions.Http
-{
-    using System;
-    using System.Net;
+namespace ClickView.Extensions.RestClient.Exceptions.Http;
+
+using System;
+using System.Net;
 
-    public class BadRequestException : ClickViewClientHttpException
+public class BadRequestException : ClickViewClientHttpException
+{
+    public BadRequestException(string? message)
+        : base(HttpStatusCode.BadRequest, message ?? StatusCodePhrases.BadRequest)
     {
-        public BadRequestException(HttpStatusCode httpStatusCode, string message) : base(httpStatusCode, message)
-        {
-        }
+    }
 
-        public BadRequestException(HttpStatusCode httpStatusCode, string message, Exception innerException) :
-            base(httpStatusCode, message, innerException)
-        {
-        }
+    public BadRequestException(string? message, Exception innerException)
+        : base(HttpStatusCode.BadRequest, message ?? StatusCodePhrases.BadRequest, innerException)
+    {
     }
 }

src/RestClient/RestClient/src/Exceptions/Http/ClickViewClientHttpException.cs

@@ -1,25 +1,33 @@
-namespace ClickView.Extensions.RestClient.Exceptions.Http
-{
-    using System;
-    using System.Net;
+namespace ClickView.Extensions.RestClient.Exceptions.Http;
+
+using System;
+using System.Net;
 
-    /// <inheritdoc />
-    /// <summary>
-    ///     The exception thrown when the exception is caused by a http error
-    /// </summary>
-    public class ClickViewClientHttpException : ClickViewClientException
+/// <inheritdoc />
+/// <summary>
+///     The exception thrown when the exception is caused by a http error
+/// </summary>
+public class ClickViewClientHttpException : ClickViewClientException
+{
+    public ClickViewClientHttpException(HttpStatusCode httpStatusCode)
+        : base(GetErrorMessage(httpStatusCode))
     {
-        public ClickViewClientHttpException(HttpStatusCode httpStatusCode, string message) : base(message)
-        {
-            HttpStatusCode = httpStatusCode;
-        }
+        HttpStatusCode = httpStatusCode;
+    }
 
-        public ClickViewClientHttpException(HttpStatusCode httpStatusCode, string message, Exception innerException) :
-            base(message, innerException)
-        {
-            HttpStatusCode = httpStatusCode;
-        }
+    public ClickViewClientHttpException(HttpStatusCode httpStatusCode, string? message)
+        : base(message ?? GetErrorMessage(httpStatusCode))
+    {
+        HttpStatusCode = httpStatusCode;
+    }
 
-        public HttpStatusCode HttpStatusCode { get; }
+    public ClickViewClientHttpException(HttpStatusCode httpStatusCode, string? message, Exception innerException)
+        : base(message ?? GetErrorMessage(httpStatusCode), innerException)
+    {
+        HttpStatusCode = httpStatusCode;
     }
+
+    public HttpStatusCode HttpStatusCode { get; }
+
+    private static string GetErrorMessage(HttpStatusCode httpStatusCode) => $"HTTP error: '{(int) httpStatusCode}'";
 }

src/RestClient/RestClient/src/Exceptions/Http/ForbiddenException.cs

@@ -0,0 +1,17 @@
+namespace ClickView.Extensions.RestClient.Exceptions.Http;
+
+using System;
+using System.Net;
+
+public class ForbiddenException : ClickViewClientHttpException
+{
+    public ForbiddenException(string? message)
+        : base(HttpStatusCode.Forbidden, message ?? StatusCodePhrases.Forbidden)
+    {
+    }
+
+    public ForbiddenException(string? message, Exception innerException)
+        : base(HttpStatusCode.Forbidden, message ?? StatusCodePhrases.Forbidden, innerException)
+    {
+    }
+}

src/RestClient/RestClient/src/Exceptions/Http/NetworkException.cs

@@ -1,17 +1,16 @@
-namespace ClickView.Extensions.RestClient.Exceptions.Http
-{
-    using System;
-    using System.Net;
+namespace ClickView.Extensions.RestClient.Exceptions.Http;
+
+using System;
+using System.Net;
 
-    public class NetworkException : ClickViewClientHttpException
+public class NetworkException : ClickViewClientHttpException
+{
+    public NetworkException(HttpStatusCode httpStatusCode, string message) : base(httpStatusCode, message)
     {
-        public NetworkException(HttpStatusCode httpStatusCode, string message) : base(httpStatusCode, message)
-        {
-        }
+    }
 
-        public NetworkException(HttpStatusCode httpStatusCode, string message, Exception innerException) :
-            base(httpStatusCode, message, innerException)
-        {
-        }
+    public NetworkException(HttpStatusCode httpStatusCode, string message, Exception innerException) :
+        base(httpStatusCode, message, innerException)
+    {
     }
 }

src/RestClient/RestClient/src/Exceptions/Http/NotFoundException.cs

@@ -1,17 +1,17 @@
-namespace ClickView.Extensions.RestClient.Exceptions.Http
-{
-    using System;
-    using System.Net;
+namespace ClickView.Extensions.RestClient.Exceptions.Http;
+
+using System;
+using System.Net;
 
-    public class NotFoundException : ClickViewClientHttpException
+public class NotFoundException : ClickViewClientHttpException
+{
+    public NotFoundException(string? message)
+        : base(HttpStatusCode.NotFound, message ?? StatusCodePhrases.NotFound)
     {
-        public NotFoundException(HttpStatusCode httpStatusCode, string message) : base(httpStatusCode, message)
-        {
-        }
+    }
 
-        public NotFoundException(HttpStatusCode httpStatusCode, string message, Exception innerException) :
-            base(httpStatusCode, message, innerException)
-        {
-        }
+    public NotFoundException(string? message, Exception innerException)
+        : base(HttpStatusCode.NotFound, message ?? StatusCodePhrases.NotFound, innerException)
+    {
     }
 }

src/RestClient/RestClient/src/Exceptions/Http/TooManyRequestsException.cs

@@ -0,0 +1,16 @@
+namespace ClickView.Extensions.RestClient.Exceptions.Http;
+
+using System;
+
+public class TooManyRequestsException : ClickViewClientHttpException
+{
+    public TooManyRequestsException(string? message)
+        : base(Shims.TooManyRequest, message ?? StatusCodePhrases.TooManyRequests)
+    {
+    }
+
+    public TooManyRequestsException(string? message, Exception innerException)
+        : base(Shims.TooManyRequest, message ?? StatusCodePhrases.TooManyRequests, innerException)
+    {
+    }
+}

src/RestClient/RestClient/src/Exceptions/Http/UnauthorizedException.cs

@@ -1,17 +1,17 @@
-namespace ClickView.Extensions.RestClient.Exceptions.Http
-{
-    using System;
-    using System.Net;
+namespace ClickView.Extensions.RestClient.Exceptions.Http;
+
+using System;
+using System.Net;
 
-    public class UnauthorizedException : ClickViewClientHttpException
+public class UnauthorizedException : ClickViewClientHttpException
+{
+    public UnauthorizedException(string? message)
+        : base(HttpStatusCode.Unauthorized, message ?? StatusCodePhrases.Unauthorized)
     {
-        public UnauthorizedException(HttpStatusCode httpStatusCode, string message) : base(httpStatusCode, message)
-        {
-        }
+    }
 
-        public UnauthorizedException(HttpStatusCode httpStatusCode, string message, Exception innerException) :
-            base(httpStatusCode, message, innerException)
-        {
-        }
+    public UnauthorizedException(string? message, Exception innerException)
+        : base(HttpStatusCode.Unauthorized, message ?? StatusCodePhrases.Unauthorized, innerException)
+    {
     }
 }