Incorporate feedback

jasper-schneider · jasper-schneider · commit 4f273e65550c · 2015-03-20T10:39:29.000-07:00
diff --git a/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Files.cs b/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Files.cs
@@ -82,15 +82,8 @@ public IEnumerable<PSTaskFile> ListTaskFiles(ListTaskFileOptions options)
                     }
                 }
                 Func<ITaskFile, PSTaskFile> mappingFunction = f => { return new PSTaskFile(f); };
-                if (options.MaxCount <= 0)
-                {
-                    return new PSAsyncEnumerable<PSTaskFile, ITaskFile>(taskFiles, mappingFunction);
-                }
-                else
-                {
-                    WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));
-                    return new PSAsyncEnumerable<PSTaskFile, ITaskFile>(taskFiles, mappingFunction).Take(options.MaxCount);   
-                }
+                return PSAsyncEnumerable<PSTaskFile, ITaskFile>.CreateWithMaxCount(
+                    taskFiles, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
             }
         }
 
diff --git a/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Jobs.cs b/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Jobs.cs
@@ -70,15 +70,8 @@ public IEnumerable<PSCloudJob> ListJobs(ListJobOptions options)
                 {
                     IEnumerableAsyncExtended<ICloudJob> jobs = wiManager.ListJobs(wiName, odata, options.AdditionalBehaviors);
                     Func<ICloudJob, PSCloudJob> mappingFunction = j => { return new PSCloudJob(j); };
-                    if (options.MaxCount <= 0)
-                    {
-                        return new PSAsyncEnumerable<PSCloudJob, ICloudJob>(jobs, mappingFunction);           
-                    }
-                    else
-                    {
-                        WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));
-                        return new PSAsyncEnumerable<PSCloudJob, ICloudJob>(jobs, mappingFunction).Take(options.MaxCount);              
-                    }
+                    return PSAsyncEnumerable<PSCloudJob, ICloudJob>.CreateWithMaxCount(
+                        jobs, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
                 }             
             }
         }
diff --git a/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Pools.cs b/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Pools.cs
@@ -64,15 +64,8 @@ public IEnumerable<PSCloudPool> ListPools(ListPoolOptions options)
                 {
                     IEnumerableAsyncExtended<ICloudPool> pools = poolManager.ListPools(odata, options.AdditionalBehaviors);
                     Func<ICloudPool, PSCloudPool> mappingFunction = p => { return new PSCloudPool(p); };
-                    if (options.MaxCount <= 0)
-                    {
-                        return new PSAsyncEnumerable<PSCloudPool, ICloudPool>(pools, mappingFunction);
-                    }
-                    else
-                    {
-                        WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));
-                        return new PSAsyncEnumerable<PSCloudPool, ICloudPool>(pools, mappingFunction).Take(options.MaxCount);   
-                    }                  
+                    return PSAsyncEnumerable<PSCloudPool, ICloudPool>.CreateWithMaxCount(
+                        pools, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));            
                 }
             }
         }
diff --git a/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Tasks.cs b/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.Tasks.cs
@@ -80,15 +80,8 @@ public IEnumerable<PSCloudTask> ListTasks(ListTaskOptions options)
                     }
                 }
                 Func<ICloudTask, PSCloudTask> mappingFunction = t => { return new PSCloudTask(t); };
-                if (options.MaxCount <= 0)
-                {
-                    return new PSAsyncEnumerable<PSCloudTask, ICloudTask>(tasks, mappingFunction);
-                }
-                else
-                {
-                    WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));
-                    return new PSAsyncEnumerable<PSCloudTask, ICloudTask>(tasks, mappingFunction).Take(options.MaxCount);
-                }
+                return PSAsyncEnumerable<PSCloudTask, ICloudTask>.CreateWithMaxCount(
+                    tasks, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
             }
         }
 
diff --git a/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.WorkItems.cs b/src/ResourceManager/Batch/Commands.Batch/Models/BatchClient.WorkItems.cs
@@ -65,15 +65,8 @@ public IEnumerable<PSCloudWorkItem> ListWorkItems(ListWorkItemOptions options)
                 {
                     IEnumerableAsyncExtended<ICloudWorkItem> workItems = wiManager.ListWorkItems(odata, options.AdditionalBehaviors);
                     Func<ICloudWorkItem, PSCloudWorkItem> mappingFunction = w => { return new PSCloudWorkItem(w); };
-                    if (options.MaxCount <= 0)
-                    {
-                        return new PSAsyncEnumerable<PSCloudWorkItem, ICloudWorkItem>(workItems, mappingFunction);
-                    }
-                    else
-                    {
-                        WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));
-                        return new PSAsyncEnumerable<PSCloudWorkItem, ICloudWorkItem>(workItems, mappingFunction).Take(options.MaxCount);
-                    }
+                    return PSAsyncEnumerable<PSCloudWorkItem, ICloudWorkItem>.CreateWithMaxCount(
+                        workItems, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
                 }
             }
         }
diff --git a/src/ResourceManager/Batch/Commands.Batch/Models/PSAsyncEnumerable.cs b/src/ResourceManager/Batch/Commands.Batch/Models/PSAsyncEnumerable.cs
@@ -15,6 +15,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Azure.Batch;
 
@@ -58,6 +59,25 @@ public IAsyncEnumerator<T1> GetAsyncEnumerator()
         {
             return new PSAsyncEnumerator<T1, T2>(omAsyncEnumerable.GetAsyncEnumerator(), this.mappingFunction);
         }
+
+        internal static IEnumerable<T1> CreateWithMaxCount(
+            IEnumerableAsyncExtended<T2> omAsyncEnumerable, Func<T2, T1> mappingFunction, int maxCount, Action logMaxCount = null)
+        {
+            PSAsyncEnumerable<T1, T2> asyncEnumerable = new PSAsyncEnumerable<T1, T2>(omAsyncEnumerable, mappingFunction);
+
+            if (maxCount <= 0)
+            {
+                return asyncEnumerable;
+            }
+            else
+            {
+                if (logMaxCount != null)
+                {
+                    logMaxCount();
+                }
+                return asyncEnumerable.Take(maxCount);
+            }
+        }
     }
 
     internal class PSAsyncEnumerator<T1, T2> : IAsyncEnumerator<T1>, IEnumerator<T1>

Original file line number	Diff line number	Diff line change
`@@ -82,15 +82,8 @@ public IEnumerable<PSTaskFile> ListTaskFiles(ListTaskFileOptions options)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`Func<ITaskFile, PSTaskFile> mappingFunction = f => { return new PSTaskFile(f); };`
`85`		`- if (options.MaxCount <= 0)`
`86`		`- {`
`87`		`- return new PSAsyncEnumerable<PSTaskFile, ITaskFile>(taskFiles, mappingFunction);`
`88`		`- }`
`89`		`- else`
`90`		`- {`
`91`		`- WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));`
`92`		`- return new PSAsyncEnumerable<PSTaskFile, ITaskFile>(taskFiles, mappingFunction).Take(options.MaxCount);`
`93`		`- }`
	`85`	`+ return PSAsyncEnumerable<PSTaskFile, ITaskFile>.CreateWithMaxCount(`
	`86`	`+ taskFiles, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
`94`	`87`	`}`
`95`	`88`	`}`
`96`	`89`
Original file line number	Diff line number	Diff line change
`@@ -70,15 +70,8 @@ public IEnumerable<PSCloudJob> ListJobs(ListJobOptions options)`
`70`	`70`	`{`
`71`	`71`	`IEnumerableAsyncExtended<ICloudJob> jobs = wiManager.ListJobs(wiName, odata, options.AdditionalBehaviors);`
`72`	`72`	`Func<ICloudJob, PSCloudJob> mappingFunction = j => { return new PSCloudJob(j); };`
`73`		`- if (options.MaxCount <= 0)`
`74`		`- {`
`75`		`- return new PSAsyncEnumerable<PSCloudJob, ICloudJob>(jobs, mappingFunction);`
`76`		`- }`
`77`		`- else`
`78`		`- {`
`79`		`- WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));`
`80`		`- return new PSAsyncEnumerable<PSCloudJob, ICloudJob>(jobs, mappingFunction).Take(options.MaxCount);`
`81`		`- }`
	`73`	`+ return PSAsyncEnumerable<PSCloudJob, ICloudJob>.CreateWithMaxCount(`
	`74`	`+ jobs, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
`82`	`75`	`}`
`83`	`76`	`}`
`84`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,15 +64,8 @@ public IEnumerable<PSCloudPool> ListPools(ListPoolOptions options)`
`64`	`64`	`{`
`65`	`65`	`IEnumerableAsyncExtended<ICloudPool> pools = poolManager.ListPools(odata, options.AdditionalBehaviors);`
`66`	`66`	`Func<ICloudPool, PSCloudPool> mappingFunction = p => { return new PSCloudPool(p); };`
`67`		`- if (options.MaxCount <= 0)`
`68`		`- {`
`69`		`- return new PSAsyncEnumerable<PSCloudPool, ICloudPool>(pools, mappingFunction);`
`70`		`- }`
`71`		`- else`
`72`		`- {`
`73`		`- WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));`
`74`		`- return new PSAsyncEnumerable<PSCloudPool, ICloudPool>(pools, mappingFunction).Take(options.MaxCount);`
`75`		`- }`
	`67`	`+ return PSAsyncEnumerable<PSCloudPool, ICloudPool>.CreateWithMaxCount(`
	`68`	`+ pools, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
`76`	`69`	`}`
`77`	`70`	`}`
`78`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,15 +80,8 @@ public IEnumerable<PSCloudTask> ListTasks(ListTaskOptions options)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`Func<ICloudTask, PSCloudTask> mappingFunction = t => { return new PSCloudTask(t); };`
`83`		`- if (options.MaxCount <= 0)`
`84`		`- {`
`85`		`- return new PSAsyncEnumerable<PSCloudTask, ICloudTask>(tasks, mappingFunction);`
`86`		`- }`
`87`		`- else`
`88`		`- {`
`89`		`- WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));`
`90`		`- return new PSAsyncEnumerable<PSCloudTask, ICloudTask>(tasks, mappingFunction).Take(options.MaxCount);`
`91`		`- }`
	`83`	`+ return PSAsyncEnumerable<PSCloudTask, ICloudTask>.CreateWithMaxCount(`
	`84`	`+ tasks, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
`92`	`85`	`}`
`93`	`86`	`}`
`94`	`87`
Original file line number	Diff line number	Diff line change
`@@ -65,15 +65,8 @@ public IEnumerable<PSCloudWorkItem> ListWorkItems(ListWorkItemOptions options)`
`65`	`65`	`{`
`66`	`66`	`IEnumerableAsyncExtended<ICloudWorkItem> workItems = wiManager.ListWorkItems(odata, options.AdditionalBehaviors);`
`67`	`67`	`Func<ICloudWorkItem, PSCloudWorkItem> mappingFunction = w => { return new PSCloudWorkItem(w); };`
`68`		`- if (options.MaxCount <= 0)`
`69`		`- {`
`70`		`- return new PSAsyncEnumerable<PSCloudWorkItem, ICloudWorkItem>(workItems, mappingFunction);`
`71`		`- }`
`72`		`- else`
`73`		`- {`
`74`		`- WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount));`
`75`		`- return new PSAsyncEnumerable<PSCloudWorkItem, ICloudWorkItem>(workItems, mappingFunction).Take(options.MaxCount);`
`76`		`- }`
	`68`	`+ return PSAsyncEnumerable<PSCloudWorkItem, ICloudWorkItem>.CreateWithMaxCount(`
	`69`	`+ workItems, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
`77`	`70`	`}`
`78`	`71`	`}`
`79`	`72`	`}`