Merge branch 'davidni-davidni/netstandard' into develop

README.md

@@ -55,8 +55,7 @@ A quick list of Ocelot's capabilities for more information see the [documentatio
 
 ## How to install
 
-Ocelot is designed to work with ASP.NET core only and is currently 
-built to netcoreapp2.0 [this](https://docs.microsoft.com/en-us/dotnet/articles/standard/library) documentation may prove helpful when working out if Ocelot would be suitable for you.
+Ocelot is designed to work with ASP.NET Core only and it targets `netstandard2.0`. This means it can be used anywhere `.NET Standard 2.0` is supported, including `.NET Core 2.0` and `.NET Framework 4.6.1` and up. [This](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) documentation may prove helpful when working out if Ocelot would be suitable for you.
 
 Install Ocelot and it's dependencies using NuGet. 
 

docs/introduction/gettingstarted.rst

@@ -2,14 +2,14 @@ Getting Started
 ===============
 
 Ocelot is designed to work with .NET Core only and is currently 
-built to netcoreapp2.0 `this <https://docs.microsoft.com/en-us/dotnet/articles/standard/library>`_ documentation may prove helpful when working out if Ocelot would be suitable for you.
+built to netstandard2.0 `this <https://docs.microsoft.com/en-us/dotnet/articles/standard/library>`_ documentation may prove helpful when working out if Ocelot would be suitable for you.
 
 .NET Core 2.0
 ^^^^^^^^^^^^^
 
 **Install NuGet package**
 
-Install Ocelot and it's dependencies using nuget. You will need to create a netcoreapp2.0 project and bring the package into it. Then follow the Startup below and :doc:`../features/configuration` sections
+Install Ocelot and it's dependencies using nuget. You will need to create a netstandard2.0 project and bring the package into it. Then follow the Startup below and :doc:`../features/configuration` sections
 to get up and running.
 
    ``Install-Package Ocelot``

src/Ocelot/Configuration/Creator/HeaderFindAndReplaceCreator.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Ocelot.Configuration.File;
 using Ocelot.Infrastructure;
+using Ocelot.Infrastructure.Extensions;
 using Ocelot.Logging;
 using Ocelot.Middleware;
 using Ocelot.Responses;

src/Ocelot/Configuration/File/FileAuthenticationOptions.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Text;
+using Ocelot.Infrastructure.Extensions;
 
 namespace Ocelot.Configuration.File
 {

src/Ocelot/Configuration/File/FileRateLimitRule.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Ocelot.Infrastructure.Extensions;
 
 namespace Ocelot.Configuration.File
 {

src/Ocelot/Configuration/FileConfigurationController.cs

@@ -49,7 +49,7 @@ public async Task<IActionResult> Post([FromBody]FileConfiguration fileConfigurat
                 if (test != null)
                 {
                     var node = (INode)test;
-                    var result = node.Accept(new UpdateFileConfiguration(fileConfiguration));
+                    var result = await node.Accept(new UpdateFileConfiguration(fileConfiguration));
                     if (result.GetType() == typeof(Rafty.Concensus.ErrorResponse<UpdateFileConfiguration>))
                     {
                         return new BadRequestObjectResult("There was a problem. This error message sucks raise an issue in GitHub.");

src/Ocelot/Headers/AddHeadersToResponse.cs

@@ -3,6 +3,7 @@ namespace Ocelot.Headers
     using System.Collections.Generic;
     using Ocelot.Configuration.Creator;
     using Ocelot.Infrastructure;
+    using Ocelot.Infrastructure.Extensions;
     using Ocelot.Logging;
     using Ocelot.Middleware;
 

src/Ocelot/Infrastructure/Extensions/NetCoreSupportExtensions.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ocelot.Infrastructure.Extensions
+{
+    /// <summary>
+    /// Trivial implementations of methods present in .NET Core 2 but not supported on .NET Standard 2.0.
+    /// </summary>
+    internal static class NetCoreSupportExtensions
+    {
+        internal static void AppendJoin<T>(this StringBuilder builder, char separator, IEnumerable<T> values)
+        {
+            builder.Append(string.Join(separator.ToString(), values));
+        }
+
+        internal static string[] Split(this string input, string separator, StringSplitOptions options = StringSplitOptions.None)
+        {
+            return input.Split(new[] { separator }, options);
+        }
+
+        internal static bool StartsWith(this string input, char value)
+        {
+            return input.StartsWith(value.ToString());
+        }
+
+        internal static bool EndsWith(this string input, char value)
+        {
+            return input.EndsWith(value.ToString());
+        }
+    }
+}

src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs

@@ -35,7 +35,7 @@ public CookieStickySessions(ILoadBalancer loadBalancer, string key, int keyExpir
                     {
                         if (stickySession.Expiry < DateTime.UtcNow)
                         {
-                            _stored.Remove(stickySession.Key, out _);
+                            _stored.TryRemove(stickySession.Key, out _);
                             _loadBalancer.Release(stickySession.HostAndPort);
                         }
                     }

src/Ocelot/Ocelot.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
     <NETStandardImplicitPackageVersion>2.0.0</NETStandardImplicitPackageVersion>
     <NoPackageAnalysis>true</NoPackageAnalysis>
@@ -25,18 +25,26 @@
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-     <PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8" /> 
+    <PackageReference Include="Butterfly.Client" Version="0.0.8" />
+    <PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8">
+      <NoWarn>NU1701</NoWarn>
+    </PackageReference>
     <PackageReference Include="FluentValidation" Version="7.5.2" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
+    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.0.3" />
+    <PackageReference Include="Microsoft.Data.SQLite" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.0.1">
+      <NoWarn>NU1701</NoWarn>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -45,9 +53,9 @@
     <PackageReference Include="CacheManager.Microsoft.Extensions.Configuration" Version="1.1.2" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="Consul" Version="0.7.2.4" />
-    <PackageReference Include="Polly" Version="5.8.0" />
+    <PackageReference Include="Polly" Version="6.0.1" />
     <PackageReference Include="Pivotal.Discovery.Client" Version="1.1.0" />
-    <PackageReference Include="IdentityServer4" Version="2.1.3" />
-    <PackageReference Include="Rafty" Version="0.4.2" />
+    <PackageReference Include="IdentityServer4" Version="2.2.0" />
+    <PackageReference Include="Rafty" Version="0.4.3" />
   </ItemGroup>
 </Project>

src/Ocelot/Raft/FileFsm.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Rafty.FiniteStateMachine;
 using Rafty.Infrastructure;
@@ -17,7 +18,7 @@ public FileFsm(NodeId nodeId)
             _id = nodeId.Id.Replace("/","").Replace(":","");
         }
 
-        public void Handle(LogEntry log)
+        public Task Handle(LogEntry log)
         {
             try
             {
@@ -28,6 +29,8 @@ public void Handle(LogEntry log)
             {
                 Console.WriteLine(exception);
             }
+
+            return Task.CompletedTask;
         }
     }
 }

src/Ocelot/Raft/HttpPeer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Ocelot.Configuration;
 using Ocelot.Middleware;
@@ -33,50 +34,46 @@ public HttpPeer(string hostAndPort, HttpClient httpClient, IBaseUrlFinder finder
             _baseSchemeUrlAndPort = finder.Find();
         }
 
-        public string Id {get; private set;}
+        public string Id { get; }
 
-        public RequestVoteResponse Request(RequestVote requestVote)
+        public async Task<RequestVoteResponse> Request(RequestVote requestVote)
         {
             if(_token == null)
             {
-                SetToken();
+                await SetToken();
             }
 
             var json = JsonConvert.SerializeObject(requestVote, _jsonSerializerSettings);
             var content = new StringContent(json);
             content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
-            var response = _httpClient.PostAsync($"{_hostAndPort}/administration/raft/requestvote", content).GetAwaiter().GetResult();
+            var response = await _httpClient.PostAsync($"{_hostAndPort}/administration/raft/requestvote", content);
             if(response.IsSuccessStatusCode)
             {
-                return JsonConvert.DeserializeObject<RequestVoteResponse>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(), _jsonSerializerSettings);
-            }
-            else
-            {
-                return new RequestVoteResponse(false, requestVote.Term);
+                return JsonConvert.DeserializeObject<RequestVoteResponse>(await response.Content.ReadAsStringAsync(), _jsonSerializerSettings);
             }
+
+            return new RequestVoteResponse(false, requestVote.Term);
         }
 
-        public AppendEntriesResponse Request(AppendEntries appendEntries)
+        public async Task<AppendEntriesResponse> Request(AppendEntries appendEntries)
         {
             try
             {
                 if(_token == null)
                 {
-                    SetToken();
-                }                
+                    await SetToken();
+                }
 
                 var json = JsonConvert.SerializeObject(appendEntries, _jsonSerializerSettings);
                 var content = new StringContent(json);
                 content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
-                var response = _httpClient.PostAsync($"{_hostAndPort}/administration/raft/appendEntries", content).GetAwaiter().GetResult();
+                var response = await _httpClient.PostAsync($"{_hostAndPort}/administration/raft/appendEntries", content);
                 if(response.IsSuccessStatusCode)
                 {
-                    return JsonConvert.DeserializeObject<AppendEntriesResponse>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(),_jsonSerializerSettings);
-                }
-                else
-                {
-                    return new AppendEntriesResponse(appendEntries.Term, false);
+                    return JsonConvert.DeserializeObject<AppendEntriesResponse>(await response.Content.ReadAsStringAsync(), _jsonSerializerSettings);
                 }
+
+                return new AppendEntriesResponse(appendEntries.Term, false);
             }
             catch(Exception ex)
             {
@@ -85,33 +82,31 @@ public AppendEntriesResponse Request(AppendEntries appendEntries)
             }
         }
 
-        public Response<T> Request<T>(T command)
+        public async Task<Response<T>> Request<T>(T command)
             where T : ICommand
         {
             Console.WriteLine("SENDING REQUEST....");
             if(_token == null)
             {
-                SetToken();
+                await SetToken();
             }   
 
             var json = JsonConvert.SerializeObject(command, _jsonSerializerSettings);
             var content = new StringContent(json);
             content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
-            var response = _httpClient.PostAsync($"{_hostAndPort}/administration/raft/command", content).GetAwaiter().GetResult();
+            var response = await _httpClient.PostAsync($"{_hostAndPort}/administration/raft/command", content);
             if(response.IsSuccessStatusCode)
             {
                 Console.WriteLine("REQUEST OK....");
-                var okResponse = JsonConvert.DeserializeObject<OkResponse<ICommand>>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(), _jsonSerializerSettings);
+                var okResponse = JsonConvert.DeserializeObject<OkResponse<ICommand>>(await response.Content.ReadAsStringAsync(), _jsonSerializerSettings);
                 return new OkResponse<T>((T)okResponse.Command);
             }
-            else 
-            {
-                Console.WriteLine("REQUEST NOT OK....");
-                return new ErrorResponse<T>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(), command);
-            }
+
+            Console.WriteLine("REQUEST NOT OK....");
+            return new ErrorResponse<T>(await response.Content.ReadAsStringAsync(), command);
         }
 
-        private void SetToken()
+        private async Task SetToken()
         {
             var tokenUrl = $"{_baseSchemeUrlAndPort}{_config.AdministrationPath}/connect/token";
             var formData = new List<KeyValuePair<string, string>>
@@ -122,8 +117,8 @@ private void SetToken()
                 new KeyValuePair<string, string>("grant_type", "client_credentials")
             };
             var content = new FormUrlEncodedContent(formData);
-            var response = _httpClient.PostAsync(tokenUrl, content).GetAwaiter().GetResult();
-            var responseContent = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+            var response = await _httpClient.PostAsync(tokenUrl, content);
+            var responseContent = await response.Content.ReadAsStringAsync();
             response.EnsureSuccessStatusCode();
             _token = JsonConvert.DeserializeObject<BearerToken>(responseContent);
             _httpClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(_token.TokenType, _token.AccessToken);

src/Ocelot/Raft/OcelotFiniteStateMachine.cs

@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Ocelot.Configuration.Setter;
 using Rafty.FiniteStateMachine;
 using Rafty.Log;
@@ -14,12 +15,12 @@ public OcelotFiniteStateMachine(IFileConfigurationSetter setter)
             _setter = setter;
         }
 
-        public void Handle(LogEntry log)
+        public async Task Handle(LogEntry log)
         {
             //todo - handle an error
             //hack it to just cast as at the moment we know this is the only command :P
             var hack = (UpdateFileConfiguration)log.CommandData;
-            _setter.Set(hack.Configuration).GetAwaiter().GetResult();
+            await _setter.Set(hack.Configuration);
         }
     }
 }

src/Ocelot/Raft/RaftController.cs

@@ -20,9 +20,9 @@ namespace Ocelot.Raft
     public class RaftController : Controller
     {
         private readonly INode _node;
-        private IOcelotLogger _logger;
-        private string _baseSchemeUrlAndPort;
-        private JsonSerializerSettings _jsonSerialiserSettings;
+        private readonly IOcelotLogger _logger;
+        private readonly string _baseSchemeUrlAndPort;
+        private readonly JsonSerializerSettings _jsonSerialiserSettings;
 
         public RaftController(INode node, IOcelotLoggerFactory loggerFactory, IBaseUrlFinder finder)
         {
@@ -45,7 +45,7 @@ public async Task<IActionResult> AppendEntries()
 
                 _logger.LogDebug($"{_baseSchemeUrlAndPort}/appendentries called, my state is {_node.State.GetType().FullName}");
 
-                var appendEntriesResponse = _node.Handle(appendEntries);
+                var appendEntriesResponse = await _node.Handle(appendEntries);
 
                 return new OkObjectResult(appendEntriesResponse);
             }
@@ -62,7 +62,7 @@ public async Task<IActionResult> RequestVote()
 
                 _logger.LogDebug($"{_baseSchemeUrlAndPort}/requestvote called, my state is {_node.State.GetType().FullName}");
 
-                var requestVoteResponse = _node.Handle(requestVote);
+                var requestVoteResponse = await _node.Handle(requestVote);
 
                 return new OkObjectResult(requestVoteResponse);
             }
@@ -81,7 +81,7 @@ public async Task<IActionResult> Command()
 
                     _logger.LogDebug($"{_baseSchemeUrlAndPort}/command called, my state is {_node.State.GetType().FullName}");
 
-                    var commandResponse = _node.Accept(command);
+                    var commandResponse = await _node.Accept(command);
 
                     json = JsonConvert.SerializeObject(commandResponse, _jsonSerialiserSettings);
 
@@ -91,7 +91,7 @@ public async Task<IActionResult> Command()
             catch(Exception e)
             {
                 _logger.LogError($"THERE WAS A PROBLEM ON NODE {_node.State.CurrentState.Id}", e);
-                throw e;
+                throw;
             }
         }
     }