From fd6e1fc3c03b1935fee3fa62ba153ba1974aff4c Mon Sep 17 00:00:00 2001
From: Perry Taylor <ptaylor@rcrracing.com>
Date: Mon, 4 Nov 2013 17:40:51 -0500
Subject: [PATCH] Remove lists from observable issues comments client

---
 .../Clients/IObservableIssueCommentsClient.cs        |  9 +++------
 .../Clients/ObservableIssueCommentsClient.cs         | 12 +++++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs b/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
index ce8483fa..2d8d0a7c 100644
--- a/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
@@ -1,7 +1,4 @@
-
-
-using System;
-using System.Collections.Generic;
+using System;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Octokit.Reactive
@@ -27,7 +24,7 @@ namespace Octokit.Reactive
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <returns></returns>
-        IObservable<IReadOnlyList<IssueComment>> GetForRepository(string owner, string name);
+        IObservable<IssueComment> GetForRepository(string owner, string name);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -37,7 +34,7 @@ namespace Octokit.Reactive
         /// <param name="name">The name of the repository</param>
         /// <param name="number">The issue number</param>
         /// <returns></returns>
-        IObservable<IReadOnlyList<IssueComment>> GetForIssue(string owner, string name, int number);
+        IObservable<IssueComment> GetForIssue(string owner, string name, int number);
 
         /// <summary>
         /// Creates a new Issue Comment for a specified Issue.
diff --git a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
index a99a1312..34042f1f 100644
--- a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
@@ -1,18 +1,20 @@
 using System;
-using System.Collections.Generic;
 using System.Reactive.Threading.Tasks;
+using Octokit.Reactive.Internal;
 
 namespace Octokit.Reactive
 {
     public class ObservableIssueCommentsClient : IObservableIssueCommentsClient
     {
         readonly IIssueCommentsClient _client;
+        readonly IConnection _connection;
 
         public ObservableIssueCommentsClient(IGitHubClient client)
         {
             Ensure.ArgumentNotNull(client, "client");
 
             _client = client.Issue.Comment;
+            _connection = client.Connection;
         }
 
         /// <summary>
@@ -42,12 +44,12 @@ namespace Octokit.Reactive
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <returns>The list of <see cref="IssueComment"/>s for the specified Repository.</returns>
-        public IObservable<IReadOnlyList<IssueComment>> GetForRepository(string owner, string name)
+        public IObservable<IssueComment> GetForRepository(string owner, string name)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            return _client.GetForRepository(owner, name).ToObservable();
+            return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(owner, name));
         }
 
         /// <summary>
@@ -60,12 +62,12 @@ namespace Octokit.Reactive
         /// <param name="name">The name of the repository</param>
         /// <param name="number">The issue number</param>
         /// <returns>The list of <see cref="IssueComment"/>s for the specified Issue.</returns>
-        public IObservable<IReadOnlyList<IssueComment>> GetForIssue(string owner, string name, int number)
+        public IObservable<IssueComment> GetForIssue(string owner, string name, int number)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            return _client.GetForIssue(owner, name, number).ToObservable();
+            return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(owner, name, number));
         }
 
         /// <summary>