Replaced Skybrud.Social.Core dependency with Skybrud.Essentials.Http

Author: abjerner

src/Skybrud.Social.TwentyThree/Endpoints/Raw/TwentyThreePhotosRawEndpoint.cs

@@ -1,5 +1,5 @@
 using System;
-using Skybrud.Social.Http;
+using Skybrud.Essentials.Http;
 using Skybrud.Social.TwentyThree.OAuth;
 using Skybrud.Social.TwentyThree.Options.Photos;
 
@@ -32,24 +32,24 @@ internal TwentyThreePhotosRawEndpoint(TwentyThreeOAuthClient client) {
         /// <summary>
         /// Returns a list of photos or videos.
         /// </summary>
-        /// <returns>An instance of <see cref="SocialHttpResponse"/> representing the raw response.</returns>
+        /// <returns>An instance of <see cref="IHttpResponse"/> representing the raw response.</returns>
         /// <see>
         ///     <cref>https://www.twentythree.net/api/photo-list</cref>
         /// </see>
-        public SocialHttpResponse GetList() {
-            return Client.DoHttpGetRequest("/api/photo/list");
+        public IHttpResponse GetList() {
+            return Client.Get("/api/photo/list");
         }
 
         /// <summary>
         /// Returns a list of photos or videos.
         /// </summary>
-        /// <returns>An instance of <see cref="SocialHttpResponse"/> representing the raw response.</returns>
+        /// <returns>An instance of <see cref="IHttpResponse"/> representing the raw response.</returns>
         /// <see>
         ///     <cref>https://www.twentythree.net/api/photo-list</cref>
         /// </see>
-        public SocialHttpResponse GetList(TwentyThreeGetPhotosOptions options) {
+        public IHttpResponse GetList(TwentyThreeGetPhotosOptions options) {
             if (options == null) throw new ArgumentNullException(nameof(options));
-            return Client.DoHttpGetRequest("/api/photo/list", options);
+            return Client.Get("/api/photo/list", options);
         }
 
         #endregion

src/Skybrud.Social.TwentyThree/Exceptions/TwentyThreeHttpException.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Net;
-using Skybrud.Social.Http;
+using Skybrud.Essentials.Http;
 using Skybrud.Social.TwentyThree.Models;
 
 namespace Skybrud.Social.TwentyThree.Exceptions {
@@ -10,9 +10,9 @@ public class TwentyThreeHttpException : Exception {
         #region Properties
 
         /// <summary>
-        /// Gets a reference to the underlying <see cref="SocialHttpResponse"/>.
+        /// Gets a reference to the underlying <see cref="IHttpResponse"/>.
         /// </summary>
-        public SocialHttpResponse Response { get; }
+        public IHttpResponse Response { get; }
 
         /// <summary>
         /// Gets the HTTP status code returned by the Twenty Three API.
@@ -27,7 +27,7 @@ public class TwentyThreeHttpException : Exception {
 
         #region Constructors
 
-        public TwentyThreeHttpException(SocialHttpResponse response, TwentyThreeError error) : base("Invalid response received from the Twenty Three API (Status: " + ((int) response.StatusCode) + ")") {
+        public TwentyThreeHttpException(IHttpResponse response, TwentyThreeError error) : base("Invalid response received from the Twenty Three API (Status: " + ((int) response.StatusCode) + ")") {
             Response = response;
             StatusCode = response.StatusCode;
             Error = error;

src/Skybrud.Social.TwentyThree/OAuth/TwentyThreeOAuthClient.cs

@@ -1,12 +1,13 @@
 using System;
 using Skybrud.Essentials.Common;
-using Skybrud.Social.Http;
-using Skybrud.Social.OAuth;
+using Skybrud.Essentials.Http;
+using Skybrud.Essentials.Http.Collections;
+using Skybrud.Essentials.Http.OAuth;
 using Skybrud.Social.TwentyThree.Endpoints.Raw;
 
 namespace Skybrud.Social.TwentyThree.OAuth {
 
-    public class TwentyThreeOAuthClient : SocialOAuthClient {
+    public class TwentyThreeOAuthClient : OAuthClient {
 
         #region Properties
 
@@ -60,18 +61,18 @@ public TwentyThreeOAuthClient(string consumerKey, string consumerSecret, string
 
         #region Member methods
 
-        protected override void PrepareHttpRequest(SocialHttpRequest request) {
+        protected override void PrepareHttpRequest(IHttpRequest request) {
 
             // Should we append the domain and schema to the URL?
             if (request.Url.StartsWith("/api/")) {
-                if (String.IsNullOrWhiteSpace(HostName)) throw new PropertyNotSetException(nameof(HostName));
+                if (string.IsNullOrWhiteSpace(HostName)) throw new PropertyNotSetException(nameof(HostName));
                 request.Url = "https://" + HostName + request.Url;
             }
 
             // Append "raw" to the query string so we can get a proper JSON response
-            if (request.QueryString == null) request.QueryString = new SocialHttpQueryString();
+            if (request.QueryString == null) request.QueryString = new HttpQueryString();
             request.QueryString.Add("format", "json");
-            request.QueryString.Add("raw", String.Empty);
+            request.QueryString.Add("raw", string.Empty);
 
             // Call the base method to handle OAuth 1.0a logic
             base.PrepareHttpRequest(request);

src/Skybrud.Social.TwentyThree/Options/Photos/TwentyThreeGetPhotosOptions.cs

@@ -1,5 +1,5 @@
-using Skybrud.Social.Http;
-using Skybrud.Social.Interfaces.Http;
+using Skybrud.Essentials.Http.Collections;
+using Skybrud.Essentials.Http.Options;
 
 namespace Skybrud.Social.TwentyThree.Options.Photos {
 
@@ -41,7 +41,7 @@ public class TwentyThreeGetPhotosOptions : IHttpGetOptions {
 
         public IHttpQueryString GetQueryString() {
 
-            IHttpQueryString query = new SocialHttpQueryString();
+            IHttpQueryString query = new HttpQueryString();
 
             if (string.IsNullOrWhiteSpace(PhotoId) == false) query.Add("photo_id", PhotoId);
             if (string.IsNullOrWhiteSpace(Token) == false) query.Add("token", Token);

src/Skybrud.Social.TwentyThree/Responses/Photos/TwentyThreeGetPhotosResponse.cs

@@ -1,6 +1,6 @@
 using System;
 using Newtonsoft.Json.Linq;
-using Skybrud.Social.Http;
+using Skybrud.Essentials.Http;
 using Skybrud.Social.TwentyThree.Models.Photos;
 
 namespace Skybrud.Social.TwentyThree.Responses.Photos {
@@ -12,7 +12,7 @@ public class TwentyThreeGetPhotosResponse : TwentyThreeResponse<TwentyThreePhoto
 
         #region Constructors
 
-        private TwentyThreeGetPhotosResponse(SocialHttpResponse response) : base(response) {
+        private TwentyThreeGetPhotosResponse(IHttpResponse response) : base(response) {
 
             // Validate the response
             ValidateResponse(response, out JObject body);
@@ -31,7 +31,7 @@ private TwentyThreeGetPhotosResponse(SocialHttpResponse response) : base(respons
         /// </summary>
         /// <param name="response">The response to be parsed.</param>
         /// <returns>An instance of <see cref="TwentyThreeGetPhotosResponse"/> representing the response.</returns>
-        public static TwentyThreeGetPhotosResponse ParseResponse(SocialHttpResponse response) {
+        public static TwentyThreeGetPhotosResponse ParseResponse(IHttpResponse response) {
             if (response == null) throw new ArgumentNullException(nameof(response));
             return new TwentyThreeGetPhotosResponse(response);
         }

src/Skybrud.Social.TwentyThree/Responses/TwentyThreeResponse.cs

@@ -1,8 +1,7 @@
-using System.Net;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
+using Skybrud.Essentials.Http;
 using Skybrud.Essentials.Json;
 using Skybrud.Essentials.Json.Extensions;
-using Skybrud.Social.Http;
 using Skybrud.Social.TwentyThree.Exceptions;
 using Skybrud.Social.TwentyThree.Models;
 
@@ -11,15 +10,15 @@ namespace Skybrud.Social.TwentyThree.Responses {
     /// <summary>
     /// Class representing a response from the Twenty Three API.
     /// </summary>
-    public class TwentyThreeResponse : SocialResponse {
+    public class TwentyThreeResponse : HttpResponseBase {
 
         #region Constructors
 
         /// <summary>
         /// Initializes a new instance based on the specified <paramref name="response"/>.
         /// </summary>
-        /// <param name="response">The instance of <see cref="SocialHttpResponse"/> representing the raw response.</param>
-        protected TwentyThreeResponse(SocialHttpResponse response) : base(response) { }
+        /// <param name="response">The instance of <see cref="IHttpResponse"/> representing the raw response.</param>
+        protected TwentyThreeResponse(IHttpResponse response) : base(response) { }
 
         #endregion
 
@@ -30,7 +29,7 @@ protected TwentyThreeResponse(SocialHttpResponse response) : base(response) { }
         /// </summary>
         /// <param name="response">The response to be validated.</param>
         /// <param name="body">An instacne of <see cref="JObject"/> representing the response body.</param>
-        public static void ValidateResponse(SocialHttpResponse response, out JObject body) {
+        public static void ValidateResponse(IHttpResponse response, out JObject body) {
 
             // The API always returns a 200 status code - even for errors
 
@@ -67,8 +66,8 @@ public class TwentyThreeResponse<T> : TwentyThreeResponse {
         /// <summary>
         /// Initializes a new instance based on the specified <paramref name="response"/>.
         /// </summary>
-        /// <param name="response">The instance of <see cref="SocialHttpResponse"/> representing the raw response.</param>
-        protected TwentyThreeResponse(SocialHttpResponse response) : base(response) { }
+        /// <param name="response">The instance of <see cref="IHttpResponse"/> representing the raw response.</param>
+        protected TwentyThreeResponse(IHttpResponse response) : base(response) { }
 
         #endregion
 

src/Skybrud.Social.TwentyThree/Skybrud.Social.TwentyThree.csproj

@@ -37,7 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Skybrud.Social.Core" Version="1.0.10" />
+    <PackageReference Include="Skybrud.Essentials.Http" Version="1.0.7" />
   </ItemGroup>
 
   <!--