Refactor services

src/Hqub.MusicBrainz.Client/Example6.cs

@@ -3,7 +3,6 @@ namespace Hqub.MusicBrainz.Client
 {
     using Hqub.MusicBrainz;
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System;
     using System.Threading.Tasks;
 
@@ -89,7 +88,7 @@ public static async Task Search(MusicBrainzClient client, string genre, int limi
             }
         }
 
-        private static void DisplayArtists(ArtistList artists)
+        private static void DisplayArtists(QueryResult<Artist> artists)
         {
             foreach (var a in artists)
             {
@@ -98,7 +97,7 @@ private static void DisplayArtists(ArtistList artists)
             }
         }
 
-        private static void DisplayReleases(ReleaseGroupList groups, int i, int pages)
+        private static void DisplayReleases(QueryResult<ReleaseGroup> groups, int i, int pages)
         {
             Console.WriteLine();
             Console.WriteLine("Page {0} of {1}", i, pages);

src/Hqub.MusicBrainz.Tests/ArtistBrowseTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ArtistBrowseTests
     {
-        private ArtistList data;
+        private QueryResult<Artist> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/ArtistSearchTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ArtistSearchTests
     {
-        private ArtistList data;
+        private QueryResult<Artist> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/LabelBrowseTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class LabelBrowseTests
     {
-        private LabelList data;
+        private QueryResult<Label> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/LabelSearchTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class LabelSearchTests
     {
-        private LabelList data;
+        private QueryResult<Label> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/RecordingBrowseTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class RecordingBrowseTests
     {
-        private RecordingList data;
+        private QueryResult<Recording> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/RecordingSearchTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Linq;
     using System.Threading.Tasks;
@@ -10,7 +10,7 @@
 
     public class RecordingSearchTests
     {
-        private RecordingList data;
+        private QueryResult<Recording> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/ReleaseBrowseTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ReleaseBrowseTests
     {
-        private ReleaseList data;
+        private QueryResult<Release> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/ReleaseGroupBrowseTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ReleaseGroupBrowseTests
     {
-        private ReleaseGroupList data;
+        private QueryResult<ReleaseGroup> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/ReleaseGroupSearchTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Linq;
     using System.Threading.Tasks;
@@ -10,7 +10,7 @@
 
     public class ReleaseGroupSearchTests
     {
-        private ReleaseGroupList data;
+        private QueryResult<ReleaseGroup> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz.Tests/ReleaseSearchTests.cs

@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ReleaseSearchTests
     {
-        private ReleaseList data;
+        private QueryResult<Release> data;
 
         [OneTimeSetUp]
         public async Task Init()

src/Hqub.MusicBrainz/Entities/Area.cs

@@ -1,7 +1,6 @@
 
 namespace Hqub.MusicBrainz.Entities
 {
-    using System;
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
@@ -10,7 +9,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Area"/>
     [DataContract(Name = "area")]
-    public class Area
+    public class Area : IEntity
     {
         /// <summary>
         /// Gets or sets the MusicBrainz id.

src/Hqub.MusicBrainz/Entities/Artist.cs

@@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Artist"/>
     [DataContract(Name = "artist")]
-    public class Artist
+    public class Artist : IEntity
     {
         #region Properties