Merge pull request #12 from AMDevIT/Task-11-RetrievedContent

Added retrieved content object

Author: XDarinor

Sources/AMDevIT.Restling/AMDevIT.Restling.Core/AMDevIT.Restling.Core.csproj

@@ -15,9 +15,9 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/AMDevIT/Restling.git</RepositoryUrl>
     <PackageTags>rest;httpclient;api;apiclient;client;restclient;restling</PackageTags>
-    <AssemblyVersion>1.0.15.0</AssemblyVersion>
+    <AssemblyVersion>1.0.15.10</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
-    <PackageReleaseNotes>Fixed an issue with CookieContainer, HttpMessageHandler and UseCookies. Also the client now exposes the Context for more granular manipulation.
+    <PackageReleaseNotes>Fixed an issue with CookieContainer, HttpMessageHandler and UseCookies. Also the client now exposes the Context for more granular manipulation. Added support for RetrievedContentResult.
 </PackageReleaseNotes>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>

Sources/AMDevIT.Restling/AMDevIT.Restling.Core/HttpResponseParser.cs

@@ -41,19 +41,19 @@ public async Task<RestRequestResult> DecodeAsync(HttpResponseMessage resultHttpM
             if (resultHttpMessage != null)
             {
                 byte[] rawContent;
-                RetrieveContentResult content;
+                RetrievedContentResult retrievedContent;
                 MediaTypeHeaderValue? contentType = resultHttpMessage.Content.Headers.ContentType;
                 Charset charset = CharsetParser.Parse(contentType?.CharSet);
-                rawContent = await resultHttpMessage.Content.ReadAsByteArrayAsync(cancellationToken);
-                content = RetrieveContent(rawContent, contentType);               
+                rawContent = await resultHttpMessage.Content.ReadAsByteArrayAsync(cancellationToken);                
+                retrievedContent = RetrieveContent(rawContent, contentType);               
 
                 restRequestResult = new(restRequest,                                        
                                         resultHttpMessage.StatusCode,
                                         elapsed,
                                         rawContent,
                                         contentType?.MediaType,
                                         charset,
-                                        content);
+                                        retrievedContent);
             }
             else
             {
@@ -77,7 +77,7 @@ public async Task<RestRequestResult<T>> DecodeAsync<T>(HttpResponseMessage resul
             {
                 byte[] rawContent;
                 T? data = default;
-                RetrieveContentResult content;
+                RetrievedContentResult content;
                 MediaTypeHeaderValue? contentType = resultHttpMessage.Content.Headers.ContentType;
                 Charset charset = CharsetParser.Parse(contentType?.CharSet);
                 rawContent = await resultHttpMessage.Content.ReadAsByteArrayAsync(cancellationToken);
@@ -186,12 +186,12 @@ public async Task<RestRequestResult<T>> DecodeAsync<T>(HttpResponseMessage resul
             return restRequestResult;
         }
 
-        private static RetrieveContentResult RetrieveContent(byte[] rawContent,
+        private static RetrievedContentResult RetrieveContent(byte[] rawContent,
                                                              MediaTypeHeaderValue? contentType)
         {
             object? content;
             bool isBinaryData = false;
-            RetrieveContentResult contentResult;
+            RetrievedContentResult contentResult;
 
             if (contentType == null)
             {

Sources/AMDevIT.Restling/AMDevIT.Restling.Core/RestRequestResult.cs

@@ -9,7 +9,7 @@ public class RestRequestResult(RestRequest request,
                                    byte[] rawContent,
                                    string? contentType,
                                    Charset charset,
-                                   object? content = null,
+                                   RetrievedContentResult? retrievedContent,
                                    Exception? exception = null)
     {
         #region Fields
@@ -20,7 +20,7 @@ public class RestRequestResult(RestRequest request,
         private readonly string? contentType = contentType;
         private readonly Charset charSet = charset;
         private readonly byte[]? rawContent = rawContent;
-        private readonly object? content = content;
+        private readonly RetrievedContentResult? retrievedContent = retrievedContent;
         private readonly Exception? exception = exception;
 
         #endregion
@@ -32,7 +32,8 @@ public class RestRequestResult(RestRequest request,
         public HttpStatusCode? StatusCode => this.statusCode;
         public bool IsSuccessful => this.ValidateIsSuccessful();
         public byte[]? RawContent => this.rawContent;
-        public object? Content => this.content;
+        public RetrievedContentResult? RetrievedContent => this.retrievedContent;
+        public string? Content => this.retrievedContent?.ToStringContent();
 
         public string? ContentType => this.contentType;
         public Charset CharSet => this.charSet;

Sources/AMDevIT.Restling/AMDevIT.Restling.Core/RestRequestResultOfT.cs

@@ -27,15 +27,15 @@ public RestRequestResult(RestRequest request,
                                  byte[] rawContent,
                                  string? contentType,
                                  Charset charset,
-                                 object? content = null,
+                                 RetrievedContentResult? retrievedContent,
                                  Exception? exception = null) 
             : base(request,
                    statusCode, 
                    elapsed, 
                    rawContent, 
                    contentType,
                    charset,
-                   content, 
+                   retrievedContent, 
                    exception)
         {
             this.data = data;

…T.Restling.Core/RetrieveContentResult.cs ….Restling.Core/RetrievedContentResult.csSources/AMDevIT.Restling/AMDevIT.Restling.Core/RetrieveContentResult.cs renamed to Sources/AMDevIT.Restling/AMDevIT.Restling.Core/RetrievedContentResult.cs Sources/AMDevIT.Restling/AMDevIT.Restling.Core/RetrieveContentResult.cs renamed to Sources/AMDevIT.Restling/AMDevIT.Restling.Core/RetrievedContentResult.cs

@@ -2,7 +2,7 @@
 
 namespace AMDevIT.Restling.Core
 {
-    internal class RetrieveContentResult(object? content, bool isBinaryData, MediaTypeHeaderValue? contentType)
+    public class RetrievedContentResult(object? content, bool isBinaryData, MediaTypeHeaderValue? contentType)
     {
         #region Properties
 
@@ -15,6 +15,13 @@ internal class RetrieveContentResult(object? content, bool isBinaryData, MediaTy
         #region Methods
 
         public override string ToString()
+        {
+            string contentOutput;
+            contentOutput = this.ToStringContent();
+            return $"[Content:{contentOutput},ContentType:{this.ContentType}, IsBinaryData: {this.IsBinaryData}]";
+        }
+
+        public string ToStringContent()
         {
             string contentOutput;
 
@@ -23,10 +30,9 @@ public override string ToString()
                 byte[] contentBytes = contentBytesEnumerable.ToArray();
                 contentOutput = Convert.ToBase64String(contentBytes);
             }
-            else            
+            else
                 contentOutput = this.Content?.ToString() ?? string.Empty;
-            
-            return $"[Content:{contentOutput},ContentType:{this.ContentType}, IsBinaryData: {this.IsBinaryData}]";
+            return contentOutput;
         }
 
         #endregion