Merge branch 'master' into h265

2 files changed, 4 insertions, 38 deletions

diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
index d4e6aa8e0..81a2dba69 100644
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ b/MediaBrowser.Model/Services/IHasRequestFilter.cs
@@ -1,3 +1,5 @@
+using Microsoft.AspNetCore.Http;
+
 namespace MediaBrowser.Model.Services
 {
     public interface IHasRequestFilter
@@ -15,6 +17,6 @@ namespace MediaBrowser.Model.Services
         /// <param name="req">The http request wrapper</param>
         /// <param name="res">The http response wrapper</param>
         /// <param name="requestDto">The request DTO</param>
-        void RequestFilter(IRequest req, IResponse res, object requestDto);
+        void RequestFilter(IRequest req, HttpResponse res, object requestDto);
     }
 }
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 4f6ddb476..7a4152698 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.IO;
 using Microsoft.AspNetCore.Http;
 
 namespace MediaBrowser.Model.Services
 {
     public interface IRequest
     {
-        IResponse Response { get; }
+        HttpResponse Response { get; }
 
         /// <summary>
         /// The name of the service being called (e.g. Request DTO Name)
@@ -23,11 +20,6 @@ namespace MediaBrowser.Model.Services
         string Verb { get; }
 
         /// <summary>
-        /// The Request DTO, after it has been deserialized.
-        /// </summary>
-        object Dto { get; set; }
-
-        /// <summary>
         /// The request ContentType
         /// </summary>
         string ContentType { get; }
@@ -50,8 +42,6 @@ namespace MediaBrowser.Model.Services
 
         IQueryCollection QueryString { get; }
 
-        Task<QueryParamCollection> GetFormData();
-
         string RawUrl { get; }
 
         string AbsoluteUri { get; }
@@ -75,11 +65,6 @@ namespace MediaBrowser.Model.Services
         long ContentLength { get; }
 
         /// <summary>
-        /// Access to the multi-part/formdata files posted on this request
-        /// </summary>
-        IHttpFile[] Files { get; }
-
-        /// <summary>
         /// The value of the Referrer, null if not available
         /// </summary>
         Uri UrlReferrer { get; }
@@ -98,25 +83,4 @@ namespace MediaBrowser.Model.Services
     {
         IRequest Request { get; set; }
     }
-
-    public interface IResponse
-    {
-        HttpResponse OriginalResponse { get; }
-
-        int StatusCode { get; set; }
-
-        string StatusDescription { get; set; }
-
-        string ContentType { get; set; }
-
-        void AddHeader(string name, string value);
-
-        void Redirect(string url);
-
-        Stream OutputStream { get; }
-
-        Task TransmitFile(string path, long offset, long count, FileShareMode fileShareMode, IFileSystem fileSystem, IStreamHelper streamHelper, CancellationToken cancellationToken);
-
-        bool SendChunked { get; set; }
-    }
 }