Made BaseJsonHandler strongly typed. Moved DTO entities to their own DTO namespace in Model.

11 files changed, 40 insertions, 26 deletions

diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
index 0c38a2396..c3292d363 100644
--- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
@@ -1,13 +1,15 @@
 using System;

+using System.Collections.Generic;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Model.DTO;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class GenresHandler : BaseJsonHandler

+    public class GenresHandler : BaseJsonHandler<IEnumerable<CategoryInfo<Genre>>>

     {

-        protected override object GetObjectToSerialize()

+        protected override IEnumerable<CategoryInfo<Genre>> GetObjectToSerialize()

         {

             Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;

             Guid userId = Guid.Parse(QueryString["userid"]);

diff --git a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
index 28def271f..efb67db54 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
@@ -1,12 +1,13 @@
 using System;

 using MediaBrowser.Common.Net.Handlers;

+using MediaBrowser.Model.DTO;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class ItemHandler : BaseJsonHandler

+    public class ItemHandler : BaseJsonHandler<BaseItemWrapper<BaseItem>>

     {

-        protected sealed override object GetObjectToSerialize()

+        protected sealed override BaseItemWrapper<BaseItem> GetObjectToSerialize()

         {

             Guid userId = Guid.Parse(QueryString["userid"]);

 

diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
index 0d9d3d0a8..6e08561b2 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
@@ -2,13 +2,14 @@
 using System.Collections.Generic;

 using System.Linq;

 using MediaBrowser.Common.Net.Handlers;

+using MediaBrowser.Model.DTO;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public abstract class ItemListHandler : BaseJsonHandler

+    public abstract class ItemListHandler : BaseJsonHandler<IEnumerable<BaseItemWrapper<BaseItem>>>

     {

-        protected override object GetObjectToSerialize()

+        protected override IEnumerable<BaseItemWrapper<BaseItem>> GetObjectToSerialize()

         {

             return ItemsToSerialize.Select(i =>

             {

diff --git a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
index 103e49cd2..513840b81 100644
--- a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
@@ -1,11 +1,12 @@
 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class PersonHandler : BaseJsonHandler

+    public class PersonHandler : BaseJsonHandler<Person>

     {

-        protected override object GetObjectToSerialize()

+        protected override Person GetObjectToSerialize()

         {

             return Kernel.Instance.ItemController.GetPerson(QueryString["name"]);

         }

diff --git a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
index 4dc317ecc..0e19aecd5 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
@@ -2,12 +2,13 @@
 using System.Linq;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Model.Plugins;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class PluginConfigurationHandler : BaseJsonHandler

+    public class PluginConfigurationHandler : BaseJsonHandler<BasePluginConfiguration>

     {

-        protected override object GetObjectToSerialize()

+        protected override BasePluginConfiguration GetObjectToSerialize()

         {

             string pluginName = QueryString["name"];

 

diff --git a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
index a44e12692..c3c1b4049 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
@@ -1,16 +1,17 @@
-using System.Linq;

+using System.Collections.Generic;

+using System.Linq;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

-using MediaBrowser.Model.Plugins;

+using MediaBrowser.Model.DTO;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

     /// <summary>

     /// Provides information about installed plugins

     /// </summary>

-    public class PluginsHandler : BaseJsonHandler

+    public class PluginsHandler : BaseJsonHandler<IEnumerable<PluginInfo>>

     {

-        protected override object GetObjectToSerialize()

+        protected override IEnumerable<PluginInfo> GetObjectToSerialize()

         {

             var plugins = Kernel.Instance.Plugins.Select(p =>

             {

diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
index a381af15f..b1be2cad2 100644
--- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
@@ -1,17 +1,19 @@
 using System;

+using System.Collections.Generic;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Model.DTO;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class StudiosHandler : BaseJsonHandler

+    public class StudiosHandler : BaseJsonHandler<IEnumerable<CategoryInfo<Studio>>>

     {

-        protected override object GetObjectToSerialize()

+        protected override IEnumerable<CategoryInfo<Studio>> GetObjectToSerialize()

         {

             Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;

             Guid userId = Guid.Parse(QueryString["userid"]);

-

+            

             return Kernel.Instance.GetAllStudios(parent, userId);

         }

     }

diff --git a/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs
index f9d3536b6..12e80f306 100644
--- a/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs
@@ -1,12 +1,13 @@
 using System;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Model.Configuration;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class UserConfigurationHandler : BaseJsonHandler

+    public class UserConfigurationHandler : BaseJsonHandler<UserConfiguration>

     {

-        protected override object GetObjectToSerialize()

+        protected override UserConfiguration GetObjectToSerialize()

         {

             Guid userId = Guid.Parse(QueryString["userid"]);

 

diff --git a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
index 64f68f62f..64239005f 100644
--- a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
@@ -1,11 +1,13 @@
-using MediaBrowser.Common.Net.Handlers;

+using System.Collections.Generic;

+using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Model.Users;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    class UsersHandler : BaseJsonHandler

+    class UsersHandler : BaseJsonHandler<IEnumerable<User>>

     {

-        protected override object GetObjectToSerialize()

+        protected override IEnumerable<User> GetObjectToSerialize()

         {

             return Kernel.Instance.Users;

         }

diff --git a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs
index 7fe82ef0c..343fcc70b 100644
--- a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs
@@ -1,10 +1,10 @@
 using System;

 using System.Collections.Generic;

+using System.Drawing;

 using System.IO;

 using System.Linq;

-using MediaBrowser.Model.Entities;

-using System.Drawing;

 using MediaBrowser.Common.Drawing;

+using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

diff --git a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs
index 044866dca..cc3474880 100644
--- a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs
@@ -1,13 +1,15 @@
 using System;

+using System.Collections.Generic;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Model.DTO;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class YearsHandler : BaseJsonHandler

+    public class YearsHandler : BaseJsonHandler<IEnumerable<CategoryInfo<Year>>>

     {

-        protected override object GetObjectToSerialize()

+        protected override IEnumerable<CategoryInfo<Year>> GetObjectToSerialize()

         {

             Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;

             Guid userId = Guid.Parse(QueryString["userid"]);