Merge pull request #582 from carolynvs/upgrade-flurl

Upgrade to Flurl.Http 0.7

Author: carolynvs

src/corelib/Authentication/AuthenticatedHttpClientFactory.cs

@@ -16,7 +16,7 @@ public override HttpClient CreateClient(Url url, HttpMessageHandler handler)
         {
             return new HttpClient(handler)
             {
-                Timeout = FlurlHttp.Configuration.DefaultTimeout
+                Timeout = FlurlHttp.GlobalSettings.DefaultTimeout
             };
         }
 

src/corelib/Compute/v2_6/Console.cs

@@ -1,4 +1,5 @@
 using System;
+using Newtonsoft.Json;
 using OpenStack.Serialization;
 
 namespace OpenStack.Compute.v2_6
@@ -12,11 +13,13 @@ public class Console
         /// <summary>
         /// The console type.
         /// </summary>
+        [JsonProperty("type")]
         public RemoteConsoleType Type { get; set; }
 
         /// <summary>
         /// The console URL.
         /// </summary>
+        [JsonProperty("url")]
         public Uri Url { get; set; }
     }
 }

src/corelib/ContentDeliveryNetworks/v1/ServiceOperationFailedException.cs

@@ -27,7 +27,7 @@ public ServiceOperationFailedException(IEnumerable<ServiceError> errors)
         /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
         private ServiceOperationFailedException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
-            Errors = JsonConvert.DeserializeObject<IEnumerable<ServiceError>>(info.GetString("service_errors"));
+            Errors = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<IEnumerable<ServiceError>>(info.GetString("service_errors"));
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ private ServiceOperationFailedException(SerializationInfo info, StreamingContext
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             // ReSharper disable once ExceptionNotDocumented
-            info.AddValue("service_errors", JsonConvert.SerializeObject(Errors));
+            info.AddValue("service_errors", OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(Errors));
             base.GetObjectData(info, context);
         }
     }

src/corelib/Extensions/FlurlExtensions.cs

@@ -6,6 +6,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Flurl.Http;
+using OpenStack;
 using OpenStack.Authentication;
 
 // ReSharper disable once CheckNamespace
@@ -17,17 +18,6 @@ namespace Flurl.Extensions
     /// <exclude/>
     public static class FlurlExtensions
     {
-        /// <summary>
-        /// Allow a specific HTTP status code.
-        /// </summary>
-        /// <param name="client">The client.</param>
-        /// <param name="statusCode">The allowed status code.</param>
-        /// <returns></returns>
-        public static FlurlClient AllowHttpStatus(this FlurlClient client, HttpStatusCode statusCode)
-        {
-            return client.AllowHttpStatus(((int)statusCode).ToString(CultureInfo.InvariantCulture));
-        }
-
         /// <summary>
         /// Allow a specific HTTP status code.
         /// </summary>
@@ -106,8 +96,28 @@ public static PreparedRequest Authenticate(this string url, IAuthenticationProvi
         /// </returns>
         public static PreparedRequest Authenticate(this Url url, IAuthenticationProvider authenticationProvider)
         {
-            var client = new PreparedRequest(url, autoDispose: true);
-            return client.Authenticate(authenticationProvider);
+            return url.PrepareRequest().Authenticate(authenticationProvider);
+        }
+
+        /// <summary>
+        /// Builds a prepared Flurl request which can be executed at a later time.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        public static PreparedRequest PrepareRequest(this string url)
+        {
+            return new Url(url).PrepareRequest();
+        }
+
+        /// <summary>
+        /// Builds a prepared Flurl request which can be executed at a later time.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        public static PreparedRequest PrepareRequest(this Url url)
+        {
+            return new PreparedRequest(url, autoDispose: true)
+            {
+                Settings = OpenStackNet.Configuration.FlurlHttpSettings
+            };
         }
 
         /// <summary>

src/corelib/Extensions/TypeExtensions.cs

@@ -31,6 +31,15 @@ public static string GetAssemblyFileVersion(this Type type)
             }
         }
 
+        /// <summary />
+        public static T Clone<T>(this T src)
+            where T : new()
+        {
+            var dest = new T();
+            src.CopyProperties(dest);
+            return dest;
+        }
+
         /// <summary />
         public static void CopyProperties<T>(this T src, T dest)
         {

src/corelib/Flurl/PreparedRequest.cs

@@ -2,8 +2,6 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Flurl;
-using Flurl.Http;
 using Flurl.Http.Content;
 
 // ReSharper disable once CheckNamespace
@@ -97,7 +95,7 @@ public PreparedRequest(Url url, bool autoDispose) : base(url, autoDispose)
         public PreparedRequest PreparePatchJson(object data, CancellationToken cancellationToken = default(CancellationToken))
         {
             Verb = new HttpMethod("PATCH");
-            Content = new CapturedJsonContent(data);
+            Content = new CapturedJsonContent(Settings.JsonSerializer.Serialize(data));
             CancellationToken = cancellationToken;
             return this;
         }
@@ -108,7 +106,7 @@ public PreparedRequest(Url url, bool autoDispose) : base(url, autoDispose)
         public PreparedRequest PreparePostJson(object data, CancellationToken cancellationToken = default(CancellationToken))
         {
             Verb = HttpMethod.Post;
-            Content = new CapturedJsonContent(data);
+            Content = new CapturedJsonContent(Settings.JsonSerializer.Serialize(data));
             CancellationToken = cancellationToken;
             return this;
         }
@@ -119,7 +117,7 @@ public PreparedRequest(Url url, bool autoDispose) : base(url, autoDispose)
         public PreparedRequest PreparePutJson(object data, CancellationToken cancellationToken = default(CancellationToken))
         {
             Verb = HttpMethod.Put;
-            Content = new CapturedJsonContent(data);
+            Content = new CapturedJsonContent(Settings.JsonSerializer.Serialize(data));
             CancellationToken = cancellationToken;
             return this;
         }

src/corelib/OpenStack.csproj

@@ -48,12 +48,12 @@
     <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' != 'Final'">..\..\build\keys\OpenStackNetV1.dev.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Flurl, Version=1.0.8.0, Culture=neutral, PublicKeyToken=1308302a96879dfb, processorArchitecture=MSIL">
-      <HintPath>..\packages\Flurl.Signed.1.0.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll</HintPath>
+    <Reference Include="Flurl, Version=1.0.10.0, Culture=neutral, PublicKeyToken=1308302a96879dfb, processorArchitecture=MSIL">
+      <HintPath>..\packages\Flurl.Signed.1.0.10\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Flurl.Http, Version=0.6.2.0, Culture=neutral, PublicKeyToken=1308302a96879dfb, processorArchitecture=MSIL">
-      <HintPath>..\packages\Flurl.Http.Signed.0.6.2.2015062601\lib\net45\Flurl.Http.dll</HintPath>
+    <Reference Include="Flurl.Http, Version=0.7.0.0, Culture=neutral, PublicKeyToken=1308302a96879dfb, processorArchitecture=MSIL">
+      <HintPath>..\packages\Flurl.Http.Signed.0.7.0\lib\net45\Flurl.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Marvin.JsonPatch, Version=0.7.0.0, Culture=neutral, PublicKeyToken=686c63b2d045ab44, processorArchitecture=MSIL">