Code reorganisation on webserver

Skeleton.Abstraction/Skeleton.Abstraction.csproj

@@ -66,7 +66,6 @@
     <Compile Include="Data\IDatabaseTransaction.cs" />
     <Compile Include="Data\ISqlCommand.cs" />
     <Compile Include="Dependency\DependencyLifetime.cs" />
-    <Compile Include="Dependency\IOwinBootstrapper.cs" />
     <Compile Include="Domain\IEntityDescriptor.cs" />
     <Compile Include="Domain\IEntityAuditable.cs" />
     <Compile Include="Domain\IValidationRule.cs" />

Skeleton.Infrastructure.Data/ExponentialRetryPolicy.cs

@@ -13,7 +13,7 @@ internal sealed class ExponentialRetryPolicy
 
         internal static readonly TimeSpan DefaultMaxBackoff = TimeSpan.FromSeconds(30.0);
         internal static readonly TimeSpan DefaultMinBackoff = TimeSpan.FromSeconds(1.0);
-        internal static readonly bool FirstFastRetry = true;
+
         private int _currentRetry;
 
         internal ExponentialRetryPolicy(IDatabaseConfiguration configuration, ILogger logger)
@@ -83,11 +83,7 @@ internal async Task<T> ExecuteAsync<T>(Func<Task<T>> func)
         private TimeSpan CalculateExponentialBackoff()
         {
             var defaultInterval = TimeSpan.FromSeconds(_configuration.RetryInterval);
-
-            if (FirstFastRetry && _currentRetry == 0)
-                return defaultInterval;
-
-            int randomInterval = GetRandomInterval(defaultInterval);
+            var randomInterval = GetRandomInterval(defaultInterval);
             var delta = (int)(Math.Pow(2.0, _currentRetry) * randomInterval);
             var interval = (int)Math.Min(checked(DefaultMinBackoff.TotalMilliseconds + delta), DefaultMaxBackoff.TotalMilliseconds);
 

Skeleton.Infrastructure.Dependency/Configuration/DatabaseConfiguration.cs

@@ -9,11 +9,11 @@ public sealed class DatabaseConfiguration :
         HideObjectMethodsBase,
         IDatabaseConfiguration
     {
-        private static readonly int DefaultTimeout = 300;
-        private static readonly int DefaultRetryCount = 10;
-        private static readonly int DefaultRetryInterval = 1;
-        private static readonly string DefaultProvider = "System.Data.SqlClient";
-        private static readonly string DefaultName = "Default";
+        private const int DefaultTimeout = 300;
+        private const int DefaultRetryCount = 10;
+        private const int DefaultRetryInterval = 1;
+        private const string DefaultProvider = "System.Data.SqlClient";
+        private const string DefaultName = "Default";
 
         private int _commandTimeout;
         private int _retryCount;

Skeleton.Infrastructure.Orm/SqlBuilder/QueryEvaluator.cs

@@ -55,7 +55,7 @@ private void EvaluateOrderBy()
             var orderByFields = _query.OrderBy.Split(',');
             foreach (var field in orderByFields)
             {
-                if (field.StartsWith("-", StringComparison.InvariantCultureIgnoreCase))
+                if (field.StartsWith("-", StringComparison.OrdinalIgnoreCase))
                 {
                     var propertyName = field.Substring(1);
                     var evaluatedExpression = EvaluateProperty(propertyName);

Skeleton.Tests.Common/AppConfiguration.cs

@@ -1,15 +1,13 @@
-using Skeleton.Web.Client;
-using System;
+using System;
 
 namespace Skeleton.Tests.Common
 {
     public static class AppConfiguration
     {
-        public const string CustomersResource = "customers";
-        public const string CachedCustomersResource = "cachedcustomers";
-        public const string AsyncCustomersResource = "asynccustomers";
-        public const string AsyncCachedCustomersResource = "asynccachedcustomers";
-        public const string LogResource = "log";
+        public const string CustomersResource = "api/customers";
+        public const string CachedCustomersResource = "api/cachedcustomers";
+        public const string AsyncCustomersResource = "api/asynccustomers";
+        public const string AsyncCachedCustomersResource = "api/asynccachedcustomers";
 
         public static bool AppVeyorBuild => Environment.GetEnvironmentVariable("AppVeyor")?.ToUpperInvariant() == "TRUE";
 
@@ -20,5 +18,9 @@ public static class AppConfiguration
         public static string Host => "localhost";
         public static int Port => 8081;
         public static Uri BaseAddress => new UriBuilder("http", Host, Port).Uri;
+        public static Uri CustomersUri => new Uri(BaseAddress, new Uri(CustomersResource, UriKind.Relative));
+        public static Uri CachedCustomersUri => new Uri(BaseAddress, new Uri(CachedCustomersResource, UriKind.Relative));
+        public static Uri AsyncCustomersUri => new Uri(BaseAddress, new Uri(AsyncCustomersResource, UriKind.Relative));
+        public static Uri AsyncCachedCustomersUri => new Uri(BaseAddress, new Uri(AsyncCachedCustomersResource, UriKind.Relative));
     }
 }

Skeleton.Tests.Common/OwinTestServer.cs

@@ -26,10 +26,6 @@ public void Start(Uri baseUrl)
             var startup = new OwinStartup();
             _server = startup.StartServer(baseUrl,
                 bootstrapper => bootstrapper
-                    .UseSwagger()
-                    .UseCheckModelForNull()
-                    .UseValidateModelState()
-                    .UseGlobalExceptionHandling()
                     .UseSqlServer(_databaseConfigurator)
                     .WithOrm());
         }

Skeleton.Tests.Web/HttpClientAsyncCachedEntityReaderTests.cs

@@ -15,7 +15,7 @@ public class HttpClientAsyncCachedEntityReaderTests
         private const int PageSize = 50;
         private const int NumberOfPages = 5;
 
-        private readonly RestClient _client = new RestClient(new Uri(AppConfiguration.BaseAddress, "api/asynccachedcustomers"));
+        private readonly RestClient _client = new RestClient(AppConfiguration.AsyncCachedCustomersUri);
 
         [Test]
         public async Task CachedEntityReader_GetAllAsync()

Skeleton.Tests.Web/HttpClientAsyncEntityReaderTests.cs

@@ -15,7 +15,7 @@ public class HttpClientAsyncEntityReaderTests
         private const int PageSize = 50;
         private const int NumberOfPages = 5;
 
-        private readonly RestClient _client = new RestClient(new Uri(AppConfiguration.BaseAddress, "api/asynccustomers"));
+        private readonly RestClient _client = new RestClient(AppConfiguration.AsyncCustomersUri);
 
         [Test]
         public async Task EntityReader_GetAllAsync()

Skeleton.Tests.Web/HttpClientAsyncEntityWriterTests.cs

@@ -12,7 +12,7 @@ namespace Skeleton.Tests.Web
     [TestFixture]
     public class HttpClientAsyncEntityWriterTests
     {
-        private readonly RestClient _client = new RestClient(new Uri(AppConfiguration.BaseAddress, "api/asynccustomers"));
+        private readonly RestClient _client = new RestClient(AppConfiguration.AsyncCustomersUri);
 
         [Test]
         public async Task EntityWriter_UpdateAsync()

Skeleton.Tests.Web/HttpClientCachedEntityReaderTests.cs

@@ -13,7 +13,7 @@ public class HttpClientCachedEntityReaderTests
         private const int PageSize = 50;
         private const int NumberOfPages = 5;
 
-        private readonly RestClient _client = new RestClient(new Uri(AppConfiguration.BaseAddress, "api/cachedcustomers"));
+        private readonly RestClient _client = new RestClient(AppConfiguration.CachedCustomersUri);
 
         [Test]
         public void EntityReader_GetAll()

Skeleton.Tests.Web/HttpClientEntityReaderTests.cs

@@ -1,7 +1,6 @@
 using NUnit.Framework;
 using Skeleton.Tests.Common;
 using Skeleton.Web.Client;
-using System;
 using System.Linq;
 using System.Net;
 
@@ -13,8 +12,7 @@ public class HttpClientEntityReaderTests
         private const int PageSize = 50;
         private const int NumberOfPages = 5;
 
-        private readonly RestClient _client = new RestClient(new Uri(AppConfiguration.BaseAddress, "api/customers"));
-
+        private readonly RestClient _client = new RestClient(AppConfiguration.CustomersUri);
 
         [Test]
         public void EntityReader_GetAll()
@@ -90,7 +88,7 @@ public void EntityReader_Retry()
         {
             var request = new RestRequest()
                     .AddResource("retry");
-            var response = _client.Get(request);
+             _client.Get(request);
 
             Assert.IsTrue(_client.RetryPolicy.RetryCount == 5);
         }

Skeleton.Tests.Web/HttpClientEntityWriterTests.cs

@@ -11,7 +11,7 @@ namespace Skeleton.Tests.Web
     [TestFixture]
     public class HttpClientEntityWriterTests
     {
-        private readonly RestClient _client = new RestClient(new Uri(AppConfiguration.BaseAddress, "api/customers"), new NoRetryPolicy());
+        private readonly RestClient _client = new RestClient(AppConfiguration.CustomersUri);
 
         [Test]
         public void EntityWriter_Update()

Skeleton.Tests.Web/HttpClientHealthCheckTests.cs

@@ -1,7 +1,6 @@
 using NUnit.Framework;
 using Skeleton.Tests.Common;
 using Skeleton.Web.Client;
-using System;
 
 namespace Skeleton.Tests.Web
 {

Skeleton.Web.Client/ClientProvider.cs

@@ -46,7 +46,7 @@ public static bool RemoveClient(string key)
         private static void EnsureKeyNotNullOrEmpty(string key)
         {
             if (string.IsNullOrEmpty(key))
-                throw new ArgumentException(nameof(key));
+                throw new ArgumentException("Key cannot be null or empty", nameof(key));
         }
     }
 }

Skeleton.Web.Client/RestRequest.cs

@@ -9,6 +9,7 @@ namespace Skeleton.Web.Client
 {
     public sealed class RestRequest : IRestRequest
     {
+        private const string Message = "Resource cannot be null or empty";
         private readonly static SupportedFormatters Formatters = new SupportedFormatters();
 
         public RestRequest()
@@ -18,7 +19,7 @@ public RestRequest()
         public RestRequest(string resource)
         {
             if (string.IsNullOrEmpty(resource))
-                throw new ArgumentException(nameof(resource));
+                throw new ArgumentException(Message, nameof(resource));
 
             Resource = EnsureTrailingSlash(resource);
         }
@@ -75,7 +76,7 @@ public IRestRequest AsGet()
         public IRestRequest AddResource(string resource)
         {
             if (string.IsNullOrEmpty(resource))
-                throw new ArgumentException(nameof(resource));
+                throw new ArgumentException(Message, nameof(resource));
 
             if (!string.IsNullOrEmpty(Resource))
                 Resource = EnsureTrailingSlash(Resource);
@@ -88,7 +89,7 @@ public IRestRequest AddResource(string resource)
         public IRestRequest AddQueryParameter(string key, object value)
         {
             if (string.IsNullOrEmpty(key))
-                throw new ArgumentException(nameof(key));
+                throw new ArgumentException(Message, nameof(key));
 
             if (value == null)
                 throw new ArgumentNullException(nameof(value));

Skeleton.Web.Server/Configuration/CompressionMiddleware.cs

@@ -1,5 +1,5 @@
 using Microsoft.Owin;
-using Skeleton.Core;
+using Skeleton.Web.Server.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Skeleton.Web.Server/Configuration/RequestIdMiddleware.cs

@@ -1,9 +1,6 @@
 using Microsoft.Owin;
 using Skeleton.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using Skeleton.Web.Server.Helpers;
 using System.Threading.Tasks;
 
 namespace Skeleton.Web.Server.Configuration

Skeleton.Web.Server/Configuration/RequestLoggerMiddleware.cs

@@ -1,6 +1,7 @@
 using Microsoft.Owin;
 using Skeleton.Abstraction;
 using Skeleton.Core;
+using Skeleton.Web.Server.Helpers;
 using System.Diagnostics;
 using System.Threading.Tasks;
 

Skeleton.Web.Server/Configuration/RequireSslMiddleware.cs

@@ -6,8 +6,6 @@ namespace Skeleton.Web.Server.Configuration
 {
     public sealed class RequireSslMiddleware: OwinMiddleware
     {
-        private readonly OwinMiddleware _next;
-
         public RequireSslMiddleware(OwinMiddleware next)
             : base(next)
         {   

Skeleton.Web.Server/Controllers/AsyncEntityReaderController.cs

@@ -2,6 +2,7 @@
 using Skeleton.Abstraction.Domain;
 using Skeleton.Abstraction.Orm;
 using Skeleton.Core;
+using Skeleton.Web.Server.Helpers;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Http;

Skeleton.Web.Server/Controllers/DiscoverController.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Skeleton.Web.Server.Helpers;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.Http;
 

Skeleton.Web.Server/Controllers/EntityReaderController.cs

@@ -2,6 +2,7 @@
 using Skeleton.Abstraction.Domain;
 using Skeleton.Abstraction.Orm;
 using Skeleton.Core;
+using Skeleton.Web.Server.Helpers;
 using System.Linq;
 using System.Web.Http;
 using System.Web.Http.Description;

Skeleton.Web.Server/Controllers/LogController.cs

@@ -1,4 +1,5 @@
 using Skeleton.Abstraction;
+using Skeleton.Web.Server.Helpers;
 using System.Web.Http;
 
 namespace Skeleton.Web.Server.Controllers

Skeleton.Web.Server/Configuration/DeflateCompressor.cs → Skeleton.Web.Server/Helpers/DeflateCompressor.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.IO.Compression;
 
-namespace Skeleton.Web.Server.Configuration
+namespace Skeleton.Web.Server.Helpers
 {
     public class DeflateCompressor : ICompressor
     {

Skeleton.Web.Server/Configuration/GZipCompressor.cs → Skeleton.Web.Server/Helpers/GZipCompressor.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.IO.Compression;
 
-namespace Skeleton.Web.Server.Configuration
+namespace Skeleton.Web.Server.Helpers
 {
     public class GZipCompressor : ICompressor
     {